人员修改添加server

src/main/java/thyyxxk/webserver/service/settings/SettingsService.java

@@ -43,6 +43,11 @@ public class SettingsService {
         this.publicServer = publicServer;
     }
 
+    public static void main(String[] args) {
+        String a = "12name 23";
+        System.out.println(a.contains("name"));
+    }
+
     public ResultVo<UserInfo> getUserInfo() {
         final String code = TokenUtil.getTokenUserId();
         final UserInfo user = dao.getUserInfo(code);
@@ -101,7 +106,9 @@ public class SettingsService {
         if (StringUtil.notBlank(param.getName())) {
             qw.and(QueryWrapper -> QueryWrapper.like("name", param.getName()).or().eq("code_rs", param.getName()));
         }
-
+        if (StringUtil.notBlank(param.getYbCode())) {
+            qw.eq("yb_code", param.getYbCode());
+        }
         if (param.getWhetherToDisable() != 9) {
             qw.eq("isnull(del_flag,0)", param.getWhetherToDisable());
         }
@@ -247,34 +254,35 @@ public class SettingsService {
         return ResultVoUtil.success();
     }
 
-    public ResultVo<String> savePersonnelInformation(UserInfo userInfo) {
-        if (userInfo.getOldData()) {
-            UserInfo info = getEmployeeOriginalInformation(userInfo.getCode());
-            if (null == info) {
-                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有查询到原来信息");
-            }
-            JSONObject changedField = CampareObject.getChangedFieldsOfObjectTest(info, userInfo);
-            if (changedField.keySet().isEmpty()) {
-                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没改提交个鸡毛");
-            }
-            StringBuilder sql = new StringBuilder();
-            for (String key : changedField.keySet()) {
-                Object val = changedField.get(key);
-                if (val != null) {
-                    val = "'" + val + "'";
-                }
-                sql.append(key).append("=").append(val).append(",");
-            }
-            dao.modifyPersonnelInformation(sql.substring(0, sql.length() - 1), userInfo.getCode());
-        } else {
-            publicServer.getPersonnelCode();
-            log.info("新增数据:{}", JSON.toJSONString(userInfo));
+    public ResultVo<String> modifyEmployeeInfo(UserInfo userInfo) {
+        UserInfo info = getEmployeeOriginalInformation(userInfo.getCode());
+        if (null == info) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有查询到原来信息");
+        }
+        String changedField = CampareObject.getChangedFieldsOfSql(info, userInfo);
+        if (changedField.contains("name")) {
+            changedField += String.format(",py_code = '%s',d_code = '%s' ",
+                    PingYinUtils.pyShouZiMuDaXie(userInfo.getName()), PingYinUtils.getWBCode(userInfo.getName()));
+        }
+        dao.modifyPersonnelInformation(changedField, userInfo.getCode());
+        log.info("修改员工信息==>操作人:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(userInfo));
+        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
+    }
+
+    public ResultVo<String> saveEmployeeInfo(UserInfo userInfo) {
+        if (dao.doesThePersonnelNumberExist(userInfo.getCodeRs()) > 0) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "人事工号已存在,换一个.");
         }
+        userInfo.setCode("0" + publicServer.getPersonnelCode())
+                .setPyCode(PingYinUtils.pyShouZiMuDaXie(userInfo.getName()))
+                .setDCode(PingYinUtils.getWBCode(userInfo.getName()));
+        dao.saveEmployeeInfo(userInfo);
+        log.info("添加员工信息==>操作人:{},数据:{}", TokenUtil.getTokenUserId(), JSON.toJSONString(userInfo));
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
     }
 
     private UserInfo getEmployeeOriginalInformation(String code) {
-        IPage<UserInfo> page = new Page<>(1, 1);
+        IPage<UserInfo> page = new Page<>(1, 1, false);
         QueryWrapper<?> qw = new QueryWrapper<>();
         qw.eq("a.code", code);
         return dao.selectAllUsers(page, qw).getRecords().get(0);