diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/check/ChkBillDetailMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/check/ChkBillDetailMapper.java index 2ab3992..dd60f42 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/check/ChkBillDetailMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/check/ChkBillDetailMapper.java @@ -82,4 +82,7 @@ public interface ChkBillDetailMapper { /*按照检查项查询*/ ChkBillDetailWithBLOBs findByName(@Param("checkObjectName") String checkObjectName); + + /*查询检查项*/ + List findByChkGovBillId(@Param("chkGovBillId") String chkGovBillId); } diff --git a/inventory-dao/src/main/java/com/rzyc/mapper/check/ChkGovBillMapper.java b/inventory-dao/src/main/java/com/rzyc/mapper/check/ChkGovBillMapper.java index 0867221..0444aa4 100644 --- a/inventory-dao/src/main/java/com/rzyc/mapper/check/ChkGovBillMapper.java +++ b/inventory-dao/src/main/java/com/rzyc/mapper/check/ChkGovBillMapper.java @@ -38,6 +38,11 @@ public interface ChkGovBillMapper { /*通过企业id 查询企业清单*/ List entBillList(@Param("sysEnterpriseId") String sysEnterpriseId, @Param("sysUnitId") String sysUnitId); + + /*行业下检查清单*/ + List findByInClassId(@Param("baseInClassId") String baseInClassId); + + /*通过安全类别 查询企业清单*/ List entBillBySafe(@Param("baseInClassId") String baseInClassId, @Param("safeIds") List safeIds, diff --git a/inventory-dao/src/main/java/com/rzyc/model/ent/MinWorkUnit.java b/inventory-dao/src/main/java/com/rzyc/model/ent/MinWorkUnit.java index 2ccf1a7..fc43c99 100644 --- a/inventory-dao/src/main/java/com/rzyc/model/ent/MinWorkUnit.java +++ b/inventory-dao/src/main/java/com/rzyc/model/ent/MinWorkUnit.java @@ -72,8 +72,19 @@ public class MinWorkUnit implements Serializable { @ApiModelProperty("最小单元分类名称") private String minCategoryName; + @ApiModelProperty("检查表类型 1：最小工作单元 2：监管执法") + private Integer checkType; + private static final long serialVersionUID = 1L; + public Integer getCheckType() { + return checkType; + } + + public void setCheckType(Integer checkType) { + this.checkType = checkType; + } + public String getDangerinfo() { return dangerinfo; } diff --git a/inventory-dao/src/main/resources/mapper/check/ChkBillDetailMapper.xml b/inventory-dao/src/main/resources/mapper/check/ChkBillDetailMapper.xml index 5de53c9..8598d40 100644 --- a/inventory-dao/src/main/resources/mapper/check/ChkBillDetailMapper.xml +++ b/inventory-dao/src/main/resources/mapper/check/ChkBillDetailMapper.xml @@ -884,4 +884,13 @@ SELECT * FROM `chkbilldetail` cd WHERE cd.`CheckObjectName` = #{checkObjectName} order by cd.CreatedOn desc limit 1 + + + diff --git a/inventory-dao/src/main/resources/mapper/check/ChkGovBillMapper.xml b/inventory-dao/src/main/resources/mapper/check/ChkGovBillMapper.xml index b3c5632..9eb47b3 100644 --- a/inventory-dao/src/main/resources/mapper/check/ChkGovBillMapper.xml +++ b/inventory-dao/src/main/resources/mapper/check/ChkGovBillMapper.xml @@ -525,6 +525,11 @@ ORDER BY cb.SortId DESC + + diff --git a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java index 2d04671..9411631 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/MinWorkController.java @@ -255,25 +255,78 @@ public class MinWorkController extends BaseController{ @PostMapping("/getMinWorkUnitList/{parentId}") @ResponseBody public SingleResult getMinWorkUnitList(@PathVariable String parentId){ + + + HashMap map = new HashMap<>(); SingleResult singleResult = new SingleResult(); - List byparentIdList = minWorkUnitMapper.getByparentIdList(parentId); + SysEnterprise sysEnterprise = sysEnterpriseMapper.selectByPrimaryKey(parentId); + + + + if (sysEnterprise != null){ if (StringUtils.isNotEmpty(sysEnterprise.getQrCode())){ map.put("parentCode",sysEnterprise.getQrCode()); }else{ map.put("parentCode",null); } + + List byparentIdList = new ArrayList<>(); + + //最小工作单元检查表 + List workUnitList = minWorkUnitMapper.getByparentIdList(parentId); + if(null != workUnitList){ + for (MinWorkUnit workUnit : workUnitList){ + workUnit.setCheckType(1); + workUnit.setTitle("工作单元："+workUnit.getTitle()); + } + byparentIdList.addAll(workUnitList); + } + + String baseInClassId = sysEnterprise.getWorkClassId(); + + //监管执法清单 + List govBills = new ArrayList<>(); + + //企业清单 + List entGovBills = chkGovBillMapper.entBillList(sysEnterprise.getSysenterpriseid(),""); + if(null != entGovBills && entGovBills.size() > 0){ + govBills.addAll(entGovBills); + } + + //行业清单 + List inGovBills = chkGovBillMapper.findByInClassId(baseInClassId); + if(null != inGovBills && inGovBills.size() > 0){ + govBills.addAll(inGovBills); + } + + + if(null != govBills && govBills.size() > 0){ + for (ChkGovBill govBill : govBills){ + MinWorkUnit workUnit = new MinWorkUnit(); + workUnit.setId(govBill.getChkgovbillid()); + workUnit.setMinCategoryName(govBill.getChkbillname()); + workUnit.setCheckType(2); + workUnit.setMinCategory(govBill.getChkgovbillid()); + workUnit.setTitle("监管执法："+govBill.getChkbillname()); + byparentIdList.add(workUnit); + } + } + + if (byparentIdList.size()>0) { + map.put("minWorkUnitList", byparentIdList); + }else{ + map.put("minWorkUnitList", null); + } + singleResult.setData(map); + + }else{ map.put("parentCode",null); } - if (byparentIdList.size()>0) { - map.put("minWorkUnitList", byparentIdList); - }else{ - map.put("minWorkUnitList", null); - } - singleResult.setData(map); + return singleResult; } @@ -289,7 +342,29 @@ public class MinWorkController extends BaseController{ @ResponseBody public SingleResult getMinWorkUnitCheckItem(String minCategory){ SingleResult singleResult = new SingleResult(); - Listlist = minMiddleIndexMapper.selectCheckItem(minCategory); + Listlist = new ArrayList<>(); + + //工作单元检查项： + List workUnitList = minMiddleIndexMapper.selectCheckItem(minCategory); + if(null != workUnitList && workUnitList.size() > 0){ + list.addAll(workUnitList); + } + + //监管执法检查项 + List billDetails = chkBillDetailMapper.findByChkGovBillId(minCategory); + if(null != billDetails && billDetails.size() > 0){ + for (ChkBillDetailWithBLOBs chkBillDetail : billDetails){ + MinMiddleIndex minMiddleIndex = new MinMiddleIndex(); + minMiddleIndex.setIndexId(chkBillDetail.getChkbilldetailid()); + minMiddleIndex.setMinCategoryId(minCategory); + minMiddleIndex.setId(minCategory); + minMiddleIndex.setChkBillDetailWithBLOBs(chkBillDetail); + minMiddleIndex.setCreateTime(chkBillDetail.getCreatedon()); + minMiddleIndex.setHiddenarea(chkBillDetail.getCheckobjectname()); + list.add(minMiddleIndex); + } + } + singleResult.setData(list); return singleResult; } @@ -1396,6 +1471,23 @@ public class MinWorkController extends BaseController{ public SingleResult minWorkUnitDetail(String id)throws Exception{ SingleResult singleResult = new SingleResult(); MinWorkUnit minWorkUnit = minWorkUnitMapper.selectByPrimaryKey(id); + if(null == minWorkUnit){ + + ChkGovBill chkGovBill = chkGovBillMapper.selectByPrimaryKey(id); + if(null != chkGovBill){ + minWorkUnit = new MinWorkUnit(); + minWorkUnit.setId(chkGovBill.getChkgovbillid()); + minWorkUnit.setMinCategoryName(chkGovBill.getChkbillname()); + minWorkUnit.setCheckType(2); + minWorkUnit.setMinCategory(chkGovBill.getChkgovbillid()); + minWorkUnit.setTitle("监管执法："+chkGovBill.getChkbillname()); + } + + }else{ + minWorkUnit.setCheckType(1); + minWorkUnit.setTitle("工作单元："+minWorkUnit.getTitle()); + } + singleResult.setData(minWorkUnit); return singleResult; } diff --git a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCheckController.java b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCheckController.java index 519f1d4..73b30d5 100644 --- a/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCheckController.java +++ b/inventory-gov/src/main/java/com/rzyc/controller/ent/PcCheckController.java @@ -233,7 +233,9 @@ public class PcCheckController extends com.rzyc.controller.BaseController { chkGovBill.setDelState(1); /***重要关注地方，企业id格式*/ List companyId = JSONArray.parseArray(chkGovBill.getSysEnterpriseId(),String.class); - chkGovBill.setSysEnterpriseId(builder.toString().substring(0,builder.toString().length()-1)); + if(StringUtils.isNotBlank(builder.toString())){ + chkGovBill.setSysEnterpriseId(builder.toString().substring(0,builder.toString().length()-1)); + } if (chkGovBill1 != null){ chkGovBillMapper.updateByPrimaryKey(chkGovBill); entBillConMapper.deleteByChkGovBill(chkGovBill.getChkgovbillid());