From 8a0dc73fcaef8bf6a0ba9199391af3f87ad8fe7c Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Fri, 2 Aug 2024 19:07:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=81=94=E5=90=88=E6=89=A7?= =?UTF-8?q?=E6=B3=95=E9=87=8D=E5=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...AppEnterpriseLawEnforcementController.java | 135 +++++++++--------- .../code/domain/EnterpriseLawEnforcement.java | 10 ++ .../EnterpriseInformationServiceImpl.java | 10 +- .../main/java/com/zdxt/auth/dto/UserBean.java | 11 ++ 4 files changed, 96 insertions(+), 70 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 9cb1e7a9..14a165df 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 @@ -120,38 +120,16 @@ public class AppEnterpriseLawEnforcementController extends BaseController @ResponseBody public ZDResponse addSave(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement) { - List deptObjs = enterpriseLawEnforcement.getDeptObjs(); - // 工单保存时不生产副工单, 导致关联部门无法存储, 因此这里手动塞入临时字段 - Map tmpDetpJson = new HashedMap(); - for (DeptBean bean : deptObjs) { - tmpDetpJson.put(bean.getDeptId(), bean.getDeptName()); - } - 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); +// // 工单保存时不生产副工单, 导致关联部门无法存储, 因此这里手动塞入临时字段 +// 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)); + List userObjs = enterpriseLawEnforcement.getUserObjs(); + enterpriseLawEnforcement.setTmpDeptJson(JSON.toJSON(userObjs).toString()); + return enterpriseLawEnforcementService.insertEnterpriseLawEnforcement(enterpriseLawEnforcement) > 0 ? ZDResponse.success("预约成功") : ZDResponse.error("预约失败"); } /** @@ -186,19 +164,12 @@ public class AppEnterpriseLawEnforcementController extends BaseController { // 通过 uniteCheck 来判断是否联合执法单, int resNum = 0; - // 先执行一波删除 . 根据联合执法ID来删除 -// 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); @@ -206,43 +177,67 @@ public class AppEnterpriseLawEnforcementController extends BaseController } else { resNum += enterpriseLawEnforcementService.insertEnterpriseLawEnforcement(enterpriseLawEnforcement); enterpriseLawEnforcement.setId(null); - - // 下发短信 - //【xx企业】尊敬的xx，xx活动将定于本月15日上午开赛，请各位参赛者务必提前抵达会场，以免耽误您的比赛！ - try { - String smsStr = "【"+enterpriseLawEnforcement.getEnterpriseName()+"】" + - "尊敬的" + enterpriseLawEnforcement.getLinkMan() - +", 您有一条于: "+ enterpriseLawEnforcement.getCheckTime()+" 的执法预约信息, 请查收"; - zwSmsClient.sendMessage(enterpriseLawEnforcement.getLinkTel(),smsStr); - } catch (Exception e) { - System.out.println("短信下发异常"); - e.printStackTrace(); - } } + // 处理 联合执法 关联部门的json, 用于前端页面不同的展示效果 + UserBean ub = new UserBean(); + ub.setStrUserId(enterpriseLawEnforcement.getLawEnforcerId()); + ub.setUserName(enterpriseLawEnforcement.getLawEnforcer()); + ub.setDeptId(enterpriseLawEnforcement.getLawEnforcementId()); + ub.setDeptName(enterpriseLawEnforcement.getLawEnforcement()); + // 在循环处理联合执法部门的单 - List deptObjs = enterpriseLawEnforcement.getDeptObjs(); - for (DeptBean bean : deptObjs) { - enterpriseLawEnforcement.setIsSubmit(0); + List userObjs = enterpriseLawEnforcement.getUserObjs(); + for (UserBean bean : userObjs) { + + // 处理 联合执法 关联部门的json, 用于前端页面不同的展示效果 + List userObj2s = new ArrayList<>(); + userObj2s.addAll(userObjs); + userObj2s.add(ub); + for (int i=0; i 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); } + // 下发短信 + public void sendSms(EnterpriseLawEnforcement enterpriseLawEnforcement) { + //【xx企业】尊敬的xx，xx活动将定于本月15日上午开赛，请各位参赛者务必提前抵达会场，以免耽误您的比赛！ + try { + String smsStr = "【"+enterpriseLawEnforcement.getEnterpriseName()+"】" + + "尊敬的" + enterpriseLawEnforcement.getLinkMan() + +", 您有一条于: "+ enterpriseLawEnforcement.getCheckTime()+" 的执法预约信息, 请查收"; + zwSmsClient.sendMessage(enterpriseLawEnforcement.getLinkTel(),smsStr); + } catch (Exception e) { + System.out.println("短信下发异常"); + e.printStackTrace(); + } + } + /** * 联合执法副单提交时执行 * @param enterpriseLawEnforcement @@ -313,6 +308,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController { EnterpriseLawEnforcement enfrorcement = enterpriseLawEnforcementService.getEnterpriseLawEnforcementById(id); List objs = new ArrayList<>(); + List userObjs = new ArrayList<>(); // 联合工单第一次保存时, 因为不生产副工单, 因此回显的时候无法通过 uniteCheck 获取到关联的副单, 因此从临时的字段获取 if (StringUtils.isNotEmpty(enfrorcement.getUniteCheck())) { EnterpriseLawEnforcement tmpParams = new EnterpriseLawEnforcement(); @@ -328,14 +324,14 @@ public class AppEnterpriseLawEnforcementController extends BaseController 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); - } +// 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); +// } } //TODO 执法事项修改为手动输入 @@ -346,6 +342,8 @@ public class AppEnterpriseLawEnforcementController extends BaseController // params.put("checkRequireText", null==tmp?enfrorcement.getCheckRequireText():tmp.getTitle()); // enfrorcement.setParams(params); enfrorcement.setDeptObjs(objs); + userObjs = JSONObject.parseArray(enfrorcement.getTmpDeptJson(), UserBean.class); + enfrorcement.setUserObjs(userObjs); // 执法人员需要展示用户名+执法码 UserBean userBean1 = new UserBean(); @@ -373,6 +371,13 @@ public class AppEnterpriseLawEnforcementController extends BaseController tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1); } enfrorcement.setLawEnforcer2Show(tmpUserShow); + + // 判断是否超时 + LocalDate checkTime = LocalDate.parse(enfrorcement.getCheckTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd")); + long daysBetween = ChronoUnit.DAYS.between(LocalDate.now(), checkTime); + if (daysBetween < 0) { + enfrorcement.setStatus(3); + } return ZDResponse.success("查询成功", enfrorcement); } 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 dd5bfd01..faf13fe7 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 @@ -1,6 +1,7 @@ package com.zdxt.code.domain; import com.zdxt.auth.dto.DeptBean; +import com.zdxt.auth.dto.UserBean; import com.zdxt.common.BaseDomain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -116,6 +117,7 @@ public class EnterpriseLawEnforcement extends BaseDomain private Integer isReg; private Integer isUnite; private List deptObjs; + private List userObjs; private String uniteCheck; private String dataScopeId; private Integer comOrOpi; @@ -124,6 +126,14 @@ public class EnterpriseLawEnforcement extends BaseDomain // 用来展示执法人员名称 - 执法编码的 private String lawEnforcer2Show; + public List getUserObjs() { + return userObjs; + } + + public void setUserObjs(List userObjs) { + this.userObjs = userObjs; + } + public String getLawEnforcer2Show() { return lawEnforcer2Show; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java index 44c45e9f..407dd3b8 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseInformationServiceImpl.java @@ -110,11 +110,11 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS @Override public List selectEnterpriseInformationList(EnterpriseInformation enterpriseInformation) { - if ("3".equals(enterpriseInformation.getReason())) { - Map tmp = new HashMap<>(); - tmp.put("reason", 3); - enterpriseInformation.setParams(tmp); - } +// if ("3".equals(enterpriseInformation.getReason())) { +// Map tmp = new HashMap<>(); +// tmp.put("reason", 3); +// enterpriseInformation.setParams(tmp); +// } return enterpriseInformationMapper.selectEnterpriseInformationList(enterpriseInformation); } diff --git a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java index e6b41f82..4bac005d 100644 --- a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java +++ b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/dto/UserBean.java @@ -170,6 +170,17 @@ public class UserBean implements Serializable { */ private DeptBean bureauDept; + /** 不入数据库 */ + private String deptName; + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + public Boolean getLawOfficer() { return lawOfficer; }