diff --git a/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java b/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java index 51b9fbbf..93640606 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/AIWarningController.java @@ -11,6 +11,7 @@ import com.zcloud.service.keyProjects.DeviceService; import com.zcloud.service.keyProjects.KeyprojectHiddenService; import com.zcloud.service.system.FHlogService; import com.zcloud.util.*; +import lombok.extern.flogger.Flogger; import org.apache.commons.lang.StringEscapeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java index b81c7e6e..f9a165cf 100644 --- a/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java +++ b/src/main/java/com/zcloud/controller/xgf/FlowTrainController.java @@ -183,8 +183,14 @@ public class FlowTrainController extends BaseController { map.put("User", "指定主管部门审批人"); map.put("UploadFile", "承诺书"); break; - case "1": case "2": + map.put("Department", "指定监管部门"); + map.put("User", "指定监管部门审批人"); + map.put("limitFlag", "1"); + break; + case "1": + case "3": + case "4": map.put("Department", "指定监管部门"); map.put("User", "指定监管部门审批人"); break; @@ -195,6 +201,7 @@ public class FlowTrainController extends BaseController { if (request.getString("FLOWS_STEP").equals("0")) { map.put("Department", "监管部门"); map.put("User", "监管部门审批人"); + map.put("limitFlag", "1"); } } diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 1376e98e..be8d986f 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -295,6 +295,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("APPOINT_DEPARTMENT_NAME", request.getString("APPOINT_DEPARTMENT_NAME")); condition.put("APPOINT_USER_ID", request.getString("APPOINT_USER_ID")); condition.put("APPOINT_USER_NAME", request.getString("APPOINT_USER_NAME")); + condition.put("LIMIT_END_TIME",request.get("LIMIT_END_TIME")); if (request.get("APPOINT_ANNEX") != null) { condition.put("APPOINT_ANNEX", request.getString("APPOINT_ANNEX")); } @@ -565,6 +566,7 @@ public class XgfUserServiceImpl implements XgfUserService { condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); PageData user = xgfUserMapper.findById(condition); user.put("CHECK_STEP", 1); + user.put("LIMIT_END_TIME",info.get("LIMIT_END_TIME")); // created by liu jun 2024-02-26 如果有委托书则保存委托书 if (StringUtils.isNotBlank(info.getString("APPOINT_ANNEX"))) { condition.clear(); @@ -672,6 +674,7 @@ public class XgfUserServiceImpl implements XgfUserService { entity.put("CHECK_STATUS", 1); entity.put("VALID_FLAG", "2"); entity.put("CHECK_STEP", Integer.parseInt(entity.get("CHECK_STEP").toString()) + 1); + entity.put("LIMIT_END_TIME",info.get("LIMIT_END_TIME")); xgfUserMapper.edit(entity); flows.put("APPOINT_THREE_CORP_ID", info.getString("APPOINT_CORP_ID")); diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 659d118a..7ad56096 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -58,8 +58,8 @@ spring.main.banner-mode=off #preventionxgf.api.url=http://192.168.0.79:8088 # #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 -preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ -qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/ +preventionxgf.api.url=http://39.100.115.58:8082/qa-prevention-xgf/ +qa-regulatory-gwj.api.url=http://39.100.115.58:8081/qa-regulatory-gwj/ #????? smb.host=39.101.130.96 smb.port=22 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index dd259ac5..3d07f3f7 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -6,7 +6,7 @@ server.port=8091 #����31ʱʹ�� #spring.profiles.active=dev #?? -spring.profiles.active=master +#spring.profiles.active=master diff --git a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml index 2de37005..1040b2c6 100644 --- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml +++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml @@ -23,7 +23,8 @@ f.ISFLOW, f.STUDY_STATUS, f.CHECK_STATUS, - f.CHECK_STEP + f.CHECK_STEP, + f.LIMIT_END_TIME @@ -42,7 +43,8 @@ ISFLOW, STUDY_STATUS, CHECK_STATUS, - CHECK_STEP + CHECK_STEP, + LIMIT_END_TIME @@ -61,7 +63,8 @@ #{ISFLOW}, #{STUDY_STATUS}, #{CHECK_STATUS}, - #{CHECK_STEP} + #{CHECK_STEP}, + #{LIMIT_END_TIME} @@ -103,7 +106,8 @@ ISFLOW = #{ISFLOW}, STUDY_STATUS = #{STUDY_STATUS}, CHECK_STATUS = #{CHECK_STATUS}, - CHECK_STEP = #{CHECK_STEP} + CHECK_STEP = #{CHECK_STEP}, + LIMIT_END_TIME = #{LIMIT_END_TIME} where XGF_USER_ID = #{XGF_USER_ID} @@ -299,7 +303,8 @@ b.POLITICAL_TIME, b.ANNEX, b.ATTORNEY, - b.COMMITMENT_LETTER + b.COMMITMENT_LETTER, + b.IS_INJURIES_PAY_TIME from xgf_user a left join xgf_user_details b on a.XGF_USER_ID = b.XGF_USER_ID where a.IS_DELETE = '0'