Browse Source

监督端-执法检查统计修改

v4
zouyx 2 years ago
parent
commit
02e8d9359c
  1. 1
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/fragmentA.html
  2. 79
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
  3. 4
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java
  4. 11
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
  5. 11
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
  6. 1
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java
  7. 4
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java
  8. 54
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
  9. 13
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

1
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/fragmentA.html

@ -8,6 +8,7 @@
<p th:text="|${check} ${checkNumber}|"></p> <p th:text="|${check} ${checkNumber}|"></p>
<p th:text="|占比 ${checkDouble}|"></p>--> <p th:text="|占比 ${checkDouble}|"></p>-->
<p th:text="|${year}年:|"></p> <p th:text="|${year}年:|"></p>
<p><label th:text="涉企检查总数"></label><b th:text="${total}"></b></p>
<p><label th:text="联合检查"></label><b th:text="${unite}"></b><span th:text="占比"></span><b th:text="${uniteDouble}"></b></p> <p><label th:text="联合检查"></label><b th:text="${unite}"></b><span th:text="占比"></span><b th:text="${uniteDouble}"></b></p>
<p><label th:text="${check}"></label><b th:text="${checkNumber}"></b><span th:text="占比"></span><b th:text="${checkDouble}"></b></p> <p><label th:text="${check}"></label><b th:text="${checkNumber}"></b><span th:text="占比"></span><b th:text="${checkDouble}"></b></p>
</li> </li>

79
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html

