From e9218678c823f15842a703d083f55ae34e902930 Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Tue, 9 Jul 2024 16:01:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=90=88=E6=89=A7=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...AppEnterpriseLawEnforcementController.java | 117 ++++++++++++------ .../code/domain/EnterpriseLawEnforcement.java | 60 +++++---- .../service/impl/StatisticalServiceImpl.java | 6 + .../mapper/EnterpriseLawEnforcementMapper.xml | 10 +- .../resources/mapper/StatisticalMapper.xml | 12 ++ 5 files changed, 146 insertions(+), 59 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java index a7de408c..a9a6dc0a 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java @@ -2,6 +2,8 @@ package com.zdxt.app.controller; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.zdxt.auth.dto.DeptBean; import com.zdxt.auth.dto.UserBean; import com.zdxt.auth.feign.UserApi; @@ -15,6 +17,7 @@ import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; import com.zdxt.common.util.StringUtils; import com.zdxt.common.util.TableDataInfo; +import org.apache.commons.collections.map.HashedMap; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -101,28 +104,37 @@ public class AppEnterpriseLawEnforcementController extends BaseController @ResponseBody public ZDResponse addSave(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement) { - int resNum = 0; - // 先执行一波删除 . 根据联合执法ID来删除 - if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getUniteCheck())) { - enterpriseLawEnforcementService.deleteEnterpriseLawEnforcementByUniteCheck(enterpriseLawEnforcement.getUniteCheck()); - // 将id设为空, 确保serveice中的逻辑进行新增操作 - enterpriseLawEnforcement.setId(null); - } - - // 统一加入联合执法id - enterpriseLawEnforcement.setUniteCheck(IdUtil.simpleUUID()); List deptObjs = enterpriseLawEnforcement.getDeptObjs(); - DeptBean tmp = new DeptBean(); - tmp.setDeptId(enterpriseLawEnforcement.getLawEnforcementId()); - tmp.setDeptName(enterpriseLawEnforcement.getLawEnforcement()); - deptObjs.add(tmp); + Map tmpDetpJson = new HashedMap(); for (DeptBean bean : deptObjs) { - enterpriseLawEnforcement.setLawEnforcementId(bean.getDeptId()); - enterpriseLawEnforcement.setLawEnforcement(bean.getDeptName()); - resNum += enterpriseLawEnforcementService.insertEnterpriseLawEnforcement(enterpriseLawEnforcement); - enterpriseLawEnforcement.setId(null); + tmpDetpJson.put(bean.getDeptId(), bean.getDeptName()); } - return resNum > 0 ? ZDResponse.success("预约成功") : ZDResponse.error("预约失败"); + enterpriseLawEnforcement.setTmpDeptJson(JSONObject.toJSONString(tmpDetpJson)); + return enterpriseLawEnforcementService.insertEnterpriseLawEnforcement(enterpriseLawEnforcement) > 0 ? ZDResponse.success("预约成功") : ZDResponse.error("预约失败"); + + // 预约保存时, 联合检查相关数据不进行新增 +// int resNum = 0; +// // 先执行一波删除 . 根据联合执法ID来删除 +// if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getUniteCheck())) { +// enterpriseLawEnforcementService.deleteEnterpriseLawEnforcementByUniteCheck(enterpriseLawEnforcement.getUniteCheck()); +// // 将id设为空, 确保serveice中的逻辑进行新增操作 +// enterpriseLawEnforcement.setId(null); +// } +// +// // 统一加入联合执法id +// enterpriseLawEnforcement.setUniteCheck(IdUtil.simpleUUID()); +// List deptObjs = enterpriseLawEnforcement.getDeptObjs(); +// DeptBean tmp = new DeptBean(); +// tmp.setDeptId(enterpriseLawEnforcement.getLawEnforcementId()); +// tmp.setDeptName(enterpriseLawEnforcement.getLawEnforcement()); +// deptObjs.add(tmp); +// for (DeptBean bean : deptObjs) { +// enterpriseLawEnforcement.setLawEnforcementId(bean.getDeptId()); +// enterpriseLawEnforcement.setLawEnforcement(bean.getDeptName()); +// resNum += enterpriseLawEnforcementService.insertEnterpriseLawEnforcement(enterpriseLawEnforcement); +// enterpriseLawEnforcement.setId(null); +// } +// return resNum > 0 ? ZDResponse.success("预约成功") : ZDResponse.error("预约失败"); } /** @@ -155,23 +167,33 @@ public class AppEnterpriseLawEnforcementController extends BaseController @ResponseBody public ZDResponse editSave(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement) { + // 通过 uniteCheck 来判断是否联合执法单, int resNum = 0; // 先执行一波删除 . 根据联合执法ID来删除 - if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getUniteCheck())) { - enterpriseLawEnforcementService.deleteEnterpriseLawEnforcementByUniteCheck(enterpriseLawEnforcement.getUniteCheck()); - // 将id设为空, 确保serveice中的逻辑进行新增操作 - enterpriseLawEnforcement.setId(null); - } +// if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getUniteCheck())) { +// enterpriseLawEnforcementService.deleteEnterpriseLawEnforcementByUniteCheck(enterpriseLawEnforcement.getUniteCheck()); +// // 将id设为空, 确保serveice中的逻辑进行新增操作 +// enterpriseLawEnforcement.setId(null); +// } enterpriseLawEnforcement.setIsSubmit(1); + enterpriseLawEnforcement.setMainDeputyOrder(1); enterpriseLawEnforcement.setUniteCheck(IdUtil.simpleUUID()); + enterpriseLawEnforcement.setTmpDeptJson(null); + // 先单独处理主单 + if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getId())) { + resNum += enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(enterpriseLawEnforcement); + enterpriseLawEnforcement.setId(null); + } else { + resNum += enterpriseLawEnforcementService.insertEnterpriseLawEnforcement(enterpriseLawEnforcement); + enterpriseLawEnforcement.setId(null); + } + // 在循环处理联合执法部门的单 List deptObjs = enterpriseLawEnforcement.getDeptObjs(); - DeptBean tmp = new DeptBean(); - tmp.setDeptId(enterpriseLawEnforcement.getLawEnforcementId()); - tmp.setDeptName(enterpriseLawEnforcement.getLawEnforcement()); - deptObjs.add(tmp); for (DeptBean bean : deptObjs) { + enterpriseLawEnforcement.setIsSubmit(0); + enterpriseLawEnforcement.setMainDeputyOrder(0); enterpriseLawEnforcement.setLawEnforcementId(bean.getDeptId()); enterpriseLawEnforcement.setLawEnforcement(bean.getDeptName()); if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getId())) { @@ -190,6 +212,14 @@ public class AppEnterpriseLawEnforcementController extends BaseController return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); } + @PostMapping("/editDeputyOrder") + @ResponseBody + public ZDResponse editSaveDeputyOrder(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement) { + enterpriseLawEnforcement.setIsSubmit(1); + int resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(enterpriseLawEnforcement); + return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); + } + /** * 删除企业端-执法部门预约记录 */ @@ -240,16 +270,29 @@ public class AppEnterpriseLawEnforcementController extends BaseController public ZDResponse getByIdToDataFillIn(@PathVariable String id) { EnterpriseLawEnforcement enfrorcement = enterpriseLawEnforcementService.getEnterpriseLawEnforcementById(id); - EnterpriseLawEnforcement tmpParams = new EnterpriseLawEnforcement(); - tmpParams.setUniteCheck(enfrorcement.getUniteCheck()); - List list = enterpriseLawEnforcementService.selectEnterpriseLawEnforcementList(tmpParams); List objs = new ArrayList<>(); - for (EnterpriseLawEnforcement ment : list) { - if (ment.getLawEnforcementId().equals(enfrorcement.getLawEnforcementId())) { continue; } - DeptBean db = new DeptBean(); - db.setDeptId(ment.getLawEnforcementId()); - db.setDeptName(ment.getLawEnforcement()); - objs.add(db); + if (StringUtils.isNotEmpty(enfrorcement.getUniteCheck())) { + EnterpriseLawEnforcement tmpParams = new EnterpriseLawEnforcement(); + tmpParams.setUniteCheck(enfrorcement.getUniteCheck()); + List list = enterpriseLawEnforcementService.selectEnterpriseLawEnforcementList(tmpParams); + for (EnterpriseLawEnforcement ment : list) { + if (null == ment.getLawEnforcementId() || ment.getLawEnforcementId().equals(enfrorcement.getLawEnforcementId())) { + continue; + } + DeptBean db = new DeptBean(); + db.setDeptId(ment.getLawEnforcementId()); + db.setDeptName(ment.getLawEnforcement()); + objs.add(db); + } + } else { + JSONObject jsonObject = JSON.parseObject(enfrorcement.getTmpDeptJson()); + Set keys = jsonObject.keySet(); + for (String key : keys) { + DeptBean db = new DeptBean(); + db.setDeptId(key); + db.setDeptName(jsonObject.getString(key)); + objs.add(db); + } } Map params = new HashMap<>(); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java index b5a4956d..f15850d4 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseLawEnforcement.java @@ -102,35 +102,61 @@ public class EnterpriseLawEnforcement extends BaseDomain private String lawEnforcerText; private String lawCertificateNumTwo; private String lawEnforcerTextTwo; - private int isReg; - private int isUnite; + private Integer isReg; + private Integer isUnite; private List deptObjs; private String uniteCheck; private String dataScopeId; - private int comOrOpi; + private Integer comOrOpi; + private Integer mainDeputyOrder; + private String tmpDeptJson; - public int getComOrOpi() { + public String getTmpDeptJson() { + return tmpDeptJson; + } + + public void setTmpDeptJson(String tmpDeptJson) { + this.tmpDeptJson = tmpDeptJson; + } + + public Integer getIsReg() { + return isReg; + } + + public void setIsReg(Integer isReg) { + this.isReg = isReg; + } + + public Integer getIsUnite() { + return isUnite; + } + + public void setIsUnite(Integer isUnite) { + this.isUnite = isUnite; + } + + public Integer getComOrOpi() { return comOrOpi; } - public void setComOrOpi(int comOrOpi) { + public void setComOrOpi(Integer comOrOpi) { this.comOrOpi = comOrOpi; } - public String getDataScopeId() { - return dataScopeId; + public Integer getMainDeputyOrder() { + return mainDeputyOrder; } - public void setDataScopeId(String dataScopeId) { - this.dataScopeId = dataScopeId; + public void setMainDeputyOrder(Integer mainDeputyOrder) { + this.mainDeputyOrder = mainDeputyOrder; } - public int getIsReg() { - return isReg; + public String getDataScopeId() { + return dataScopeId; } - public void setIsReg(int isReg) { - this.isReg = isReg; + public void setDataScopeId(String dataScopeId) { + this.dataScopeId = dataScopeId; } public List getDeptObjs() { @@ -141,14 +167,6 @@ public class EnterpriseLawEnforcement extends BaseDomain this.deptObjs = deptObjs; } - public int getIsUnite() { - return isUnite; - } - - public void setIsUnite(int isUnite) { - this.isUnite = isUnite; - } - public String getUniteCheck() { return uniteCheck; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java index adb7e594..621842e0 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalServiceImpl.java @@ -57,6 +57,7 @@ public class StatisticalServiceImpl implements StatisticalService } @Override + @DataScope public List caseAnalysis(StatisticalVo statisticalVo) { this.putParams(statisticalVo); List statisticalVos = statisticalMapper.caseAnalysis(statisticalVo); @@ -64,6 +65,7 @@ public class StatisticalServiceImpl implements StatisticalService } @Override + @DataScope public List enforcerAnalysis(StatisticalVo statisticalVo) { this.putParams(statisticalVo); List statisticalVos = statisticalMapper.enforcerAnalysis(statisticalVo); @@ -71,6 +73,7 @@ public class StatisticalServiceImpl implements StatisticalService } @Override + @DataScope(deptAlias = "d", userAlias = "r") public List itemAnalysis(StatisticalVo statisticalVo) { this.putParams(statisticalVo); List statisticalVos = statisticalMapper.itemAnalysis(statisticalVo); @@ -78,6 +81,7 @@ public class StatisticalServiceImpl implements StatisticalService } @Override + @DataScope(deptAlias = "d", userAlias = "r") public List enterpriseAnalysis(StatisticalVo statisticalVo) { this.putParams(statisticalVo); List statisticalVos = statisticalMapper.enterpriseAnalysis(statisticalVo); @@ -85,6 +89,7 @@ public class StatisticalServiceImpl implements StatisticalService } @Override + @DataScope public Map enterpriseSortAnalysis(StatisticalVo statisticalVo) { this.putParams(statisticalVo); List statisticalVos = statisticalMapper.enterpriseSortAnalysis(statisticalVo); @@ -101,6 +106,7 @@ public class StatisticalServiceImpl implements StatisticalService } @Override + @DataScope public List enterpriseTableAnalysis(StatisticalVo statisticalVo) { this.putParams(statisticalVo); List statisticalVos = statisticalMapper.enterpriseTableAnalysis(statisticalVo); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml index 31cab8db..10d7e1a6 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml @@ -27,10 +27,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, law_enforcement, law_enforcement_id, enterprise_id, enterprise_name, check_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_two, law_enforcer_two_id, remark, user_id, dept_id, is_delete, status, law_enforcement_code, link_man, link_tel, check_item, check_require,enterprise_number,is_submit, unite_check, is_unite, is_reg from enterprise_law_enforcement + select id, law_enforcement, law_enforcement_id, enterprise_id, enterprise_name, check_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_two, law_enforcer_two_id, remark, user_id, dept_id, is_delete, status, law_enforcement_code, link_man, link_tel, check_item, check_require,enterprise_number,is_submit, unite_check, is_unite, is_reg, main_deputy_order, tmp_dept_json from enterprise_law_enforcement @@ -144,6 +146,8 @@ AND DATE_FORMAT(enforcement_time, '%Y-%m') = #{params.yearMonth} + + ${params.dataScope} GROUP BY law_enforcer_id @@ -162,6 +166,8 @@ AND DATE_FORMAT(r.enforcement_time, '%Y-%m') = #{params.yearMonth} + + ${params.dataScope} GROUP BY d.id @@ -179,6 +185,8 @@ AND DATE_FORMAT(r.enforcement_time, '%Y-%m') = #{params.yearMonth} + + ${params.dataScope} GROUP BY i.company_org_type @@ -195,6 +203,8 @@ AND DATE_FORMAT(enforcement_time, '%Y-%m') = #{params.yearMonth} + + ${params.dataScope} GROUP BY DATE_FORMAT(enforcement_time, '%Y-%m-%d') ORDER BY enforcement_time ASC @@ -211,6 +221,8 @@ AND DATE_FORMAT(enforcement_time, '%Y-%m') = #{params.yearMonth} + + ${params.dataScope} GROUP BY DATE_FORMAT(enforcement_time, '%Y-%m-%d'), enterprise_number