执法登记, 预约检查 加入编辑功能

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java

@@ -10,6 +10,7 @@ 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;
@@ -108,9 +109,14 @@ public class EnforcementRegistrationController extends BaseController
     @ResponseBody
     public ZDResponse editSave(@RequestBody EnforcementRegistration enforcementRegistration)
     {
+        int resNum = 0;
         enforcementRegistration.setIsSubmit(1);
-        return enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration) > 0 ?
-                ZDResponse.success("修改成功") : ZDResponse.error("修改失败");
+        if (StringUtils.isNotEmpty(enforcementRegistration.getId())) {
+            resNum = enforcementRegistrationService.updateEnforcementRegistration(enforcementRegistration);
+        } else {
+            resNum = enforcementRegistrationService.insertEnforcementRegistration(enforcementRegistration);
+        }
+        return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败");
     }
 
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterpriseLawEnforcementController.java

@@ -118,9 +118,14 @@ public class EnterpriseLawEnforcementController extends BaseController
     @ResponseBody
     public ZDResponse editSave(@RequestBody EnterpriseLawEnforcement enterpriseLawEnforcement)
     {
+        int resNum = 0;
         enterpriseLawEnforcement.setIsSubmit(1);
-        return enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(enterpriseLawEnforcement) > 0 ?
-                ZDResponse.success("修改成功") : ZDResponse.error("修改失败");
+        if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getId())) {
+            resNum = enterpriseLawEnforcementService.updateEnterpriseLawEnforcement(enterpriseLawEnforcement);
+        } else {
+            resNum = enterpriseLawEnforcementService.insertEnterpriseLawEnforcement(enterpriseLawEnforcement);
+        }
+        return resNum > 0 ? ZDResponse.success("修改成功") : ZDResponse.error("修改失败");
     }
 
     /**

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java

@@ -130,7 +130,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         UserBean user = userApi.getCurrentUser();
         int resNum = 0;
         if (StringUtils.isNotEmpty(enforcementRegistration.getId())) {
-            enforcementRegistration.setIsSubmit(0);
+//            enforcementRegistration.setIsSubmit(0);
             resNum = this.updateEnforcementRegistration(enforcementRegistration);
         } else {
             enforcementRegistration.setId(IdUtil.simpleUUID());
@@ -139,7 +139,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
             enforcementRegistration.setUserId(user.getUserId());
             enforcementRegistration.setDeptId(user.getDeptId());
             //默认为登记状态
-            enforcementRegistration.setStatus(0);
+//            enforcementRegistration.setStatus(0);
             resNum = enforcementRegistrationMapper.insertEnforcementRegistration(enforcementRegistration);
         }
         if (resNum > 0 && enforcementRegistration.getFileList().size() > 0) {

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java

@@ -124,7 +124,7 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
     {
         int resNum = 0;
         if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getId())) {
-            enterpriseLawEnforcement.setIsSubmit(0);
+//            enterpriseLawEnforcement.setIsSubmit(0);
             resNum = this.updateEnterpriseLawEnforcement(enterpriseLawEnforcement);
         } else {
             enterpriseLawEnforcement.setCreateTime(DateUtils.getNowDate());
@@ -136,7 +136,7 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
             enterpriseLawEnforcement.setCreateBy(user.getUserName());
             //预约记录，默认正常
             enterpriseLawEnforcement.setStatus(0);
-            enterpriseLawEnforcement.setIsSubmit(0);
+//            enterpriseLawEnforcement.setIsSubmit(0);
             EnterpriseMerchantAuthorization enterpriseMerchantAuthorization =
                     new EnterpriseMerchantAuthorization();
             //联系人手机号码

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml

@@ -23,10 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lawEnforcementItem"    column="law_enforcement_item"    />
         <result property="lawEnforcementCode"    column="law_enforcement_code"    />
         <result property="enterpriseNumber"    column="enterprise_number"    />
+        <result property="isSubmit"    column="is_submit"    />
     </resultMap>
 
     <sql id="selectEnterpriseLawEnforcementVo">
-        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 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 from enterprise_law_enforcement
     </sql>
 
     <select id="selectEnterpriseLawEnforcementList" parameterType="EnterpriseLawEnforcement" resultMap="EnterpriseLawEnforcementResult">
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lawEnforcerId != null "> and law_enforcer_id = #{lawEnforcerId}</if>
             <if test="lawEnforcerTel != null  and lawEnforcerTel != ''"> and law_enforcer_tel = #{lawEnforcerTel}</if>
             <if test="status != null"> and status = #{lawEnforcerTel}</if>
+            <if test="isSubmit != null "> and is_submit = #{isSubmit}</if>
             <if test="lawEnforcementItem != null and lawEnforcementItem != ''"> and law_enforcement_item like concat('%', #{lawEnforcementItem}, '%')</if>
             <if test="lawEnforcementCode != null and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
             <if test="lawEnforcerId != null  and lawEnforcerId != ''"> and law_enforcer_id = #{lawEnforcerId}</if>
@@ -112,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null ">dept_id,</if>
             <if test="isDelete != null ">is_delete,</if>
             <if test="status != null ">status,</if>
+            <if test="isSubmit != null "> is_submit,</if>
             <if test="lawEnforcementCode != null  and lawEnforcementCode != ''">law_enforcement_code,</if>
             <if test="linkMan != null  and linkMan != ''">link_man,</if>
             <if test="linkTel != null  and linkTel != ''">link_tel,</if>
@@ -137,6 +140,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null ">#{deptId},</if>
             <if test="isDelete != null ">#{isDelete},</if>
             <if test="status != null ">#{status},</if>
+            <if test="isSubmit != null "> #{isSubmit},</if>
             <if test="lawEnforcementCode != null  and lawEnforcementCode != ''">#{lawEnforcementCode},</if>
             <if test="linkMan != null  and linkMan != ''">#{linkMan},</if>
             <if test="linkTel != null  and linkTel != ''">#{linkTel},</if>
@@ -165,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null ">dept_id = #{deptId},</if>
             <if test="isDelete != null ">is_delete = #{isDelete},</if>
             <if test="status != null ">status = #{status},</if>
+            <if test="isSubmit != null ">is_submit =  #{isSubmit},</if>
             <if test="lawEnforcementCode != null  and lawEnforcementCode != ''">law_enforcement_code = #{lawEnforcementCode},</if>
             <if test="linkMan != null  and linkMan != ''">link_man = #{linkMan},</if>
             <if test="linkTel != null  and linkTel != ''">link_tel = #{linkTel},</if>