From cf1573cbaad982a0599e312cd34713cb23c9bc54 Mon Sep 17 00:00:00 2001 From: dearlin <1261008090@qq.com> Date: Thu, 25 Jan 2024 17:24:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=8E=92?= =?UTF-8?q?=E6=9F=A5=E6=9C=AA=E5=9C=A8=E7=94=B5=E5=AD=90=E5=9B=B4=E6=A0=8F?= =?UTF-8?q?=E7=A6=81=E6=AD=A2=E6=8E=92=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/check/AppListManagerController.java | 10 ++++++++-- .../com/zcloud/controller/system/LoginController.java | 1 + .../zcloud/service/system/impl/UsersServiceImpl.java | 2 +- src/main/java/com/zcloud/util/PLSUtil.java | 8 ++++---- src/main/java/com/zcloud/util/Tools.java | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zcloud/controller/check/AppListManagerController.java b/src/main/java/com/zcloud/controller/check/AppListManagerController.java index 41833b9..db9ae49 100644 --- a/src/main/java/com/zcloud/controller/check/AppListManagerController.java +++ b/src/main/java/com/zcloud/controller/check/AppListManagerController.java @@ -1,5 +1,6 @@ package com.zcloud.controller.check; +import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -12,6 +13,7 @@ import com.zcloud.service.risk.RiskPointService; import com.zcloud.service.system.DepartmentService; import com.zcloud.service.system.UsersService; import com.zcloud.util.DateUtil; +import com.zcloud.util.PLSUtil; import com.zcloud.util.ReturnMap; import com.zcloud.util.Tools; import org.springframework.beans.factory.annotation.Autowired; @@ -568,8 +570,12 @@ public class AppListManagerController extends BaseController { @LogAnno(menuType = "手机", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "判断是人员是否在电子围栏中") public Object isInElectronicFence() throws Exception { PageData pd = this.getPageData(); - - return ReturnMap.error("当前人员不在电子围栏中禁止排查清单"); + if (!Tools.notEmpty(pd.getString("PLS_ID"))) { + return ReturnMap.error("当前人员未绑定定位卡号"); + } + boolean jsonObject = PLSUtil.determineWhetherThePersonIsInTheElectronicFence(pd.getString("CORPINFO_ID"), Integer.valueOf(pd.getString("PLS_ID")), pd.getString("ELECTRONIC_FENCE_ID")); + if (jsonObject) return ReturnMap.ok(); + return ReturnMap.error("当前人员不在电子围栏中禁止排查清单"); } /** diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index af3d15f..f627c64 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -135,6 +135,7 @@ public class LoginController extends BaseController { map.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); map.put("CORP_NAME", cpd.getString("CORP_NAME")); map.put("PROVINCE", cpd.getString("PROVINCE")); + map.put("PLS_ID", pd.getOrDefault("PLS_ID","")); // PageData dpd = new PageData(); // dpd.put("DEPARTMENT_ID", pd.getString("DEPARTMENT_ID")); // dpd=departmentService.findById(dpd); diff --git a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java index 89619ee..88929a0 100644 --- a/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java @@ -251,7 +251,7 @@ public class UsersServiceImpl implements UsersService { public String changeOrUpdUserCardNo(PageData nowuser) throws Exception { PageData oldUser = usersMapper.findById(nowuser); // 先判断人员新的定位卡号是否有变化，没变化直接可以修改 - if (oldUser.getString("CARDNO").equals(nowuser.getString("CARDNO"))) { + if (oldUser.getString("CARDNO") == null || oldUser.getOrDefault("CARDNO","").equals(nowuser.getString("CARDNO"))) { return Const.CAN_CHENG_USER; } // 有变化看库里是否有人在用这个新卡号 diff --git a/src/main/java/com/zcloud/util/PLSUtil.java b/src/main/java/com/zcloud/util/PLSUtil.java index 2035f71..19caedb 100644 --- a/src/main/java/com/zcloud/util/PLSUtil.java +++ b/src/main/java/com/zcloud/util/PLSUtil.java @@ -62,19 +62,19 @@ public class PLSUtil { } /** - * @Description: 电子围栏列表 + * @Description: 根据定位卡号获取人是否再电子围栏里 * @Author: dearLin * @Date: 2024/1/25/025 14:37 * @Param: [java.lang.String, java.lang.Integer, java.lang.Integer] [keywords, currentPage, showCount] * @Return: com.alibaba.fastjson.JSONObject */ - public static JSONObject determineWhetherThePersonIsInTheElectronicFence(String CORPINFO_ID, Integer PLS_ID, String ELECTRONIC_FENCE_ID) throws Exception { + public static Boolean determineWhetherThePersonIsInTheElectronicFence(String CORPINFO_ID, Integer PLS_ID, String ELECTRONIC_FENCE_ID) throws Exception { HttpHeaders headers = new HttpHeaders(); headers.set("Authorization", getToken(CORPINFO_ID)); HttpEntity httpEntity = new HttpEntity<>(headers); - ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/api/electronicFence/determineWhetherThePersonIsInTheElectronicFence2?psn=" + + ResponseEntity exchange = restTemplate.exchange(PLSUtil.BAKEADDR.get(CORPINFO_ID) + "/region/api/electronicFence/determineWhetherThePersonIsInTheElectronicFence2?psn=" + PLS_ID + - "&uuid=" + ELECTRONIC_FENCE_ID, HttpMethod.GET, httpEntity, JSONObject.class); + "&uuid=" + ELECTRONIC_FENCE_ID, HttpMethod.GET, httpEntity, Boolean.class); return exchange.getBody(); } diff --git a/src/main/java/com/zcloud/util/Tools.java b/src/main/java/com/zcloud/util/Tools.java index eb80b85..30993d8 100644 --- a/src/main/java/com/zcloud/util/Tools.java +++ b/src/main/java/com/zcloud/util/Tools.java @@ -36,7 +36,7 @@ public class Tools { * @return 不为空则返回true，否则返回false */ public static boolean notEmpty(String s){ - return s!=null && !"".equals(s) && !"null".equals(s); + return s!=null && !"".equals(s) && !"null".equals(s)&& !"undefined".equals(s); } /** From 56d43e7ebdd1607e22f04dccd8d6e380a3b0b30b Mon Sep 17 00:00:00 2001 From: chenxinying <1039655633@qq.com> Date: Thu, 25 Jan 2024 17:40:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=AE=89=E5=85=A8=E6=8E=AA=E6=96=BD=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E4=BA=BA=EF=BC=8C=E6=9F=90=E4=B8=AA=E4=BA=BA=E6=89=93=E5=9B=9E?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E5=85=B6=E4=BB=96=E7=A1=AE=E8=AE=A4=E4=BA=BA?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=89=93=E5=9B=9E=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/datasource/eightwork/EightWorkTaskMapper.xml | 4 +++- .../mybatis/datasource/eightwork/HotWorkMapper.xml | 5 +++++ .../mybatis/datasource/eightwork/HotworkSignMapper.xml | 9 ++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml b/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml index a204f38..3f3ce9f 100644 --- a/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml @@ -42,7 +42,9 @@ diff --git a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml index 456258e..5f6f782 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml @@ -476,6 +476,9 @@ and sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{pd.USER_ID} and step.STEP_NAME = #{pd.STEP_NAME} + + and f.STEP_ID != -1 + ) @@ -511,8 +514,10 @@ from bus_hotwork_sign sign left join bus_eightwork_step step on step.STEP_ID = sign.STEP_ID + left join bus_hotwork a on a.HOTWORK_ID = sign.HOTWORK_ID where sign.SIGN_TIME is null + and a.STEP_ID != '-1' and sign.SIGN_USER_ID = #{USER_ID} group by step.CODE diff --git a/src/main/resources/mybatis/datasource/eightwork/HotworkSignMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotworkSignMapper.xml index d534afc..b0d3f0f 100644 --- a/src/main/resources/mybatis/datasource/eightwork/HotworkSignMapper.xml +++ b/src/main/resources/mybatis/datasource/eightwork/HotworkSignMapper.xml @@ -102,7 +102,14 @@ + select + + from + f + where + f.KEYPROJECTCHECKINFO_ID = #{KEYPROJECTCHECKINFO_ID} + + + + + + + + + + + update + + set + ISDELETE = '1' + where + KEYPROJECTCHECKINFO_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml new file mode 100644 index 0000000..a4295d2 --- /dev/null +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectCheckMapper.xml @@ -0,0 +1,208 @@ + + + + + + + BUS_KEYPROJECTCHECK + + + + + SYS_DICTIONARIES + + + + + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.CORPINFO_ID, + f.ISDELETE, + f.SOURCE, + f.OUTSOURCED_ID, + f.UNITS_ID, + f.PERSONNELMANAGEMENT_ID, + f.PERSON_SIGN_IMG, + f.PERSON_SIGN_TIME, + f.INSPECTION_TYPE, + f.INSPECTION_PLACE, + f.INSPECTION_TIME_START, + f.INSPECTION_TIME_END, + f.INSPECTION_USERS, + f.INSPECTION_STATUS, + f.INSPECTION_CATEGORY, + f.KEYPROJECTCHECK_ID + + + + + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + CORPINFO_ID, + ISDELETE, + SOURCE, + OUTSOURCED_ID, + UNITS_ID, + PERSONNELMANAGEMENT_ID, + PERSON_SIGN_IMG, + PERSON_SIGN_TIME, + INSPECTION_TYPE, + INSPECTION_PLACE, + INSPECTION_TIME_START, + INSPECTION_TIME_END, + INSPECTION_USERS, + INSPECTION_STATUS, + INSPECTION_CATEGORY, + KEYPROJECTCHECK_ID + + + + + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{CORPINFO_ID}, + #{ISDELETE}, + #{SOURCE}, + #{OUTSOURCED_ID}, + #{UNITS_ID}, + #{PERSONNELMANAGEMENT_ID}, + #{PERSON_SIGN_IMG}, + #{PERSON_SIGN_TIME}, + #{INSPECTION_TYPE}, + #{INSPECTION_PLACE}, + #{INSPECTION_TIME_START}, + #{INSPECTION_TIME_END}, + #{INSPECTION_USERS}, + #{INSPECTION_STATUS}, + #{INSPECTION_CATEGORY}, + #{KEYPROJECTCHECK_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + KEYPROJECTCHECK_ID = #{KEYPROJECTCHECK_ID} + + + + + update + + set + CREATOR = #{CREATOR}, + CREATTIME = #{CREATTIME}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + CORPINFO_ID = #{CORPINFO_ID}, + ISDELETE = #{ISDELETE}, + SOURCE = #{SOURCE}, + OUTSOURCED_ID = #{OUTSOURCED_ID}, + UNITS_ID = #{UNITS_ID}, + PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID}, + PERSON_SIGN_IMG = #{PERSON_SIGN_IMG}, + PERSON_SIGN_TIME = #{PERSON_SIGN_TIME}, + INSPECTION_TYPE = #{INSPECTION_TYPE}, + INSPECTION_PLACE = #{INSPECTION_PLACE}, + INSPECTION_TIME_START = #{INSPECTION_TIME_START}, + INSPECTION_TIME_END = #{INSPECTION_TIME_END}, + INSPECTION_USERS = #{INSPECTION_USERS}, + INSPECTION_STATUS = #{INSPECTION_STATUS}, + INSPECTION_CATEGORY = #{INSPECTION_CATEGORY}, + KEYPROJECTCHECK_ID = KEYPROJECTCHECK_ID + where + KEYPROJECTCHECK_ID = #{KEYPROJECTCHECK_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + KEYPROJECTCHECK_ID in + + #{item} + + + + diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml new file mode 100644 index 0000000..8e9f26d --- /dev/null +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectHiddenMapper.xml @@ -0,0 +1,1600 @@ + + + + + + + BUS_KEYPROJECT_HIDDEN + + + + + sys_dictionaries + + + + f.SOURCE, + f.RISK_UNIT, + f.IDENTIFICATION, + f.RISK_DESCR, + f.RISK_POSITION, + f.LEVEL, + f.CHECK_CONTENT, + f.HIDDENDESCR, + f.HIDDENPART, + f.CREATOR, + f.CREATTIME, + f.RECTIFYDESCR, + f.RECTIFICATIONTYPE, + f.RECTIFICATIONOR, + f.RECTIFICATIONTIME, + f.HIDDENLEVEL, + f.STATE, + f.CHECKDEPT, + f.CHECKOR, + f.CHECKTIME, + f.CHECKDESCR, + f.ISQUALIFIED, + f.ISDELETE, + f.CORPINFO_ID, + f.HIDDENFINDDEPT, + f.RECTIFICATIONDEADLINE, + f.RECTIFICATIONDEPT, + f.HIDDEN_ID, + f.CHECKRECORD_ID, + f.RECORDITEM_ID, + f.RISKITEM_ID, + f.REVIEWOR, + f.REVIEWTIME, + f.REVIEWDEPT, + f.LONGITUDE, + f.LATITUDE, + f.HAVESCHEME, + f.HIDDENTYPE, + f.ISCONFIRM, + f.CONFIRM_USER, + f.DISCOVERYTIME, + f.CONFIRM_TIME, + f.HIDDENTYPE2, + f.INVESTMENT_FUNDS, + f.LISTMANAGER_ID, + f.FOREIGN_ID, + f.FINAL_CHECK, + f.FINAL_CHECKOR, + f.FINAL_CHECKTIME, + f.FINAL_CHECKDESCR, + f.ISRELEVANT, + f.ISPUNISH, + f.POSITIONDESC + + + + + ISPUNISH, + ISRELEVANT, + SOURCE, + RISK_UNIT, + IDENTIFICATION, + RISK_DESCR, + RISK_POSITION, + LEVEL, + CHECK_CONTENT, + HIDDENDESCR, + HIDDENPART, + CREATOR, + CREATTIME, + RECTIFYDESCR, + RECTIFICATIONTYPE, + RECTIFICATIONOR, + RECTIFICATIONTIME, + HIDDENLEVEL, + STATE, + CHECKDEPT, + CHECKOR, + CHECKTIME, + CHECKDESCR, + ISQUALIFIED, + ISDELETE, + CORPINFO_ID, + HIDDENFINDDEPT, + RECTIFICATIONDEADLINE, + RECTIFICATIONDEPT, + HIDDEN_ID, + CHECKRECORD_ID, + RECORDITEM_ID, + RISKITEM_ID, + REVIEWOR, + REVIEWTIME, + REVIEWDEPT, + LONGITUDE, + LATITUDE, + HAVESCHEME, + HIDDENTYPE, + ISCONFIRM, + CONFIRM_USER, + DISCOVERYTIME, + HIDDENTYPE2, + INVESTMENT_FUNDS, + LISTMANAGER_ID, + FOREIGN_ID, + FINAL_CHECK, + FINAL_CHECKOR, + FINAL_CHECKTIME, + FINAL_CHECKDESCR, + POSITIONDESC + + + + + #{ISPUNISH}, + #{ISRELEVANT}, + #{SOURCE}, + #{RISK_UNIT}, + #{IDENTIFICATION}, + #{RISK_DESCR}, + #{RISK_POSITION}, + #{LEVEL}, + #{CHECK_CONTENT}, + #{HIDDENDESCR}, + #{HIDDENPART}, + #{CREATOR}, + #{CREATTIME}, + #{RECTIFYDESCR}, + #{RECTIFICATIONTYPE}, + #{RECTIFICATIONOR}, + #{RECTIFICATIONTIME}, + #{HIDDENLEVEL}, + #{STATE}, + #{CHECKDEPT}, + #{CHECKOR}, + #{CHECKTIME}, + #{CHECKDESCR}, + #{ISQUALIFIED}, + #{ISDELETE}, + #{CORPINFO_ID}, + #{HIDDENFINDDEPT}, + #{RECTIFICATIONDEADLINE}, + #{RECTIFICATIONDEPT}, + #{HIDDEN_ID}, + #{CHECKRECORD_ID}, + #{RECORDITEM_ID}, + #{RISKITEM_ID}, + #{REVIEWOR}, + #{REVIEWTIME}, + #{REVIEWDEPT}, + #{LONGITUDE}, + #{LATITUDE}, + #{HAVESCHEME}, + #{HIDDENTYPE}, + #{ISCONFIRM}, + #{CONFIRM_USER}, + #{DISCOVERYTIME}, + #{HIDDENTYPE2}, + #{INVESTMENT_FUNDS}, + #{LISTMANAGER_ID}, + #{FOREIGN_ID}, + #{FINAL_CHECK}, + #{FINAL_CHECKOR}, + #{FINAL_CHECKTIME}, + #{FINAL_CHECKDESCR}, + #{POSITIONDESC} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + HIDDEN_ID = #{HIDDEN_ID} + + + + + update + + set + ISPUNISH = #{ISPUNISH}, + ISRELEVANT = #{ISRELEVANT}, + SOURCE = #{SOURCE}, + RISK_UNIT = #{RISK_UNIT}, + IDENTIFICATION = #{IDENTIFICATION}, + RISK_DESCR = #{RISK_DESCR}, + RISK_POSITION = #{RISK_POSITION}, + LEVEL = #{LEVEL}, + CHECK_CONTENT = #{CHECK_CONTENT}, + HIDDENDESCR = #{HIDDENDESCR}, + HIDDENPART = #{HIDDENPART}, + RECTIFYDESCR = #{RECTIFYDESCR}, + RECTIFICATIONTYPE = #{RECTIFICATIONTYPE}, + RECTIFICATIONDEPT = #{RECTIFICATIONDEPT}, + RECTIFICATIONOR = #{RECTIFICATIONOR}, + RECTIFICATIONTIME = #{RECTIFICATIONTIME}, + HIDDENLEVEL = #{HIDDENLEVEL}, + STATE = #{STATE}, + CHECKDEPT = #{CHECKDEPT}, + CHECKOR = #{CHECKOR}, + CHECKDESCR = #{CHECKDESCR}, + ISQUALIFIED = #{ISQUALIFIED}, + ISDELETE = #{ISDELETE}, + CORPINFO_ID = #{CORPINFO_ID}, + HIDDENFINDDEPT = #{HIDDENFINDDEPT}, + CHECKRECORD_ID = #{CHECKRECORD_ID}, + RECORDITEM_ID = #{RECORDITEM_ID}, + RISKITEM_ID = #{RISKITEM_ID}, + REJECTREASON = #{REJECTREASON}, + REVIEWOR = #{REVIEWOR}, + REVIEWTIME = #{REVIEWTIME}, + REVIEWDEPT = #{REVIEWDEPT}, + HAVESCHEME = #{HAVESCHEME}, + LONGITUDE = #{LONGITUDE}, + LATITUDE = #{LATITUDE}, + HIDDEN_ID = HIDDEN_ID + where + HIDDEN_ID = #{HIDDEN_ID} + + + + + update + + + + STATE = #{STATE}, + + + RECTIFICATIONTIME = #{RECTIFICATIONTIME}, + + + RECTIFICATIONOR = #{RECTIFICATIONOR}, + + + RECTIFICATIONDEPT = #{RECTIFICATIONDEPT}, + + + CHECKOR = #{CHECKOR}, + + + ISPUNISH = #{ISPUNISH}, + + + PUNISH_PERSON = #{PUNISH_PERSON}, + + + HIDDENLEVEL = #{HIDDENLEVEL}, + + + CHECKTIME = #{CHECKTIME}, + + + where + HIDDEN_ID = #{HIDDEN_ID} + + + + + + + + + + + + + + + + + + + + + + + + + + + delete from + + where + HIDDEN_ID in + + #{item} + + + + + + + + + + + + + + + + + + + + + update + + set + STATE = #{STATE} + where + FOREIGN_ID = #{INSPECTION_ID} + + + + + + + + + + + update + + set + FINAL_CHECK = #{FINAL_CHECK}, + FINAL_CHECKOR = #{FINAL_CHECKOR}, + FINAL_CHECKTIME = #{FINAL_CHECKTIME}, + FINAL_CHECKDESCR = #{FINAL_CHECKDESCR} + where + HIDDEN_ID = #{HIDDEN_ID} + + + + + + update + + set + STATE = #{STATE} + + + ,RECTIFYDESCR = null + ,RECTIFICATIONTIME = null + + where + HIDDEN_ID = #{HIDDEN_ID} + + + + + update + + set + ISDELETE = '1' + where + FOREIGN_ID = #{FOREIGN_ID} + and SOURCE = #{SOURCE} + + + + + + diff --git a/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml new file mode 100644 index 0000000..3356309 --- /dev/null +++ b/src/main/resources/mybatis/datasource/keyProjects/KeyprojectPunishMapper.xml @@ -0,0 +1,240 @@ + + + + + + + BUS_KEYPROJECTPUNISH + + + + + SYS_DICTIONARIES + + + + + f.CREATOR, + f.CREATTIME, + f.OPERATOR, + f.OPERATTIME, + f.ISDELETE, + f.KEYPROJECTCHECK_ID, + f.HIDDEN_ID, + f.UNITS_ID, + f.PERSONNELMANAGEMENT_ID, + f.REASON, + f.AMOUT, + f.DATE, + f.HANDLED, + f.HANDLE_IMG, + f.HANLDE_TIME, + f.KEYPROJECTPUNISH_ID + + + + + CREATOR, + CREATTIME, + OPERATOR, + OPERATTIME, + ISDELETE, + KEYPROJECTCHECK_ID, + HIDDEN_ID, + UNITS_ID, + PERSONNELMANAGEMENT_ID, + REASON, + AMOUT, + DATE, + HANDLED, + HANDLE_IMG, + HANLDE_TIME, + KEYPROJECTPUNISH_ID + + + + + #{CREATOR}, + #{CREATTIME}, + #{OPERATOR}, + #{OPERATTIME}, + #{ISDELETE}, + #{KEYPROJECTCHECK_ID}, + #{HIDDEN_ID}, + #{UNITS_ID}, + #{PERSONNELMANAGEMENT_ID}, + #{REASON}, + #{AMOUT}, + #{DATE}, + #{HANDLED}, + #{HANDLE_IMG}, + #{HANLDE_TIME}, + #{KEYPROJECTPUNISH_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + update + + set + ISDELETE = '1' + where + KEYPROJECTPUNISH_ID = #{KEYPROJECTPUNISH_ID} + + + + + update + + set + CREATOR = #{CREATOR}, + CREATTIME = #{CREATTIME}, + OPERATOR = #{OPERATOR}, + OPERATTIME = #{OPERATTIME}, + ISDELETE = #{ISDELETE}, + KEYPROJECTCHECK_ID = #{KEYPROJECTCHECK_ID}, + HIDDEN_ID = #{HIDDEN_ID}, + UNITS_ID = #{UNITS_ID}, + PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID}, + REASON = #{REASON}, + AMOUT = #{AMOUT}, + DATE = #{DATE}, + HANDLED = #{HANDLED}, + HANDLE_IMG = #{HANDLE_IMG}, + HANLDE_TIME = #{HANLDE_TIME}, + KEYPROJECTPUNISH_ID = KEYPROJECTPUNISH_ID + where + KEYPROJECTPUNISH_ID = #{KEYPROJECTPUNISH_ID} + + + + + update + + set + HANDLED = #{HANDLED}, + HANDLE_IMG = #{HANDLE_IMG}, + HANLDE_TIME = #{HANLDE_TIME} + where + KEYPROJECTPUNISH_ID = #{KEYPROJECTPUNISH_ID} + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + KEYPROJECTPUNISH_ID in + + #{item} + + + + + diff --git a/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml b/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml index 7d20c6c..1991c69 100644 --- a/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml +++ b/src/main/resources/mybatis/datasource/relatedparty/UnitsMapper.xml @@ -250,7 +250,7 @@ ISDELETE = '1' where UNITS_ID in - + #{item} diff --git a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml index b4cb1e5..d48cfb6 100644 --- a/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml +++ b/src/main/resources/mybatis/datasource/specialoperation/PersonnelManagementMapper.xml @@ -126,6 +126,16 @@ where PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID} + + + + update + + set PASSWORD = #{PASSWORD} + where + PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID} + +