@ -84,7 +84,7 @@
</select> </select>
</li> </li>
<li> <li>
<p>区域:</p> <p>企业所属区域:</p>
<select id="qy" name="qy" th:with="type=${@dict.getType('address_type')}" onchange="addressMake()"> <select id="qy" name="qy" th:with="type=${@dict.getType('address_type')}" onchange="addressMake()">
<option value="">全市</option> <option value="">全市</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@ -151,10 +151,10 @@
</li>--> </li>-->
<li id="a" th:fragment="a"> <li id="a" th:fragment="a">
<p th:text="|${year}年:|"></p> <p th:text="|${year}年:|"></p>
<p><label th:text="涉企检查总数"></label><b th:text="${total}"></b></p>
<p><label th:text="联合检查"></label><b th:text="${unite}"></b><span th:text="占比"></span><b th:text="${uniteDouble}"></b></p> <p><label th:text="联合检查"></label><b th:text="${unite}"></b><span th:text="占比"></span><b th:text="${uniteDouble}"></b></p>
<p><label th:text="${check}"></label><b th:text="${checkNumber}"></b><span th:text="占比"></span><b th:text="${checkDouble}"></b></p> <p><label th:text="${check}"></label><b th:text="${checkNumber}"></b><span th:text="占比"></span><b th:text="${checkDouble}"></b></p>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
@ -164,7 +164,7 @@
<span id="closeButton" class="detail-close" onclick="closeC()">×</span> <span id="closeButton" class="detail-close" onclick="closeC()">×</span>
<table id="bootstrap-table2"></table> <table id="bootstrap-table2"></table>
</div> </div>
<div id="detail2" class="detail-list" style="width: 75%;"> <div id="detail2" class="detail-list" style="width: 85%;margin-top: -70px;">
<span id="closeButton2" class="detail-close" onclick="closeUnite()">×</span> <span id="closeButton2" class="detail-close" onclick="closeUnite()">×</span>
<table id="bootstrap-table3"></table> <table id="bootstrap-table3"></table>
</div> </div>
@ -277,6 +277,7 @@
//console.log(uniteNumber); //console.log(uniteNumber);
//console.log(checkCategory); //console.log(checkCategory);
var data1=[]; var data1=[];
var enforcementRegistration={};
window.onload = function () { window.onload = function () {
$("#quarter").hide(); $("#quarter").hide();
$("#month").hide(); $("#month").hide();
@ -315,19 +316,30 @@
pageList: [10, 25, 50], pageList: [10, 25, 50],
//quarterBoolean:quarterBoolean, //quarterBoolean:quarterBoolean,
columns: [ columns: [
{
field : 'enterpriseName',
title : '被检查企业名称',
formatter:function (value) {
return "<div style='text-align: left'>"+ value +"</div>";
}
},
{ {
field : 'qy', field : 'qy',
title : '区域' title : '企业所属区域'
}, },
{ {
field : 'jd', field : 'jd',
title : '街道' title : '企业所属街道'
}, },
{ {
field : 'bureauDeptName', field : 'bureauDeptName',
title : '执法部门', title : '执法部门',
formatter:function (value) { formatter:function (value,row,index) {
return "<div style='text-align: left'>"+ value +"</div>"; if(row.uniteType==1){
return "<div style='text-align: left'>"+ value +"(牵头单位)</div>";
}else {
return "<div style='text-align: left'>" + value + "</div>";
}
} }
}, },
{ {
@ -347,13 +359,6 @@
return name; return name;
} }
}, },
{
field : 'enterpriseName',
title : '企业名称',
formatter:function (value) {
return "<div style='text-align: left'>"+ value +"</div>";
}
},
{ {
field : 'lawEnforcementItemText', field : 'lawEnforcementItemText',
title : '检查事项', title : '检查事项',
@ -361,13 +366,18 @@
return "<div style='text-align: left'>"+ $.table.tooltip(value) +"</div>"; return "<div style='text-align: left'>"+ $.table.tooltip(value) +"</div>";
} }
}, },
{
field : 'createTime',
title : '检查时间'
},
{ {
field : 'uniteCheck', field : 'uniteCheck',
title : '联合检查', title : '联合检查',
formatter:function (value,row,index) { formatter:function (value,row,index) {
if(value !=null && value!=''){ if(value !=null && value!=''){
/*return "<span>是</span>";*/ /*return "<span>是</span>";*/
return '<span style="cursor: pointer;color: blue;" ONCLICK="selectUnite(\'' + value + '\')">'+'是'+'</span>'; enforcementRegistration=row;
return '<span style="cursor: pointer;color: blue;" ONCLICK="selectUnite()">'+'是'+'</span>';
}else{ }else{
return "<span>否</span>"; return "<span>否</span>";
} }
@ -418,11 +428,7 @@
} }
} }
}, },
{ ]
field : 'createTime',
title : '检查时间'
},
]
}; };
console.log(options); console.log(options);
$("#bootstrap-table").bootstrapTable(options); $("#bootstrap-table").bootstrapTable(options);
@ -440,19 +446,30 @@
pageList: [10, 25, 50], pageList: [10, 25, 50],
//quarterBoolean:quarterBoolean, //quarterBoolean:quarterBoolean,
columns: [ columns: [
{
field : 'enterpriseName',
title : '被检查企业名称',
formatter:function (value) {
return "<div style='text-align: left'>"+ value +"</div>";
}
},
{ {
field : 'qy', field : 'qy',
title : '区域' title : '企业所属区域'
}, },
{ {
field : 'jd', field : 'jd',
title : '街道' title : '企业所属街道'
}, },
{ {
field : 'bureauDeptName', field : 'bureauDeptName',
title : '执法部门', title : '执法部门',
formatter:function (value) { formatter:function (value,row,index) {
return "<div style='text-align: left'>"+ value +"</div>"; if(row.uniteType==1){
return "<div style='text-align: left'>"+ value +"(牵头单位)</div>";
}else {
return "<div style='text-align: left'>" + value + "</div>";
}
} }
}, },
{ {
@ -472,13 +489,6 @@
return name; return name;
} }
}, },
{
field : 'enterpriseName',
title : '企业名称',
formatter:function (value) {
return "<div style='text-align: left'>"+ value +"</div>";
}
},
{ {
field : 'lawEnforcementItemText', field : 'lawEnforcementItemText',
title : '检查事项', title : '检查事项',
@ -1189,12 +1199,15 @@
function closeC(){ function closeC(){
$('#detail').hide(); $('#detail').hide();
} }
function selectUnite(value){ function selectUnite(){
console.log(enforcementRegistration);
$.ajax({ $.ajax({
url:prefix+'/selectUnite', url:prefix+'/selectUnite',
type:'POST', type:'POST',
data:{ data:{
uniteCheck:value, 'jd':enforcementRegistration.jd,
'qy':enforcementRegistration.qy,
'uniteCheck':enforcementRegistration.uniteCheck,
}, },
success: function (response) { success: function (response) {
$('#detail2').show(); $('#detail2').show();

4
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/DeptStaticController.java

@ -96,7 +96,7 @@ public class DeptStaticController extends BaseController {
startPage(); startPage();
List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301); List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);
for(int i=0;i<zfryjdm2405301List.size();i++){ for(int i=0;i<zfryjdm2405301List.size();i++){
if(zfryjdm2405301List.get(i).getPhoneNumber()!=null&&!"".equals(zfryjdm2405301List.get(i).getPhoneNumber())) { if(zfryjdm2405301List.get(i).getPhoneNumber()!=null&&!"".equals(zfryjdm2405301List.get(i).getPhoneNumber())&&zfryjdm2405301List.get(i).getPhoneNumber().length()>11) {
zfryjdm2405301List.get(i).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", zfryjdm2405301List.get(i).getPhoneNumber())); zfryjdm2405301List.get(i).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", zfryjdm2405301List.get(i).getPhoneNumber()));
} }
} }
@ -120,7 +120,7 @@ public class DeptStaticController extends BaseController {
public void exportDept(HttpServletResponse httpServletResponse, @RequestBody Zfryjdm2405301 zfryjdm2405301) throws IOException { public void exportDept(HttpServletResponse httpServletResponse, @RequestBody Zfryjdm2405301 zfryjdm2405301) throws IOException {
List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301); List<Zfryjdm2405301> zfryjdm2405301List=iZfryjdm2405301Service.selectZfryjdmList2(zfryjdm2405301);
for(int i=0;i<zfryjdm2405301List.size();i++){ for(int i=0;i<zfryjdm2405301List.size();i++){
if(zfryjdm2405301List.get(i).getPhoneNumber()!=null&&!"".equals(zfryjdm2405301List.get(i).getPhoneNumber())) { if(zfryjdm2405301List.get(i).getPhoneNumber()!=null&&!"".equals(zfryjdm2405301List.get(i).getPhoneNumber())&&zfryjdm2405301List.get(i).getPhoneNumber().length()>11) {
zfryjdm2405301List.get(i).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", zfryjdm2405301List.get(i).getPhoneNumber())); zfryjdm2405301List.get(i).setPhoneNumber(IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", zfryjdm2405301List.get(i).getPhoneNumber()));
} }
} }

11
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java

@ -84,6 +84,7 @@ public class EnforcementRegistrationController extends BaseController
String checkName=iDictDataService.selectDictLabel("check_category","01"); String checkName=iDictDataService.selectDictLabel("check_category","01");
model.addAttribute("year",localDate.getYear()); model.addAttribute("year",localDate.getYear());
model.addAttribute("yearList",yearMake()); model.addAttribute("yearList",yearMake());
model.addAttribute("total",list.size());
model.addAttribute("unite",uniteList.size()); model.addAttribute("unite",uniteList.size());
/*model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size())));*/ /*model.addAttribute("uniteDouble",String.format("%.3f",((double)uniteList.size()/list.size())));*/
String uniteDouble=str1.format((double)uniteList.size()/list.size()); String uniteDouble=str1.format((double)uniteList.size()/list.size());
@ -134,6 +135,7 @@ public class EnforcementRegistrationController extends BaseController
enforcementRegistration.setJd(jd); enforcementRegistration.setJd(jd);
enforcementRegistration.setQy(qy); enforcementRegistration.setQy(qy);
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration); List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
list=enforcementRegistrationService.untieCheck1Make(list);
for(int i=0;i<list.size();i++){ for(int i=0;i<list.size();i++){
list.get(i).setQy(qy); list.get(i).setQy(qy);
list.get(i).setJd(jd); list.get(i).setJd(jd);
@ -145,6 +147,7 @@ public class EnforcementRegistrationController extends BaseController
List<DictData> jdList=iDictDataService.selectDictDataByType(enforcementRegistration.getQy()); List<DictData> jdList=iDictDataService.selectDictDataByType(enforcementRegistration.getQy());
enforcementRegistration.setQy(qy); enforcementRegistration.setQy(qy);
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration); List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
list=enforcementRegistrationService.untieCheck1Make(list);
/*List<String> jdStrings=new ArrayList<>(); /*List<String> jdStrings=new ArrayList<>();
for(DictData dictData:jdList){ for(DictData dictData:jdList){
jdStrings.add(dictData.getDictLabel()); jdStrings.add(dictData.getDictLabel());
@ -175,6 +178,7 @@ public class EnforcementRegistrationController extends BaseController
qyStrings.add(dictData.getDictLabel()); qyStrings.add(dictData.getDictLabel());
} }
List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration); List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(enforcementRegistration);
list=enforcementRegistrationService.untieCheck1Make(list);
List<EnforcementRegistration> enforcementRegistrationsList=new ArrayList<>(); List<EnforcementRegistration> enforcementRegistrationsList=new ArrayList<>();
for(DictData qy:qyList){ for(DictData qy:qyList){
List<DictData> jdList=iDictDataService.selectDictDataByType(qy.getDictValue()); List<DictData> jdList=iDictDataService.selectDictDataByType(qy.getDictValue());
@ -231,6 +235,7 @@ public class EnforcementRegistrationController extends BaseController
{ {
startPage(); startPage();
List<EnforcementRegistration> list = enforcementRegistrationService.selectUnite(enforcementRegistration); List<EnforcementRegistration> list = enforcementRegistrationService.selectUnite(enforcementRegistration);
list=enforcementRegistrationService.untieCheck1Make(list);
return getDataTable(list); return getDataTable(list);
} }
@ -270,6 +275,10 @@ public class EnforcementRegistrationController extends BaseController
@GetMapping("/searchType") @GetMapping("/searchType")
public String searchType(EnforcementRegistration enforcementRegistration,Model model) public String searchType(EnforcementRegistration enforcementRegistration,Model model)
{ {
EnforcementRegistration eTotal=new EnforcementRegistration();
eTotal.setYear(enforcementRegistration.getYear());
List<EnforcementRegistration> totalList=enforcementRegistrationService.selectEnforcementRegistrationAndAddressList(eTotal);
model.addAttribute("total",totalList.size());
if(enforcementRegistration.getQy()!=null&&!"".equals(enforcementRegistration.getQy())){ if(enforcementRegistration.getQy()!=null&&!"".equals(enforcementRegistration.getQy())){
if(enforcementRegistration.getJd()!=null&&!"".equals(enforcementRegistration.getJd())){ if(enforcementRegistration.getJd()!=null&&!"".equals(enforcementRegistration.getJd())){
enforcementRegistration.setJd(iDictDataService.selectDictLabel(enforcementRegistration.getQy(),enforcementRegistration.getJd())); enforcementRegistration.setJd(iDictDataService.selectDictLabel(enforcementRegistration.getQy(),enforcementRegistration.getJd()));
@ -743,4 +752,6 @@ public class EnforcementRegistrationController extends BaseController
} }
return false; return false;
} }
} }

11
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@ -178,6 +178,9 @@ public class EnforcementRegistration extends BaseDomain
//部门权限 //部门权限
private String deptQx; private String deptQx;
/** 是否牵头单位 */
private int uniteType;
public String getDeptQx() { public String getDeptQx() {
return deptQx; return deptQx;
} }
@ -700,4 +703,12 @@ public class EnforcementRegistration extends BaseDomain
public void setEnterpriseAddress(String enterpriseAddress) { public void setEnterpriseAddress(String enterpriseAddress) {
this.enterpriseAddress = enterpriseAddress; this.enterpriseAddress = enterpriseAddress;
} }
public int getUniteType() {
return uniteType;
}
public void setUniteType(int uniteType) {
this.uniteType = uniteType;
}
} }

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

@ -35,6 +35,7 @@ public interface EnforcementRegistrationMapper
List<EnforcementRegistration> selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration); List<EnforcementRegistration> selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration);
List<EnforcementRegistration> selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration); List<EnforcementRegistration> selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration);
List<EnforcementRegistration> selectEnforcementRegistrationAndAddressList(EnforcementRegistration enforcementRegistration); List<EnforcementRegistration> selectEnforcementRegistrationAndAddressList(EnforcementRegistration enforcementRegistration);
/*substring(i.enterprise_address,INSTR(i.enterprise_address, '深圳市')+3,INSTR(i.enterprise_address, '区')-3)as qy,substring(i.enterprise_address,INSTR(i.enterprise_address, '区')+1,INSTR(i.enterprise_address, '街道')-INSTR(i.enterprise_address, '区')+1)as jd*/
List<EnforcementRegistration> selectUnite(EnforcementRegistration enforcementRegistration); List<EnforcementRegistration> selectUnite(EnforcementRegistration enforcementRegistration);
/** /**
* 查询企业端-执法登记列表 * 查询企业端-执法登记列表

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

@ -111,4 +111,8 @@ public interface IEnforcementRegistrationService
List<EnforcementRegistrationDto> staticEnforcementRegistrationDetail(EnforcementRegistrationDto enforcementRegistrationDto); List<EnforcementRegistrationDto> staticEnforcementRegistrationDetail(EnforcementRegistrationDto enforcementRegistrationDto);
void exportRegistration(HttpServletResponse response,EnforcementRegistration enforcementRegistration) throws IOException; void exportRegistration(HttpServletResponse response,EnforcementRegistration enforcementRegistration) throws IOException;
List<EnforcementRegistration> untieCheck1Make(List<EnforcementRegistration> enforcementRegistrationList);
List<EnforcementRegistration> untieCheck1MakeAndDetail(List<EnforcementRegistration> enforcementRegistrationList);
} }

54
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@ -20,6 +20,7 @@ import com.zdxt.auth.project.system.dept.service.IDeptService;
import com.zdxt.auth.project.system.dict.service.IDictDataService; import com.zdxt.auth.project.system.dict.service.IDictDataService;
import com.zdxt.code.domain.*; import com.zdxt.code.domain.*;
import com.zdxt.code.domain.dto.EnforcementRegistrationDto; import com.zdxt.code.domain.dto.EnforcementRegistrationDto;
import com.zdxt.code.mapper.EnterpriseLawEnforcementMapper;
import com.zdxt.code.mapper.LinkageDictMapper; import com.zdxt.code.mapper.LinkageDictMapper;
import com.zdxt.code.service.*; import com.zdxt.code.service.*;
import com.zdxt.common.annotation.DataScope; import com.zdxt.common.annotation.DataScope;
@ -70,6 +71,8 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
private IDeptService iDeptService; private IDeptService iDeptService;
@Autowired @Autowired
private IDictDataService iDictDataService; private IDictDataService iDictDataService;
@Autowired
private EnterpriseLawEnforcementMapper enterpriseLawEnforcementMapper;
@Autowired @Autowired
@ -916,4 +919,55 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
return list; return list;
} }
}*/ }*/
/**
* 处理联合执法记录,标注牵头单位和被联合执法
*/
@Override
public List<EnforcementRegistration> untieCheck1Make(List<EnforcementRegistration> enforcementRegistrationList){
Map<Boolean,List<EnforcementRegistration>> uniteMap=enforcementRegistrationList.stream().collect(Collectors.partitioningBy(item->StrUtil.hasEmpty(item.getUniteCheck())));
List<EnforcementRegistration>list=new ArrayList<>();
if(uniteMap.containsKey(false)){
List<EnforcementRegistration> firstList=new ArrayList<>();
List<EnforcementRegistration> second=new ArrayList<>();
for(int i=0;i<uniteMap.get(false).size();i++){
//获取预约id,查出该工单--1为主,0为副 再优化
if(!StrUtil.hasEmpty(uniteMap.get(false).get(i).getLawId())){
EnterpriseLawEnforcement enterpriseLawEnforcement=enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementById(uniteMap.get(false).get(i).getLawId());
uniteMap.get(false).get(i).setUniteType(enterpriseLawEnforcement.getMainDeputyOrder());
if(enterpriseLawEnforcement.getMainDeputyOrder()==1){
firstList.add(uniteMap.get(false).get(i));
}else {
second.add(uniteMap.get(false).get(i));
}
}
}
list=firstList;
list.addAll(second);
}
if(uniteMap.containsKey(true)){
list.addAll(uniteMap.get(true));
}
return list;
}
@Override
public List<EnforcementRegistration> untieCheck1MakeAndDetail(List<EnforcementRegistration> enforcementRegistrationList){
List<EnforcementRegistration>list=new ArrayList<>();
List<EnforcementRegistration> firstList=new ArrayList<>();
List<EnforcementRegistration> second=new ArrayList<>();
for(int i=0;i<enforcementRegistrationList.size();i++){
if(!StrUtil.hasEmpty(enforcementRegistrationList.get(i).getLawId())){
EnterpriseLawEnforcement enterpriseLawEnforcement=enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementById(enforcementRegistrationList.get(i).getLawId());
enforcementRegistrationList.get(i).setUniteType(enterpriseLawEnforcement.getMainDeputyOrder());
if(enterpriseLawEnforcement.getMainDeputyOrder()==1){
firstList.add(enforcementRegistrationList.get(i));
}else {
second.add(enforcementRegistrationList.get(i));
}
}
}
list=firstList;
list.addAll(second);
return list;
}
} }

