Browse Source

Merge remote-tracking branch 'origin/v4' into v4

v4
chenrui 2 years ago
parent
commit
199843dcc6
  1. 2
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
  2. 57
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html
  3. 54
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html
  4. 36
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintStatistics.java
  5. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintStatisticsMapper.java
  6. 3
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ComplaintStatisticsService.java
  7. 127
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java
  8. 4
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java
  9. 40
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml

2
lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@ -111,7 +111,7 @@
<select id="selectUserList" parameterType="User" resultMap="UserResult"> <select id="selectUserList" parameterType="User" resultMap="UserResult">
select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.type, d.dept_name, u.law_certificate_num,u.certificateNumber, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.type, d.dept_name, u.law_certificate_num,u.certificateNumber,
d.leader,u.tenant_code,t.tenant_code, t.tenant_name, t.contact_man, t.contact_number, t.address d.leader,u.tenant_code, t.tenant_name, t.contact_man, t.contact_number, t.address
from sys_user u from sys_user u
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
left join sys_tenant t on t.tenant_code = u.tenant_code left join sys_tenant t on t.tenant_code = u.tenant_code

57
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/complaintStatic/complaintStatic.html

@ -210,6 +210,7 @@
var prefix = ctx + "code/complaintStatic"; var prefix = ctx + "code/complaintStatic";
var caseType=[[${@dict.getType('caseType')}]]; var caseType=[[${@dict.getType('caseType')}]];
/*var myChart = echarts.init(document.getElementById('container'));*/ /*var myChart = echarts.init(document.getElementById('container'));*/
var myChart = echarts.init(document.getElementById('echartComplaint'));
var pieData; var pieData;
var deptName; var deptName;
window.onload = function () { window.onload = function () {
@ -247,24 +248,24 @@
var cName=document.getElementById('cType').value var cName=document.getElementById('cType').value
if(cName==null||cName==""||cName==undefined){ if(cName==null||cName==""||cName==undefined){
if(row.complaintDepartment==null||row.complaintDepartment==""||row.complaintDepartment==undefined){ if(row.complaintDepartment==null||row.complaintDepartment==""||row.complaintDepartment==undefined){
return '<span ONCLICK="sComplaint(\'' + '空' + '\')">'+'全部'+'</span>'; return '<span style="cursor: pointer;color: blue;" ONCLICK="sComplaint(\'' + '空' + '\')">'+'全部'+'</span>';
}else { }else {
return '<span ONCLICK="sComplaint(\'' + row.complaintDepartment + '\')">'+'全部'+'</span>'; return '<span style="cursor: pointer;color: blue;" ONCLICK="sComplaint(\'' + row.complaintDepartment + '\')">'+'全部'+'</span>';
} }
} }
for(let i=0;i<caseType.length;i++){ for(let i=0;i<caseType.length;i++){
if(cName==caseType[i].dictValue){ if(cName==caseType[i].dictValue){
if(row.complaintDepartment==null||row.complaintDepartment==""||row.complaintDepartment==undefined){ if(row.complaintDepartment==null||row.complaintDepartment==""||row.complaintDepartment==undefined){
return '<span ONCLICK="sComplaint(\'' + '空' + '\')">'+caseType[i].dictLabel+'</span>'; return '<span style="cursor: pointer;color: blue;" ONCLICK="sComplaint(\'' + '空' + '\')">'+caseType[i].dictLabel+'</span>';
}else { }else {
return '<span ONCLICK="sComplaint(\'' + row.complaintDepartment + '\')">'+caseType[i].dictLabel+'</span>'; return '<span style="cursor: pointer;color: blue;" ONCLICK="sComplaint(\'' + row.complaintDepartment + '\')">'+caseType[i].dictLabel+'</span>';
} }
} }
} }
if(row.complaintDepartment==null||row.complaintDepartment==""||row.complaintDepartment==undefined){ if(row.complaintDepartment==null||row.complaintDepartment==""||row.complaintDepartment==undefined){
return '<span ONCLICK="sComplaint(\'' + '空' + '\')">'+cName+'</span>'; return '<span style="cursor: pointer;color: blue;" ONCLICK="sComplaint(\'' + '空' + '\')">'+cName+'</span>';
}else { }else {
return '<span ONCLICK="sComplaint(\'' + row.complaintDepartment + '\')">'+cName+'</span>'; return '<span style="cursor: pointer;color: blue;" ONCLICK="sComplaint(\'' + row.complaintDepartment + '\')">'+cName+'</span>';
} }
} }
}, },
@ -401,7 +402,7 @@
} }
}) })
} }
/*function rTable(name,n){ function rTable(name,n){
var currentId=$('form').eq(n-1).attr('id') var currentId=$('form').eq(n-1).attr('id')
var params = $.common.formToJSON(currentId); var params = $.common.formToJSON(currentId);
$.ajax({ $.ajax({
@ -415,11 +416,12 @@
console.log(pieData); console.log(pieData);
//option3.series.data=pieData; //option3.series.data=pieData;
var option3 = { var option3 = {
color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF','#63B8FF'], /*color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF','#63B8FF'],
tooltip: {}, tooltip: {},
legend: { legend: {
data: ['投诉类型统计'] data: ['投诉类型统计']
}, },
series: [ series: [
{ {
name: '投诉类型统计', name: '投诉类型统计',
@ -434,7 +436,42 @@
} }
}, },
} }
] ]*/
tooltip: {
trigger: 'item',
formatter: '{b}: {c} ({d}%)'
},
/*legend: {
x : 'left',
y : 'center',
itemGap: 20,
orient: 'vercital'
},*/
color: ['#1f74f1', '#79e24a', '#41d5d3', '#f59036', '#fed100', '#ababac'],
series: [{
top: '10%',
left: '20%',
type: 'pie',
name: '名称',
radius: ['20%', '28%'],
center: ['50%', '25%'],
label: {
formatter: '{b}: {c} ({d}%)',
borderWidth: 1,
borderRadius: 4,
color: '#4F4F4F',
fontFamily: 'PingFangSC-Regular',
fontSize: '14',
rich: {
a: {
color: '#4F4F4F',
lineHeight: 18,
align: 'center'
}
}
},
data: pieData,
}]
} }
myChart.setOption(option3); myChart.setOption(option3);
} }
@ -443,7 +480,7 @@
console.error("请求失败:",status,error); console.error("请求失败:",status,error);
} }
}) })
}*/ }
function timeType1() { function timeType1() {
var dateSearch = document.getElementById("dateSearch"); var dateSearch = document.getElementById("dateSearch");
console.log(dateSearch.value) console.log(dateSearch.value)

54
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statisticsEnterprise/statisticsEnterprise.html

@ -175,6 +175,7 @@
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "code/statisticsEnterprise"; var prefix = ctx + "code/statisticsEnterprise";
/*var myChart = echarts.init(document.getElementById('container'));*/ /*var myChart = echarts.init(document.getElementById('container'));*/
var myChart = echarts.init(document.getElementById('echartEnterprise'));
window.onload = function () { window.onload = function () {
$("#quarter2").hide(); $("#quarter2").hide();
$("#month2").hide(); $("#month2").hide();
@ -328,7 +329,7 @@
} }
}) })
} }
/*function eTable2(){ function eTable2(){
var currentId=$('form').eq(1).attr('id') var currentId=$('form').eq(1).attr('id')
var params = $.common.formToJSON(currentId); var params = $.common.formToJSON(currentId);
$.ajax({ $.ajax({
@ -338,8 +339,8 @@
success:function (response){ success:function (response){
$('#bootstrap-table2').bootstrapTable('load', response); $('#bootstrap-table2').bootstrapTable('load', response);
var option3 = { var option3 = {
/!*color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF'],*!/ /*color:['#1874CD','#3A5FCD','#436EEE','#4876FF','#1E90FF'],*/
tooltip: {}, /*tooltip: {},
legend: { legend: {
data: ['企业类型统计'] data: ['企业类型统计']
}, },
@ -357,14 +358,49 @@
} }
}, },
} }
] ]*/
tooltip: {
trigger: 'item',
formatter: '{b}: {c} ({d}%)'
},
/*legend: {
x : 'left',
y : 'center',
itemGap: 20,
orient: 'vercital'
},*/
color: ['#1f74f1', '#79e24a', '#41d5d3', '#f59036', '#fed100', '#ababac'],
series: [{
top: '10%',
left: '20%',
type: 'pie',
name: '名称',
radius: ['20%', '28%'],
center: ['50%', '25%'],
label: {
formatter: '{b}: {c} ({d}%)',
borderWidth: 1,
borderRadius: 4,
color: '#4F4F4F',
fontFamily: 'PingFangSC-Regular',
fontSize: '14',
rich: {
a: {
color: '#4F4F4F',
lineHeight: 18,
align: 'center'
}
}
},
data: response,
}]
} }
myChart.setOption(option3); myChart.setOption(option3);
},error:function (xhr,status,error){ },error:function (xhr,status,error){
console.error("请求失败:",status,error); console.error("请求失败:",status,error);
} }
}) })
}*/ }
function eSearch2 () { function eSearch2 () {
eTable2(); eTable2();
@ -483,18 +519,18 @@
/*******echarts:企业类型/占比*********/ /*******echarts:企业类型/占比*********/
const ecsh = echarts.init(document.getElementById("echartEnterprise")); /* const ecsh = echarts.init(document.getElementById("echartEnterprise"));
const optionsh = { const optionsh = {
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
formatter: '{b}: {c} ({d}%)' formatter: '{b}: {c} ({d}%)'
}, },
/*legend: { /!*legend: {
x : 'left', x : 'left',
y : 'center', y : 'center',
itemGap: 20, itemGap: 20,
orient: 'vercital' orient: 'vercital'
},*/ },*!/
color: ['#1f74f1', '#79e24a', '#41d5d3', '#f59036', '#fed100', '#ababac'], color: ['#1f74f1', '#79e24a', '#41d5d3', '#f59036', '#fed100', '#ababac'],
series: [{ series: [{
top: '10%', top: '10%',
@ -534,7 +570,7 @@
myChart.setOption(option); myChart.setOption(option);
window.addEventListener("resize",function(){ window.addEventListener("resize",function(){
myChart.resize(); myChart.resize();
}); });*/
</script> </script>
</body> </body>

36
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintStatistics.java

@ -16,6 +16,10 @@ public class ComplaintStatistics extends BaseDomain {
public String enterpriseName; public String enterpriseName;
public String enterpriseNumber; public String enterpriseNumber;
public int enforceType; public int enforceType;
public String problemDescription;
public String linkman;
public String linkmanTel;
public String enterpriseAddress;
public String beginTime; public String beginTime;
public String endTime; public String endTime;
public String total; public String total;
@ -140,4 +144,36 @@ public class ComplaintStatistics extends BaseDomain {
public void setNullType(Integer nullType) { public void setNullType(Integer nullType) {
this.nullType = nullType; this.nullType = nullType;
} }
public String getLinkman() {
return linkman;
}
public void setLinkman(String linkman) {
this.linkman = linkman;
}
public String getProblemDescription() {
return problemDescription;
}
public void setProblemDescription(String problemDescription) {
this.problemDescription = problemDescription;
}
public String getLinkmanTel() {
return linkmanTel;
}
public void setLinkmanTel(String linkmanTel) {
this.linkmanTel = linkmanTel;
}
public String getEnterpriseAddress() {
return enterpriseAddress;
}
public void setEnterpriseAddress(String enterpriseAddress) {
this.enterpriseAddress = enterpriseAddress;
}
} }

1
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/ComplaintStatisticsMapper.java

@ -18,4 +18,5 @@ public interface ComplaintStatisticsMapper {
*/ */
List<ComplaintStatistics> selectComplaintStatisticsGroup(ComplaintStatistics complaintStatistics); List<ComplaintStatistics> selectComplaintStatisticsGroup(ComplaintStatistics complaintStatistics);
List<ComplaintStatistics> selectComplaintStatisticsGroupByType(ComplaintStatistics complaintStatistics); List<ComplaintStatistics> selectComplaintStatisticsGroupByType(ComplaintStatistics complaintStatistics);
Integer insertComplaintStatistics(ComplaintStatistics complaintStatistics);
} }

3
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ComplaintStatisticsService.java

@ -1,6 +1,7 @@
package com.zdxt.code.service; package com.zdxt.code.service;
import com.zdxt.code.domain.ComplaintStatistics; import com.zdxt.code.domain.ComplaintStatistics;
import com.zdxt.code.domain.EnterpriseComplaint;
import java.util.List; import java.util.List;
@ -11,4 +12,6 @@ public interface ComplaintStatisticsService {
List<ComplaintStatistics> selectComplaintStatisticsGroup(ComplaintStatistics complaintStatistics); List<ComplaintStatistics> selectComplaintStatisticsGroup(ComplaintStatistics complaintStatistics);
List<ComplaintStatistics> selectComplaintStatisticsGroupByType(ComplaintStatistics complaintStatistics); List<ComplaintStatistics> selectComplaintStatisticsGroupByType(ComplaintStatistics complaintStatistics);
void insertComplaintStatistics(EnterpriseComplaint enterpriseComplaint);
} }

127
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ComplaintStatisticsImpl.java

@ -1,17 +1,26 @@
package com.zdxt.code.service.impl; package com.zdxt.code.service.impl;
import com.zdxt.auth.project.system.dept.service.IDeptService;
import com.zdxt.code.domain.ComplaintStatistics; import com.zdxt.code.domain.ComplaintStatistics;
import com.zdxt.code.domain.EnterpriseComplaint;
import com.zdxt.code.mapper.ComplaintStatisticsMapper; import com.zdxt.code.mapper.ComplaintStatisticsMapper;
import com.zdxt.code.service.ComplaintStatisticsService; import com.zdxt.code.service.ComplaintStatisticsService;
import com.zdxt.domain.auth.Dept;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.xml.crypto.Data;
import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List; import java.util.List;
@Service @Service
public class ComplaintStatisticsImpl implements ComplaintStatisticsService { public class ComplaintStatisticsImpl implements ComplaintStatisticsService {
@Autowired @Autowired
private ComplaintStatisticsMapper complaintStatisticsMapper; private ComplaintStatisticsMapper complaintStatisticsMapper;
@Autowired
private IDeptService iDeptService;
@Override @Override
public List<ComplaintStatistics> selectComplaintStatisticsList(ComplaintStatistics complaintStatistics){ public List<ComplaintStatistics> selectComplaintStatisticsList(ComplaintStatistics complaintStatistics){
return complaintStatisticsMapper.selectComplaintStatisticsList(complaintStatistics); return complaintStatisticsMapper.selectComplaintStatisticsList(complaintStatistics);
@ -25,4 +34,122 @@ public class ComplaintStatisticsImpl implements ComplaintStatisticsService {
public List<ComplaintStatistics> selectComplaintStatisticsGroupByType(ComplaintStatistics complaintStatistics){ public List<ComplaintStatistics> selectComplaintStatisticsGroupByType(ComplaintStatistics complaintStatistics){
return complaintStatisticsMapper.selectComplaintStatisticsGroupByType(complaintStatistics); return complaintStatisticsMapper.selectComplaintStatisticsGroupByType(complaintStatistics);
} }
@Override
public void insertComplaintStatistics(EnterpriseComplaint enterpriseComplaint) {
SimpleDateFormat str = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/*if (enterpriseComplaint.getComplaintDepartmentIds() != null && !"".equals(enterpriseComplaint.getComplaintDepartmentIds())) {
List<String> departmentIdList = Arrays.asList(enterpriseComplaint.getComplaintDepartmentIds().split(","));
if (!departmentIdList.isEmpty()) {
for (String s : departmentIdList) {
ComplaintStatistics complaintStatistics = new ComplaintStatistics();
complaintStatistics.setCid(enterpriseComplaint.getId());
if (enterpriseComplaint.getRelId() != null && !"".equals(enterpriseComplaint.getRelId())) {
complaintStatistics.setRid(enterpriseComplaint.getRelId());
}
complaintStatistics.setComplaintTime(str.format(enterpriseComplaint.getCreateTime()));//同步投诉创建时间
if (enterpriseComplaint.getComplaintType() != null) {
complaintStatistics.setComplaintType(enterpriseComplaint.getComplaintType());
}
if (enterpriseComplaint.getEnterpriseName() != null && !"".equals(enterpriseComplaint.getEnterpriseName())) {
complaintStatistics.setEnterpriseName(enterpriseComplaint.getEnterpriseName());
}
if (enterpriseComplaint.getEnterpriseNumber() != null && !"".equals(enterpriseComplaint.getEnterpriseNumber())) {
complaintStatistics.setEnterpriseNumber(enterpriseComplaint.getEnterpriseNumber());
}
complaintStatistics.setComplaintDepartmentId(s);
String sName = iDeptService.selectDeptById(s).getDeptName();
if (sName != null && !"".equals(sName)) {
complaintStatistics.setComplaintDepartment(sName);
}
complaintStatisticsMapper.insertComplaintStatistics(complaintStatistics);
}
}
}*/
if(enterpriseComplaint.getRelId()==null||"".equals(enterpriseComplaint.getRelId())){//入企不扫码
List<String> departmentIdList = Arrays.asList(enterpriseComplaint.getComplaintItemCodes().split(","));
if (!departmentIdList.isEmpty()) {
for (String s : departmentIdList) {
ComplaintStatistics complaintStatistics = new ComplaintStatistics();
complaintStatistics.setCid(enterpriseComplaint.getId());
if (enterpriseComplaint.getRelId() != null && !"".equals(enterpriseComplaint.getRelId())) {
complaintStatistics.setRid(enterpriseComplaint.getRelId());
}
complaintStatistics.setComplaintTime(str.format(enterpriseComplaint.getCreateTime()));//同步投诉创建时间
if (enterpriseComplaint.getComplaintType() != null) {
complaintStatistics.setComplaintType(enterpriseComplaint.getComplaintType());
}
if (enterpriseComplaint.getEnforceType() != null) {
complaintStatistics.setEnforceType(enterpriseComplaint.getEnforceType());
}
if (enterpriseComplaint.getEnterpriseName() != null && !"".equals(enterpriseComplaint.getEnterpriseName())) {
complaintStatistics.setEnterpriseName(enterpriseComplaint.getEnterpriseName());
}
if (enterpriseComplaint.getEnterpriseNumber() != null && !"".equals(enterpriseComplaint.getEnterpriseNumber())) {
complaintStatistics.setEnterpriseNumber(enterpriseComplaint.getEnterpriseNumber());
}
if (enterpriseComplaint.getProblemDescription() != null && !"".equals(enterpriseComplaint.getProblemDescription())) {
complaintStatistics.setProblemDescription(enterpriseComplaint.getProblemDescription());
}
if (enterpriseComplaint.getLinkman() != null && !"".equals(enterpriseComplaint.getLinkman())) {
complaintStatistics.setLinkman(enterpriseComplaint.getLinkman());
}
if (enterpriseComplaint.getLinkmanTel() != null && !"".equals(enterpriseComplaint.getLinkmanTel())) {
complaintStatistics.setLinkmanTel(enterpriseComplaint.getLinkmanTel());
}
if (enterpriseComplaint.getEnterpriseAddress() != null && !"".equals(enterpriseComplaint.getEnterpriseAddress())) {
complaintStatistics.setEnterpriseAddress(enterpriseComplaint.getEnterpriseAddress());
}
Dept dept = iDeptService.selectDeptByCreditcode(s.substring(0,18));//截取前18位即其组织机构代码
if(dept!=null) {
complaintStatistics.setComplaintDepartmentId(dept.getDeptId());
if (dept.getDeptName() != null && !"".equals(dept.getDeptName())) {
complaintStatistics.setComplaintDepartment(dept.getDeptName());
}
}
complaintStatisticsMapper.insertComplaintStatistics(complaintStatistics);
}
}
}else {//检查事项投诉
List<String> departmentIdList = Arrays.asList(enterpriseComplaint.getComplaintDepartmentIds().split(","));
for (String s : departmentIdList) {
ComplaintStatistics complaintStatistics = new ComplaintStatistics();
complaintStatistics.setCid(enterpriseComplaint.getId());
if (enterpriseComplaint.getRelId() != null && !"".equals(enterpriseComplaint.getRelId())) {
complaintStatistics.setRid(enterpriseComplaint.getRelId());
}
complaintStatistics.setComplaintTime(str.format(enterpriseComplaint.getCreateTime()));//同步投诉创建时间
if (enterpriseComplaint.getComplaintType() != null) {
complaintStatistics.setComplaintType(enterpriseComplaint.getComplaintType());
}
if (enterpriseComplaint.getEnforceType() != null) {
complaintStatistics.setEnforceType(enterpriseComplaint.getEnforceType());
}
if (enterpriseComplaint.getEnterpriseName() != null && !"".equals(enterpriseComplaint.getEnterpriseName())) {
complaintStatistics.setEnterpriseName(enterpriseComplaint.getEnterpriseName());
}
if (enterpriseComplaint.getEnterpriseNumber() != null && !"".equals(enterpriseComplaint.getEnterpriseNumber())) {
complaintStatistics.setEnterpriseNumber(enterpriseComplaint.getEnterpriseNumber());
}
if (enterpriseComplaint.getProblemDescription() != null && !"".equals(enterpriseComplaint.getProblemDescription())) {
complaintStatistics.setProblemDescription(enterpriseComplaint.getProblemDescription());
}
if (enterpriseComplaint.getLinkman() != null && !"".equals(enterpriseComplaint.getLinkman())) {
complaintStatistics.setLinkman(enterpriseComplaint.getLinkman());
}
if (enterpriseComplaint.getLinkmanTel() != null && !"".equals(enterpriseComplaint.getLinkmanTel())) {
complaintStatistics.setLinkmanTel(enterpriseComplaint.getLinkmanTel());
}
if (enterpriseComplaint.getEnterpriseAddress() != null && !"".equals(enterpriseComplaint.getEnterpriseAddress())) {
complaintStatistics.setEnterpriseAddress(enterpriseComplaint.getEnterpriseAddress());
}
complaintStatistics.setComplaintDepartmentId(s);
String sName = iDeptService.selectDeptById(s).getDeptName();
if (sName != null && !"".equals(sName)) {
complaintStatistics.setComplaintDepartment(sName);
}
complaintStatisticsMapper.insertComplaintStatistics(complaintStatistics);
}
}
System.out.println("同步到投诉统计表");
}
} }

4
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java

@ -18,6 +18,7 @@ import com.zdxt.auth.feign.ZdxtFileCommonApi;
import com.zdxt.code.domain.*; import com.zdxt.code.domain.*;
import com.zdxt.code.mapper.ComplaintItemMapper; import com.zdxt.code.mapper.ComplaintItemMapper;
import com.zdxt.code.mapper.EnforcementRegistrationMapper; import com.zdxt.code.mapper.EnforcementRegistrationMapper;
import com.zdxt.code.service.ComplaintStatisticsService;
import com.zdxt.code.service.MssqApiService; import com.zdxt.code.service.MssqApiService;
import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.DateUtils;
import com.zdxt.common.util.StringUtils; import com.zdxt.common.util.StringUtils;
@ -47,6 +48,8 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
private static final Logger log = LoggerFactory.getLogger(IEnterpriseComplaintService.class); private static final Logger log = LoggerFactory.getLogger(IEnterpriseComplaintService.class);
@Autowired @Autowired
private EnterpriseComplaintMapper enterpriseComplaintMapper; private EnterpriseComplaintMapper enterpriseComplaintMapper;
@Autowired
private ComplaintStatisticsService complaintStatisticsService;
@Autowired @Autowired
private ZdxtFileCommonApi zdxtFileCommonApi; private ZdxtFileCommonApi zdxtFileCommonApi;
@ -180,6 +183,7 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi
//默认工单为已受理 //默认工单为已受理
enterpriseComplaint.setStatus(0); enterpriseComplaint.setStatus(0);
int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint); int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint);
complaintStatisticsService.insertComplaintStatistics(enterpriseComplaint);
List<String> proCodeList = new ArrayList<>(); List<String> proCodeList = new ArrayList<>();
if (i > 0) { if (i > 0) {
if(enterpriseComplaint.getEnforceType() != 3 ){ if(enterpriseComplaint.getEnforceType() != 3 ){

40
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/ComplaintStatisticsMapper.xml

@ -14,9 +14,14 @@
<result property="enterpriseName" column="enterprise_name"/> <result property="enterpriseName" column="enterprise_name"/>
<result property="enterpriseNumber" column="enterprise_number"/> <result property="enterpriseNumber" column="enterprise_number"/>
<result property="enforceType" column="enforce_type"/> <result property="enforceType" column="enforce_type"/>
<result property="problemDescription" column="problem_description"/>
<result property="linkman" column="linkman"/>
<result property="linkmanTel" column="linkman_tel"/>
<result property="enterpriseAddress" column="enterprise_address"/>
</resultMap> </resultMap>
<sql id="selectComplaintStatisticsVo"> <sql id="selectComplaintStatisticsVo">
select id,cid,rid,complaint_time,complaint_type,complaint_department,complaint_department_id,enterprise_name,enterprise_number,enforce_type from complaint_statistics select id,cid,rid,complaint_time,complaint_type,complaint_department,complaint_department_id,enterprise_name,enterprise_number,enforce_type,problem_description,linkman,linkman_tel,enterprise_address from complaint_statistics
</sql> </sql>
<select id="selectComplaintStatisticsList" parameterType="ComplaintStatistics" resultMap="ComplaintStatisticsResult"> <select id="selectComplaintStatisticsList" parameterType="ComplaintStatistics" resultMap="ComplaintStatisticsResult">
<include refid="selectComplaintStatisticsVo"/> <include refid="selectComplaintStatisticsVo"/>
@ -77,4 +82,37 @@
group by complaint_type group by complaint_type
order by total desc order by total desc
</select> </select>
<insert id="insertComplaintStatistics" parameterType="ComplaintStatistics">
insert into complaint_statistics
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="cid != null and cid != ''">cid,</if>
<if test="rid != null and rid != ''">rid,</if>
<if test="complaintTime != null and complaintTime != ''">complaint_time,</if>
<if test="complaintType != null and complaintType != ''">complaint_type,</if>
<if test="complaintDepartment != null and complaintDepartment != ''">complaint_department,</if>
<if test="complaintDepartmentId != null and complaintDepartmentId != ''">complaint_department_id,</if>
<if test="enterpriseName != null and enterpriseName != ''">enterprise_name,</if>
<if test="enterpriseNumber != null and enterpriseNumber != ''">enterprise_number,</if>
<if test="enforceType != null and enforceType != ''">enforce_type,</if>
<if test="problemDescription != null and problemDescription != ''">problem_description,</if>
<if test="linkman != null and linkman != ''">linkman,</if>
<if test="linkmanTel != null and linkmanTel != ''">linkman_tel,</if>
<if test="enterpriseAddress != null and enterpriseAddress != ''">enterprise_address,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="cid != null and cid != ''">#{cid},</if>
<if test="rid != null and rid != ''">#{rid},</if>
<if test="complaintTime != null and complaintTime != ''">STR_TO_DATE(#{complaintTime},"%Y-%m-%d %H:%i:%s"),</if>
<if test="complaintType != null and complaintType != ''">#{complaintType},</if>
<if test="complaintDepartment != null and complaintDepartment != ''">#{complaintDepartment},</if>
<if test="complaintDepartmentId != null and complaintDepartmentId != ''">#{complaintDepartmentId},</if>
<if test="enterpriseName != null and enterpriseName != ''">#{enterpriseName},</if>
<if test="enterpriseNumber != null and enterpriseNumber != ''">#{enterpriseNumber},</if>
<if test="enforceType != null and enforceType != ''">#{enforceType},</if>
<if test="problemDescription != null and problemDescription != ''">#{problemDescription},</if>
<if test="linkman != null and linkman != ''">#{linkman},</if>
<if test="linkmanTel != null and linkmanTel != ''">#{linkmanTel},</if>
<if test="enterpriseAddress != null and enterpriseAddress != ''">#{enterpriseAddress},</if>
</trim>
</insert>
</mapper> </mapper>
Loading…
Cancel
Save