From 2d924fce5859c09930bb51b8e0da97f18ea947ca Mon Sep 17 00:00:00 2001 From: kylin L <452061493@qq.com> Date: Fri, 19 Apr 2024 15:14:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A2=84=E7=BA=A6=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E8=8D=89=E7=A8=BF=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseLawEnforcementController.java | 55 +++++++++++++++---- .../IEnterpriseLawEnforcementService.java | 1 + .../EnterpriseLawEnforcementServiceImpl.java | 11 ++++ 3 files changed, 55 insertions(+), 12 deletions(-) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java index b44ea04a..e5b47435 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java @@ -1,9 +1,14 @@ package com.zdxt.code.controller; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import com.zdxt.code.domain.LinkageDict; +import com.zdxt.code.service.ILinkageDictService; 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.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +32,7 @@ public class EnterpriseLawEnforcementController extends BaseController @Autowired private IEnterpriseLawEnforcementService enterpriseLawEnforcementService; + @Autowired private ILinkageDictService iLinkageDictService; @RequiresPermissions("code:enforcement:view") @GetMapping() @@ -79,8 +85,16 @@ public class EnterpriseLawEnforcementController extends BaseController @ResponseBody public ZDResponse addSave(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement) { - return enterpriseLawEnforcementService.insertEnterpriseLawEnforcement(enterpriseLawEnforcement) > 0 ? - ZDResponse.success("预约成功") : ZDResponse.error("预约失败"); + // 先通过用户ID 加 状态0 判断是否已经有暂存的数据了 . 有的话就更新, 没有再新增 + EnterpriseLawEnforcement keyObj = enterpriseLawEnforcementService.getByUserIdAndZero(); + int resNum = 0; + if (null!=keyObj && StringUtils.isNotEmpty(keyObj.getId())) { + resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(enterpriseLawEnforcement); + } else { + resNum = enterpriseLawEnforcementService.insertEnterpriseLawEnforcement(enterpriseLawEnforcement); + } + + return resNum > 0 ? ZDResponse.success("预约成功") : ZDResponse.error("预约失败"); } /** @@ -131,14 +145,31 @@ public class EnterpriseLawEnforcementController extends BaseController /** - * 查看预约记录详情 - */ -@GetMapping( "/getById/{id}") -@ResponseBody -public ZDResponse getById(@PathVariable("id") String id) -{ - EnterpriseLawEnforcement enterpriseLawEnforcement = - enterpriseLawEnforcementService.selectEnterpriseLawEnforcementById(id); - return ZDResponse.success("查询成功",enterpriseLawEnforcement); -} + * 查看预约记录详情 + */ + @GetMapping( "/getById/{id}") + @ResponseBody + public ZDResponse getById(@PathVariable("id") String id) + { + EnterpriseLawEnforcement enterpriseLawEnforcement = + enterpriseLawEnforcementService.selectEnterpriseLawEnforcementById(id); + return ZDResponse.success("查询成功",enterpriseLawEnforcement); + } + + /** + * 查看预约记录详情 + */ + @GetMapping( "/getByUserIdAndZero") + @ResponseBody + public ZDResponse getByUserIdAndZero() + { + EnterpriseLawEnforcement enfrorcement = enterpriseLawEnforcementService.getByUserIdAndZero(); + Map params = new HashMap<>(); + LinkageDict tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckItem()); + params.put("checkItemText", tmp.getTitle()); + tmp = iLinkageDictService.selectLinkageDictById(enfrorcement.getCheckRequire()); + params.put("checkRequireText", tmp.getTitle()); + enfrorcement.setParams(params); + return ZDResponse.success("查询成功", enfrorcement); + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseLawEnforcementService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseLawEnforcementService.java index 7282d3dd..3c7ecf42 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseLawEnforcementService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnterpriseLawEnforcementService.java @@ -18,6 +18,7 @@ public interface IEnterpriseLawEnforcementService * @return 企业端-执法部门预约记录 */ public EnterpriseLawEnforcement selectEnterpriseLawEnforcementById(String id); + public EnterpriseLawEnforcement getByUserIdAndZero(); /** * 查询企业端-执法部门预约记录列表 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java index e41141ab..c8d8a2dd 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -81,6 +81,16 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc return enterpriseLawEnforcement; } + @Override + public EnterpriseLawEnforcement getByUserIdAndZero() { + EnterpriseLawEnforcement enterpriseLawEnforcement = new EnterpriseLawEnforcement(); + UserBean user = userApi.getCurrentUser(); + enterpriseLawEnforcement.setUserId(user.getUserId()); + enterpriseLawEnforcement.setIsSubmit(0); + List es = enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementList(enterpriseLawEnforcement); + return null != es && es.size() >0 ? es.get(0):null; + } + /** * 查询企业端-执法部门预约记录列表 * @@ -145,6 +155,7 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc @Override public int updateEnterpriseLawEnforcement(EnterpriseLawEnforcement enterpriseLawEnforcement) { + enterpriseLawEnforcement.setIsSubmit(1); enterpriseLawEnforcement.setUpdateTime(DateUtils.getNowDate()); return enterpriseLawEnforcementMapper.updateEnterpriseLawEnforcement(enterpriseLawEnforcement); }