13
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@ -209,7 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectEnforcementRegistrationAndAddressList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult"> <select id="selectEnforcementRegistrationAndAddressList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,i.enterprise_address,r.law_enforcement_item_text,r.unite_check, select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,i.enterprise_address,r.law_enforcement_item_text,r.unite_check,
r.check_category,r.check_css,r.is_complaint,r.create_time from enforcement_registration r r.check_category,r.check_css,r.is_complaint,r.create_time,r.law_id from enforcement_registration r
left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on r.enterprise_number=i.enterprise_number left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on r.enterprise_number=i.enterprise_number
<where> <where>
and r.bureau_dept_name is not null and r.bureau_dept_name is not null
@ -760,15 +760,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by t.create_time order by t.create_time
</select> </select>
<select id="selectUnite" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult"> <select id="selectUnite" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,i.enterprise_address,r.law_enforcement_item_text,r.unite_check, select id,bureau_dept_name,bureau_dept_id,law_enforcer,law_enforcer_two,enterprise_name,enterprise_number,law_enforcement_item_text,unite_check,
r.check_category,r.check_css,r.is_complaint,r.create_time,substring(i.enterprise_address,4,INSTR(i.enterprise_address, '区')-3)as qy,substring(i.enterprise_address,INSTR(i.enterprise_address, '区')+1,INSTR(i.enterprise_address, '街道')-INSTR(i.enterprise_address, '区')+1)as jd from enforcement_registration r check_category,check_css,is_complaint,create_time,law_id,#{qy} as qy,#{jd} as jd from enforcement_registration
left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on r.enterprise_number=i.enterprise_number
<where> <where>
<if test="uniteCheck != null and uniteCheck != ''"> <if test="uniteCheck != null and uniteCheck != ''">
and r.unite_check=#{uniteCheck} and unite_check=#{uniteCheck}
</if> </if>
</where> </where>
order by i.enterprise_address order by create_time;
</select> </select>
<select id="selectAppStatisticsPart1" parameterType="SearchType" resultMap="EnforcementRegistrationResult"> <select id="selectAppStatisticsPart1" parameterType="SearchType" resultMap="EnforcementRegistrationResult">
select * from enforcement_registration select * from enforcement_registration
@ -864,7 +863,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectUniteNotItself" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult"> <select id="selectUniteNotItself" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,i.enterprise_address,r.law_enforcement_item_text,r.unite_check, select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,i.enterprise_address,r.law_enforcement_item_text,r.unite_check,
r.check_category,r.check_css,r.is_complaint,r.create_timefrom enforcement_registration r r.check_category,r.check_css,r.is_complaint,r.create_time from enforcement_registration r
left join enterprise_information i on r.enterprise_number=i.enterprise_number left join enterprise_information i on r.enterprise_number=i.enterprise_number
<where> <where>
<if test="uniteCheck != null and uniteCheck != ''"> <if test="uniteCheck != null and uniteCheck != ''">

Loading…
Cancel
Save