From e4c6eacb49dd9b3a344b3ba2a6d3e82771583e4e Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Tue, 9 Jul 2024 17:49:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E4=B8=8B=E5=8F=91=20+=20?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...AppEnterpriseLawEnforcementController.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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 a9a6dc0a..64cec2ea 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 @@ -13,6 +13,7 @@ import com.zdxt.code.domain.LinkageDict; import com.zdxt.code.service.IEnterpriseComplaintService; import com.zdxt.code.service.IEnterpriseLawEnforcementService; import com.zdxt.code.service.ILinkageDictService; +import com.zdxt.code.utils.ZwSmsClient; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; import com.zdxt.common.util.StringUtils; @@ -43,6 +44,9 @@ public class AppEnterpriseLawEnforcementController extends BaseController @Autowired private ILinkageDictService iLinkageDictService; @Autowired private IEnterpriseComplaintService enterpriseComplaintService; + @Autowired + private ZwSmsClient zwSmsClient; + @RequiresPermissions("code:enforcement:view") @GetMapping() public String enforcement() @@ -105,6 +109,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController public ZDResponse addSave(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement) { List deptObjs = enterpriseLawEnforcement.getDeptObjs(); + // 工单保存时不生产副工单, 导致关联部门无法存储, 因此这里手动塞入临时字段 Map tmpDetpJson = new HashedMap(); for (DeptBean bean : deptObjs) { tmpDetpJson.put(bean.getDeptId(), bean.getDeptName()); @@ -177,7 +182,9 @@ public class AppEnterpriseLawEnforcementController extends BaseController // } enterpriseLawEnforcement.setIsSubmit(1); + // 用于区分联合工单的主副单的区别 enterpriseLawEnforcement.setMainDeputyOrder(1); + // 统一联合工单号. 用去区分是否为同一工单用, 回显的是用到 enterpriseLawEnforcement.setUniteCheck(IdUtil.simpleUUID()); enterpriseLawEnforcement.setTmpDeptJson(null); // 先单独处理主单 @@ -209,9 +216,21 @@ public class AppEnterpriseLawEnforcementController extends BaseController // } else { // resNum = enterpriseLawEnforcementService.insertEnterpriseLawEnforcement(enterpriseLawEnforcement); // } + // 下发短信 + try { + zwSmsClient.sendMessage(enterpriseLawEnforcement.getLinkTel(),"您有一条执法预约信息, 请查收"); + } catch (Exception e) { + System.out.println("短信下发异常"); + e.printStackTrace(); + } return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败"); } + /** + * 联合执法副单提交时执行 + * @param enterpriseLawEnforcement + * @return + */ @PostMapping("/editDeputyOrder") @ResponseBody public ZDResponse editSaveDeputyOrder(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement) { @@ -271,6 +290,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController { EnterpriseLawEnforcement enfrorcement = enterpriseLawEnforcementService.getEnterpriseLawEnforcementById(id); List objs = new ArrayList<>(); + // 联合工单第一次保存时, 因为不生产副工单, 因此回显的时候无法通过 uniteCheck 获取到关联的副单, 因此从临时的字段获取 if (StringUtils.isNotEmpty(enfrorcement.getUniteCheck())) { EnterpriseLawEnforcement tmpParams = new EnterpriseLawEnforcement(); tmpParams.setUniteCheck(enfrorcement.getUniteCheck());