diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
index def7fc13..40b38312 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnforcementRegistrationController.java
+++ b/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("修改失败");
}
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 1020a42c..76324a08 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
@@ -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("修改失败");
}
/**
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
index b293941f..b229afa4 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
+++ b/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) {
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 5a938b93..243737d7 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
@@ -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();
//联系人手机号码
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
index e0da35da..ed57a081 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseLawEnforcementMapper.xml
@@ -23,10 +23,11 @@ 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 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