diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java index a2dc7f54..1b1fbca6 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseComplaintController.java @@ -19,6 +19,7 @@ import com.zdxt.common.util.ServletUtils; import com.zdxt.common.util.StringUtils; import com.zdxt.common.util.TableDataInfo; import com.zdxt.common.zdxtFile.ZdxtFileCommon; +import com.zdxt.domain.auth.DictData; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -32,6 +33,7 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -171,8 +173,6 @@ public class AppEnterpriseComplaintController extends BaseController { break; } } - } else { - enterpriseComplaint.setEnforceTypeText("入企不扫码"); } // 获取相关事项 - 移到 service 里面去了 @@ -299,4 +299,24 @@ public class AppEnterpriseComplaintController extends BaseController { String result = mssqApiService.mssqQuerySatisfy(mssqAddOrder); return ZDResponse.success("查询成功", result); } + + /** + * 获取行政and非行政未被投诉的列表 + * @param param + * @return + */ + @PostMapping("/getAllCheckList") + @ResponseBody + public TableDataInfo getAllCheckList(@RequestBody EnterpriseComplaint param){ + if(StringUtils.isEmpty(param.getEnterpriseNumber())){ + return getDataTable(new ArrayList<>()); + } + int count=enterpriseComplaintService.getAllCheckCount(param); + List list=enterpriseComplaintService.getAllCheckList(param); + TableDataInfo rspData = getDataTable(list); + rspData.setCode(0); + rspData.setRows(list); + rspData.setTotal(count); + return rspData; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintRegistration.java new file mode 100644 index 00000000..4f338861 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/ComplaintRegistration.java @@ -0,0 +1,196 @@ +package com.zdxt.code.domain; + +import java.util.Date; + +/** + * 行政检查记录and 非行政记录集合 + */ +public class ComplaintRegistration { + private String id; + + /** + * 执法事项 and 入企事项 + */ + private String title; + + /** + * 执法部门name + */ + private String bureauDeptName; + + /** + * 执法部门id + */ + private String bureauDeptId; + + /** + * 执法人员 + */ + private String lawEnforcer; + + /** + * 执法人员id + */ + private String lawEnforcerId; + + /** + * 执法人员 + */ + private String lawEnforcerOther; + + /** + * 执法人员 + */ + private String lawEnforcerOtherId; + + /** + * 统一信用代码 + */ + private String enterpriseNumber; + + /** + * 执法类别 and 入企事由 + */ + private String lawEnforcementType; + + /** + * 数据类型 0行政 1非行政 + */ + private Integer dataType; + + /** + * 执法时间 + */ + private Date enforcementTime; + + /** + * 查询条件 + */ + private String startTime; + + private String endTime; + + private String searchValue; + + + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getSearchValue() { + return searchValue; + } + + public void setSearchValue(String searchValue) { + this.searchValue = searchValue; + } + + public Date getEnforcementTime() { + return enforcementTime; + } + + public void setEnforcementTime(Date enforcementTime) { + this.enforcementTime = enforcementTime; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getBureauDeptName() { + return bureauDeptName; + } + + public void setBureauDeptName(String bureauDeptName) { + this.bureauDeptName = bureauDeptName; + } + + public String getBureauDeptId() { + return bureauDeptId; + } + + public void setBureauDeptId(String bureauDeptId) { + this.bureauDeptId = bureauDeptId; + } + + public String getLawEnforcer() { + return lawEnforcer; + } + + public void setLawEnforcer(String lawEnforcer) { + this.lawEnforcer = lawEnforcer; + } + + public String getLawEnforcerOther() { + return lawEnforcerOther; + } + + public void setLawEnforcerOther(String lawEnforcerOther) { + this.lawEnforcerOther = lawEnforcerOther; + } + + public String getEnterpriseNumber() { + return enterpriseNumber; + } + + public void setEnterpriseNumber(String enterpriseNumber) { + this.enterpriseNumber = enterpriseNumber; + } + + public String getLawEnforcementType() { + return lawEnforcementType; + } + + public void setLawEnforcementType(String lawEnforcementType) { + this.lawEnforcementType = lawEnforcementType; + } + + public Integer getDataType() { + return dataType; + } + + public void setDataType(Integer dataType) { + this.dataType = dataType; + } + + public String getLawEnforcerId() { + return lawEnforcerId; + } + + public void setLawEnforcerId(String lawEnforcerId) { + this.lawEnforcerId = lawEnforcerId; + } + + public String getLawEnforcerOtherId() { + return lawEnforcerOtherId; + } + + public void setLawEnforcerOtherId(String lawEnforcerOtherId) { + this.lawEnforcerOtherId = lawEnforcerOtherId; + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java index d425001a..43ceecc2 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseComplaint.java @@ -1,9 +1,11 @@ package com.zdxt.code.domain; +import com.zdxt.auth.dto.DeptBean; import com.zdxt.common.BaseDomain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.ArrayList; import java.util.List; @@ -182,6 +184,68 @@ private String createTimeStr; */ private Integer dateType; + /** + * 投诉关联记录类型 0行政 1非行政 + */ + private Integer dataType; + + /** + * 投诉事项（对应记录表执法/入企事项） + */ + private String complaintRecordItem; + + /** + * 数据类型 0行政 1 非行政 + */ + private Integer recordType; + + /** + * 行政记录 search条件 + */ + private String checkCategoryCode; + + public String getCheckCategoryCode() { + return checkCategoryCode; + } + + public void setCheckCategoryCode(String checkCategoryCode) { + this.checkCategoryCode = checkCategoryCode; + } + + public String getComplaintRecordItem() { + return complaintRecordItem; + } + + public void setComplaintRecordItem(String complaintRecordItem) { + this.complaintRecordItem = complaintRecordItem; + } + + public Integer getRecordType() { + return recordType; + } + + public void setRecordType(Integer recordType) { + this.recordType = recordType; + } + + public Integer getDataType() { + return dataType; + } + + public void setDataType(Integer dataType) { + this.dataType = dataType; + } + + private List deptList=new ArrayList<>(); + + public List getDeptList() { + return deptList; + } + + public void setDeptList(List deptList) { + this.deptList = deptList; + } + public String getBeginTime() { return beginTime; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java index 4f3d43bf..267e148d 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnterpriseComplaintMapper.java @@ -1,5 +1,6 @@ package com.zdxt.code.mapper; +import com.zdxt.code.domain.ComplaintRegistration; import com.zdxt.code.domain.EnterpriseComplaint; import com.zdxt.code.domain.EnterpriseLawEnforcement; @@ -86,4 +87,8 @@ public interface EnterpriseComplaintMapper int deleteEnterpriseComplaintByIds(String[] ids); List selectEnterpriseComplaintAllList(EnterpriseComplaint enterpriseComplaint); + + List getAllCheckList(EnterpriseComplaint param); + + int getAllCheckCount(EnterpriseComplaint param); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java index 1ede773b..a50f3b39 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseComplaintService.java @@ -1,5 +1,6 @@ package com.zdxt.code.service; +import com.zdxt.code.domain.ComplaintRegistration; import com.zdxt.code.domain.EnterpriseComplaint; import com.zdxt.code.domain.EnterpriseLawEnforcement; import com.zdxt.code.domain.MssqOrderFlow; @@ -77,4 +78,8 @@ public interface IEnterpriseComplaintService List selectEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint); void complaintExport(HttpServletResponse response, List enterpriseComplaintList) throws ParseException; + + List getAllCheckList(EnterpriseComplaint param); + + int getAllCheckCount(EnterpriseComplaint param); } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java index 0882ae80..b519c669 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseComplaintServiceImpl.java @@ -4,6 +4,8 @@ import java.io.*; import java.net.URLEncoder; import java.text.ParseException; import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; @@ -11,15 +13,19 @@ import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.zdxt.auth.dto.DeptBean; +import com.zdxt.auth.dto.DictDataBean; import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.DeptApi; +import com.zdxt.auth.feign.DictDataApi; import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.feign.ZdxtFileCommonApi; import com.zdxt.code.domain.*; import com.zdxt.code.mapper.ComplaintItemMapper; import com.zdxt.code.mapper.EnforcementRegistrationMapper; +import com.zdxt.code.mapper.NonEnforcementRegistrationMapper; import com.zdxt.code.service.ComplaintStatisticsService; import com.zdxt.code.service.MssqApiService; +import com.zdxt.common.util.CommonUtil; import com.zdxt.common.util.DateUtils; import com.zdxt.common.util.StringUtils; import com.zdxt.common.zdxtFile.ZdxtFileCommon; @@ -32,6 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zdxt.code.mapper.EnterpriseComplaintMapper; import com.zdxt.code.service.IEnterpriseComplaintService; +import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletResponse; @@ -68,6 +75,11 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi @Autowired private ComplaintItemMapper complaintItemMapper; + @Autowired private DictDataApi dictDataApi; + + @Autowired + NonEnforcementRegistrationMapper nonMapper; + /** * 查询企业执法-在线投诉 * @@ -77,22 +89,6 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi @Override public EnterpriseComplaint selectEnterpriseComplaintById(String id){ EnterpriseComplaint enterpriseComplaint = enterpriseComplaintMapper.selectEnterpriseComplaintById(id); - if(StringUtils.isNotEmpty(enterpriseComplaint.getRelId())){ - EnforcementRegistration enforcementRegistration = - enforcementRegistrationMapper.selectEnforcementRegistrationById(enterpriseComplaint.getRelId()); - //判断检查事件是否为空 - if(BeanUtil.isNotEmpty(enforcementRegistration) && StringUtils.isNotEmpty(enforcementRegistration.getBureauDeptName())){ - enterpriseComplaint.setBureauDeptName(enforcementRegistration.getBureauDeptName()); - enterpriseComplaint.setBureauDeptId(enforcementRegistration.getBureauDeptId()); - // 获取相关事项 - 执法事项 - enterpriseComplaint.setLawEnforcementIncident(enforcementRegistration.getLawEnforcementItemText()); - }else{ - enterpriseComplaint.setLawEnforcementIncident("无"); - } - - }else{ - enterpriseComplaint.setLawEnforcementIncident("无"); - } return enterpriseComplaint; } @@ -156,6 +152,7 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi * @return 结果 */ @Override + @Transactional public int insertEnterpriseComplaint(EnterpriseComplaint enterpriseComplaint) { // if ("入企不扫码".equals(enterpriseComplaint.getEnforceTypeText())) { @@ -172,55 +169,33 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi //默认工单为已受理 enterpriseComplaint.setStatus(0); //TODO 暂时注释，后续启用 - complaintStatisticsService.insertComplaintStatistics(enterpriseComplaint); +// complaintStatisticsService.insertComplaintStatistics(enterpriseComplaint); int i = enterpriseComplaintMapper.insertEnterpriseComplaint(enterpriseComplaint); + if(i==0)return i; + // 更新记录表投诉状态 0行政 1非行政 + if("0".equals(enterpriseComplaint.getDataType())){ + EnforcementRegistration param=new EnforcementRegistration(); + param.setId(enterpriseComplaint.getRelId()); + param.setIsComplaint(1); + enforcementRegistrationMapper.updateEnforcementRegistration(param); + }else{ + NonEnforcementRegistration param=new NonEnforcementRegistration(); + param.setId(enterpriseComplaint.getRelId()); + param.setHasComplaint(1); + nonMapper.updateNonEnforcementRegistration(param); + } List proCodeList = new ArrayList<>(); - if (i > 0) { - if(enterpriseComplaint.getEnforceType() != 3 ){ - if(StringUtils.isNotEmpty(enterpriseComplaint.getComplaintDepartmentIds())) { - String[] split = enterpriseComplaint.getComplaintDepartmentIds().split(","); - List strings = Arrays.asList(split); - strings.forEach(res -> { - //查询所在部门 - DeptBean deptById = deptApi.getDeptById(res); - //匹配民生诉求事项编码 - String itemCode = ""; - if (StringUtils.isNotEmpty(deptById.getCreditcode())) { - List complaintItems = - complaintItemMapper.selectComplaintItemCodeByNumber(deptById.getCreditcode()); - if (complaintItems.size() > 0) { - itemCode = complaintItems.get(0).getComplaintItemCode(); - } - } - String prwCode = addMssqOrder(enterpriseComplaint, itemCode); - proCodeList.add(prwCode); - }); - } - }else{ - List deptNameList = new ArrayList<>(); - List deptIdsList = new ArrayList<>(); - if(StringUtils.isNotEmpty(enterpriseComplaint.getComplaintDepartmentIds())) { - String[] split = enterpriseComplaint.getComplaintItemCodes().split(","); - List strings = Arrays.asList(split); - strings.forEach(res -> { - String substring = res.substring(0, 18); - //查询所在部门 - DeptBean deptBean = deptApi.selectDeptByCreditcode(substring); - if (BeanUtil.isNotEmpty(deptBean) && StringUtils.isNotEmpty(deptBean.getDeptName())) { - deptNameList.add(deptBean.getDeptName()); - deptIdsList.add(deptBean.getDeptId()); - } - String prwCode = addMssqOrder(enterpriseComplaint, res); - proCodeList.add(prwCode); - }); - enterpriseComplaint.setComplaintDepartments(String.join(",",deptNameList)); - enterpriseComplaint.setComplaintDepartmentIds(String.join(",",deptIdsList)); - } - } - //投诉工单返回参数 - enterpriseComplaint.setProWoCode(String.join(",",proCodeList)); - enterpriseComplaintMapper.updateEnterpriseComplaint(enterpriseComplaint); + // 创建民生诉求工单 + if(StringUtils.isNotEmpty(enterpriseComplaint.getComplaintItemCodes())){ + List codes = Arrays.asList(Convert.toStrArray(enterpriseComplaint.getComplaintItemCodes())); + codes.forEach(c->{ + String prwCode = addMssqOrder(enterpriseComplaint, c); +// proCodeList.add(prwCode); + }); } + //投诉工单返回参数 + enterpriseComplaint.setProWoCode(String.join(",",proCodeList)); + enterpriseComplaintMapper.updateEnterpriseComplaint(enterpriseComplaint); if(i > 0 && enterpriseComplaint.getFileList().size() > 0){ enterpriseComplaint.getFileList().forEach(res ->{ @@ -341,7 +316,7 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi //创建HSSFWorkbook对象（excel文档对象） HSSFWorkbook wb=new HSSFWorkbook(); //建立新的sheet对象（sheet：表单） - HSSFSheet sheet= wb.createSheet("行政执法检查统计"); + HSSFSheet sheet= wb.createSheet("行政执法统计"); try { //wb.write(new File("D:/code/执法监督码使用情况统计.xls")); String string="投诉类型统计.xls"; @@ -368,4 +343,71 @@ public class EnterpriseComplaintServiceImpl implements IEnterpriseComplaintServi throw new RuntimeException(e); } } + + @Override + public List getAllCheckList(EnterpriseComplaint param) { + setDept(param); + + // 执法类别 + DictDataBean bean =new DictDataBean(); + bean.setDictType("check_category"); + List dictList=dictDataApi.getDictData(bean); + Map dict=dictList.stream() + .collect(Collectors.toMap(DictDataBean::getDictValue, Function.identity())); + + // 搜索条件匹配行政检查执法类别code + if(StringUtils.isNotEmpty(param.getSearchValue())){ + String code=dictList.stream() + .filter(d->d.getDictLabel().contains(param.getSearchValue())) + .findFirst().get().getDictValue(); + if(StringUtils.isNotEmpty(code))param.setCheckCategoryCode(code); + } + List list=enterpriseComplaintMapper.getAllCheckList(param); + if(list.size()==0) return new ArrayList<>(); + + list.forEach(li->{ + if(Objects.nonNull(dict.get(li.getLawEnforcementType()))){ + li.setLawEnforcementType(dict.get(li.getLawEnforcementType()).getDictLabel()); + } + if(StringUtils.isEmpty(li.getLawEnforcerId()))return; + // 执法人员 + UserBean user=userApi.getUserByUserId(Long.valueOf(li.getLawEnforcerId())); + String num=StringUtils.isEmpty(user.getLawCertificateNum())? + CommonUtil.encryptPhone(user.getPhonenumber()):user.getLawCertificateNum(); + li.setLawEnforcer(user.getUserName()+" "+num); + if(StringUtils.isNotEmpty(li.getLawEnforcerOtherId())){ + List userList = userApi.getUserByUserIds(li.getLawEnforcerOtherId()); + List userText=new ArrayList<>(); + userList.forEach(u->{ + String temp=StringUtils.isEmpty(user.getLawCertificateNum())? + CommonUtil.encryptPhone(user.getPhonenumber()):user.getLawCertificateNum(); + userText.add(u.getUserName()+" "+temp); + }); + li.setLawEnforcerOther(userText.size()!=0?String.join(",",userText):""); + } + }); + return list; + } + + @Override + public int getAllCheckCount(EnterpriseComplaint param) { + setDept(param); + return enterpriseComplaintMapper.getAllCheckCount(param); + } + + // 获取执法单位 + private void setDept(EnterpriseComplaint param){ + if(StringUtils.isNotEmpty(param.getComplaintItemCodes())){ + List codes=Arrays.asList(Convert.toStrArray(param.getComplaintItemCodes())); + List deptList=new ArrayList<>(); + codes.forEach(c->{ + c=c.substring(0,18); + DeptBean deptBean = deptApi.selectDeptByCreditcode(c); + if (BeanUtil.isNotEmpty(deptBean)) { + deptList.add(deptBean); + } + }); + param.setDeptList(deptList); + } + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml index 2f46d10e..11677c5b 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml @@ -27,13 +27,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select id, rel_id, enforce_type, problem_description, enterprise_address, linkman, linkman_tel, com_or_opi, authorization, create_time, pro_wo_code,enterprise_number, enterprise_name,status,evaluate_time,complaint_departments,complaint_department_ids, - enforcement_time,handle_time,complaint_type,complaint_item_codes,complaint_item_names + enforcement_time,handle_time,complaint_type,complaint_item_codes,complaint_item_names,complaint_record_item, + record_type from enterprise_complaint @@ -164,6 +167,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" complaint_type, complaint_item_codes, complaint_item_names, + complaint_record_item, + record_type, #{id}, @@ -185,6 +190,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{complaintType}, #{complaintItemCodes}, #{complaintItemNames}, + #{complaintRecordItem}, + #{recordType}, @@ -285,4 +292,118 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + (SELECT + id, + law_enforcer AS lawEnforcer, + law_enforcer_id AS lawEnforcerId, + law_enforcer_id_other AS lawEnforcerOtherId, + law_enforcer_other AS lawEnforcerOther, + law_enforcement_item_text AS title, + law_enforcement_type_text AS lawEnforcementType, + 1 AS dataType, + bureau_dept_id AS bureauDeptId, + bureau_dept_name AS bureauDeptName, + enforcement_time as enforcementTime + FROM + non_enforcement_registration + WHERE + has_submit = 1 + AND has_complaint = 0 + + AND enterprise_number = #{enterpriseNumber} + + + AND bureau_dept_id = #{complaintDepartmentIds} + + + and bureau_dept_id in + + #{item.deptId} + + + UNION ALL + SELECT + id, + law_enforcer AS lawEnforcer, + law_enforcer_id AS lawEnforcerId, + law_enforcer_id_two AS lawEnforcerOtherId, + law_enforcer_two AS lawEnforcerOther, + law_enforcement_item_text AS title, + check_category AS lawEnforcementType, + 0 AS dataType, + bureau_dept_id AS bureauDeptId, + bureau_dept_name AS bureauDeptName , + enforcement_time as enforcementTime + FROM + enforcement_registration + WHERE + is_submit = 1 + AND is_complaint = 0 + + AND enterprise_number = #{enterpriseNumber} + + + AND bureau_dept_id = #{complaintDepartmentIds} + + + and bureau_dept_id in + + #{item.deptId} + + + + ) m + + + + \ No newline at end of file