修复职务职称显示乱码问题

src/main/java/com/zcloud/controller/eduStudy/StudentController.java

@@ -73,6 +73,13 @@ public class StudentController extends BaseController {
                 userInfo.put("USER_ID", data);
                 userInfo = usersService.findById(userInfo);
                 pd.putAll(userInfo);
+                pd.put("DUTIES", "");
+                if (!Tools.isEmpty(userInfo.get("DUTIES_NAME"))) {
+                    pd.put("DUTIES", userInfo.getString("DUTIES_NAME"));
+                }
+                if (Tools.isEmpty(pd.get("DUTIES")) && !Tools.isEmpty(userInfo.get("TITLE_NAME"))) {
+                    pd.put("DUTIES", userInfo.getString("TITLE_NAME"));
+                }
                 pd.put("FILE_NUMBER", fileNumberPrefix + DateUtil.getSdfTimesSSS());
                 if (pd.get("CLASS_ID") == null || Tools.isEmpty(pd.get("CLASS_ID").toString())) {
                     map.put("result", "error");                //返回结果

src/main/java/com/zcloud/controller/system/AppUsersController.java

@@ -1007,7 +1007,7 @@ public class AppUsersController extends BaseController {
      */
     @RequestMapping(value = "/editPractitioner")
     @ResponseBody
-    @LogAnno(menuType = "手机", menuServer = "注册从业人员", instructionsOperate = "注册从业人员", instructionsType = "注册")
+    @LogAnno(menuType = "手机", menuServer = "注册从业人员", instructionsOperate = "注册从业人员", instructionsType = "修改")
     public Object editPractitioner(MultipartRequest request) throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";

src/main/java/com/zcloud/controller/system/UsersController.java

@@ -2813,8 +2813,6 @@ public class UsersController extends BaseController {
         pd.put("TYPE_OF_WORK", pd.getString("POST_ID"));
         pd.put("CERTIFICATETYPE", "4bed7fac8fe24ad4b5c0c69321fd5916");
         pd.put("AUTHENTICATION", "0");
-        userInfoService.delete(pd);
-        userInfoService.save(pd);
 
         PageData pdd = new PageData();
         pdd.put("USER_ID", pd.getString("USER_ID"));
@@ -2947,6 +2945,8 @@ public class UsersController extends BaseController {
             smb.sshSftp(idCardFrontFiles, fileName, Const.FILEPATHFILE + ffile);
             idCard.put("ID_PHOTO_FRONT", Const.FILEPATHFILE + ffile + "/" + fileName);
         }
+        pd.put("ID_PHOTO", idCard.getString("ID_PHOTO_FRONT"));
+        userInfoService.editPractitioner(pd);
         if (null != idCardBackFiles && !idCardBackFiles.isEmpty()){
             //保存签名文件
             String ffile = "practitioner"+ "/" +DateUtil.getYear()+ "/" +DateUtil.getMonth()+ "/" +DateUtil.getOnlyDay();

src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java

@@ -716,7 +716,6 @@ public class UsersServiceImpl implements UsersService {
         newUser.put("CORPINFO_ID", pd.getString("APPLY_CORP"));
         pd.put("SORT", usersMapper.getUserCount(newUser) + 1);
         usersMapper.saveUser(pd);
-        userInfoService.save(pd);
 
         List<String> filePaths = new ArrayList<>();
         PageData idCard = new PageData();
@@ -745,6 +744,8 @@ public class UsersServiceImpl implements UsersService {
                     break;
             }
         }
+        pd.put("ID_PHOTO", idCard.getString("ID_PHOTO_FRONT"));
+        userInfoService.save(pd);
         idCard.put("USER_CERTIFICATE_ID", Warden.get32UUID());
         idCard.put("USER_ID", pd.getString("USER_ID"));
         idCard.put("CERTIFICATE_CATEGORY", "1"); // 身份证
@@ -1018,7 +1019,6 @@ public class UsersServiceImpl implements UsersService {
     public void editPractitioner(PageData pd, MultipartFile[] files) throws Exception {
         usersMapper.editPractitioner(pd);
         pd.put("PERSONNEL_TYPE", pd.getString("PERSONNEL_TYPE_NAME"));
-        userInfoService.editPractitioner(pd);
 
         List<String> filePaths = new ArrayList<>();
         PageData idCard = new PageData();
@@ -1047,6 +1047,8 @@ public class UsersServiceImpl implements UsersService {
                     break;
             }
         }
+        pd.put("ID_PHOTO", idCard.getString("ID_PHOTO_FRONT"));
+        userInfoService.editPractitioner(pd);
         idCard.put("USER_ID", pd.getString("USER_ID"));
         idCard.put("CERTIFICATE_CATEGORY", "1"); // 身份证
         idCard.put("ID_NO", pd.getString("USER_ID_CARD"));

src/main/resources/application-dev.properties

@@ -1,16 +1,16 @@
 
 datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
-datasource.no1.url=jdbc:mysql://192.168.0.69:3306/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
+datasource.no1.url=jdbc:mysql://192.168.0.103:33071/qa-traffic-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no1.username=root
-datasource.no1.password=root
+datasource.no1.password=Mysql@zcloud33071
 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
-datasource.no2.url=jdbc:mysql://192.168.0.69:3306/qa-traffic-admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
+datasource.no2.url=jdbc:mysql://192.168.0.103:33071/qa-traffic-admin?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no2.username=root
-datasource.no2.password=root
+datasource.no2.password=Mysql@zcloud33071
 datasource.no3.driver-class-name: com.mysql.cj.jdbc.Driver
-datasource.no3.url=jdbc:mysql://192.168.0.69:3306/qa-traffic-education-org?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
+datasource.no3.url=jdbc:mysql://192.168.0.103:33071/qa-traffic-education-org?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no3.username=root
-datasource.no3.password=root
+datasource.no3.password=Mysql@zcloud33071
 
 #druid\u8FDE\u63A5\u6C60
 spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
@@ -79,19 +79,6 @@ spring.main.banner-mode=off
 config.basicInfo.id=011de03c1d0a412ca78e2e5d4637ea81
 config.basic.url=http://192.168.0.7:8082/zcouldProperty
 
-#\u6B63\u5F0F
-#customer.id=LAZ-20221129-3
-#customer.SECRET_KEY=a256e8575c3f4240b08f6350f13ce8e2
-customer.url=https://api.qhdsafety.com/sync/
-#customer.domain=yth.qhdsafety.com
-
-
-#\u5F00\u53D1
-customer.id=LAZ-20221124-2
-customer.SECRET_KEY=2f703da369e342db9fe2fc9114c4967f
-#customer.url=http://192.168.0.18:8997/sync/
-customer.domain=test.qhdsafety.com
-
 
 #\u81EA\u5B9A\u4E49\u7EBF\u7A0B\u6C60\u914D\u7F6E
 # \u6838\u5FC3\u7EBF\u7A0B\u6C60\u6570

src/main/resources/application.properties

@@ -3,3 +3,13 @@ server.port=7082
 
 #\u5F00\u53D1
 spring.profiles.active=dev
+##\u6D4B\u8BD5
+#spring.profiles.active=debug
+##\u6B63\u5F0F
+#spring.profiles.active=master
+
+#\u6B63\u5F0F \u4EA4\u901A
+customer.id=LAZ-20240614-31
+customer.SECRET_KEY=8847ac2c63d8499f98e3a7494ddff09a
+customer.url=https://api.qhdsafety.com/sync/
+customer.domain=tszs.qhdsafety.com

src/main/resources/mybatis/datasource/system/UserInfoMapper.xml

@@ -342,6 +342,9 @@
 		<if test="RESIDENCE != null and RESIDENCE != ''">
 			RESIDENCE = #{RESIDENCE},
 		</if>
+		<if test="ID_PHOTO != null and ID_PHOTO != ''">
+			ID_PHOTO = #{ID_PHOTO},
+		</if>
 		USER_ID = USER_ID
 		where
 		USER_ID = #{USER_ID}

src/main/resources/mybatis/datasource/system/UsersMapper.xml

@@ -210,6 +210,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			ui.USER_ID_CARD,
 			ui.DEGREE_OF_EDUCATION,
 			ui.DUTIES,
+			du.NAME DUTIES_NAME,
+			dt.NAME TITLE_NAME,
 			ui.PERSONNEL_TYPE,
 			ui.CERTIFICATETYPE
 		from
@@ -218,6 +220,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			left join OA_DEPARTMENT d on d.DEPARTMENT_ID=f.DEPARTMENT_ID
 			left join SYS_POST p on p.POST_ID=f.POST_ID
 			left join SYS_USERINFO ui on ui.USER_ID = f.USER_ID
+			left join SYS_DICTIONARIES_CORP du on du.DICTIONARIES_ID = ui.DUTIES
+			LEFT JOIN SYS_DICTIONARIES_CORP dt on dt.DICTIONARIES_ID = ui.TITLE
 		where
 			f.USER_ID = #{USER_ID} and f.ISDELETE = 0
 	</select>

src/main/resources/mybatis/dsno3/eduStudy/StudentMapper.xml

@@ -14,10 +14,7 @@
 
     <!-- 字段 -->
     <sql id="Field">
-        f
+        f.STUDENT_ID,
-        .
-        STUDENT_ID
-        ,
 		f.USER_ID,
 		f.CORPINFO_ID,
 		f.ISDELETE,
@@ -52,8 +49,7 @@
 
     <!-- 字段用于新增 -->
     <sql id="Field2">
-        STUDENT_ID
+        STUDENT_ID,
-        ,
 		USER_ID,
 		CORPINFO_ID,
 		ISDELETE,
@@ -86,8 +82,7 @@
 
     <!-- 字段值 -->
     <sql id="FieldValue">
-        #{STUDENT_ID}
+        #{STUDENT_ID},
-        ,
         #{USER_ID},
         #{CORPINFO_ID},
         #{ISDELETE},