查看bug修复

2023-12-21 19:55:08 +08:00 · 2023-12-21 19:55:08 +08:00 · 644ee59398
parent f59d2b0500
commit 644ee59398
4 changed files with 359 additions and 332 deletions
--- a/src/main/java/com/zcloud/service/xgf/impl/TrainingBatchServiceImpl.java
+++ b/src/main/java/com/zcloud/service/xgf/impl/TrainingBatchServiceImpl.java
@ -49,7 +49,9 @@ public class TrainingBatchServiceImpl implements TrainingBatchService {
    @Resource
    private DepartmentMapper departmentMapper;

-	/**新增
+    /**
+     * 新增
+     *
     * @param pd
     * @throws Exception
     */
@ -94,17 +96,21 @@ public class TrainingBatchServiceImpl implements TrainingBatchService {
        PageData manDepartment = departmentMapper.getInfo(condition);
        pd.put("MANAGER_DEPARTMENT_NAME", manDepartment.get("NAME"));

+        // 2023-12-21 相关方功能限制，暂时移除集团单位审批节点 created by sparrow
+        if (StringUtils.isNotEmpty(pd.getString("TERRITORIALITY_USER_ID"))) {
            condition.clear();
            condition.put("USER_ID", pd.get("TERRITORIALITY_USER_ID"));
            PageData terUser = usersMapper.getUserInfo(condition);
-		pd.put("TERRITORIALITY_USER_NAME",terUser.get("NAME"));
+            pd.put("TERRITORIALITY_USER_NAME", terUser == null ? "" : terUser.get("NAME"));

            condition.clear();
            condition.put("DEPARTMENT_ID", pd.get("TERRITORIALITY"));
            PageData terDepartment = departmentMapper.getInfo(condition);
-		pd.put("TERRITORIALITY_DEPARTMENT_NAME",terDepartment.get("NAME"));
+            pd.put("TERRITORIALITY_DEPARTMENT_NAME", terDepartment == null ? "" : terDepartment.get("NAME"));
+        }
+
        pd.put("IS_DELETE", "0");
-		pd.put("STEP_STATUS","0");
+        pd.put("STEP_STATUS", "1");
        trainingbatchMapper.save(pd);

        String arrayDATA_ids[] = pd.getString("users").split(",");
@ -118,7 +124,7 @@ public class TrainingBatchServiceImpl implements TrainingBatchService {
            user.put("SUPERVISION_STATE", 9);
            user.put("MANAGER_STATE", 9);
            user.put("TERRITORIALITY_STATE", 9);
-			user.put("STEP_STATUS", "0");
+            user.put("STEP_STATUS", "1");
            user.put("BELONG_TO_CORP", pd.get("BELONG_TO_CORP"));
            user.put("BELONG_TO_CORP_NAME", pd.get("BELONG_TO_CORP_NAME"));
            user.put("IS_DELETE", "0");
@ -162,7 +168,9 @@ public class TrainingBatchServiceImpl implements TrainingBatchService {
        flowDetailMapper.save(flowDetail);
    }

-	/**固定人员培训
+    /**
+     * 固定人员培训
+     *
     * @param pd
     * @throws Exception
     */
@ -213,7 +221,9 @@ public class TrainingBatchServiceImpl implements TrainingBatchService {

    }

-	/**删除
+    /**
+     * 删除
+     *
     * @param pd
     * @throws Exception
     */
@ -221,7 +231,9 @@ public class TrainingBatchServiceImpl implements TrainingBatchService {
        trainingbatchMapper.delete(pd);
    }

-	/**修改
+    /**
+     * 修改
+     *
     * @param pd
     * @throws Exception
     */
@ -255,7 +267,9 @@ public class TrainingBatchServiceImpl implements TrainingBatchService {
        }
    }

-	/**列表
+    /**
+     * 列表
+     *
     * @param page
     * @throws Exception
     */
@ -263,7 +277,9 @@ public class TrainingBatchServiceImpl implements TrainingBatchService {
        return trainingbatchMapper.datalistPage(page);
    }

-	/**列表(全部)
+    /**
+     * 列表(全部)
+     *
     * @param pd
     * @throws Exception
     */
@ -271,7 +287,9 @@ public class TrainingBatchServiceImpl implements TrainingBatchService {
        return trainingbatchMapper.listAll(pd);
    }

-	/**通过id获取数据
+    /**
+     * 通过id获取数据
+     *
     * @param pd
     * @throws Exception
     */
@ -279,7 +297,9 @@ public class TrainingBatchServiceImpl implements TrainingBatchService {
        return trainingbatchMapper.findById(pd);
    }

-	/**批量删除
+    /**
+     * 批量删除
+     *
     * @param ArrayDATA_IDS
     * @throws Exception
     */
@ -289,6 +309,7 @@ public class TrainingBatchServiceImpl implements TrainingBatchService {

    /**
     * 获取编号
+     *
     * @param pd
     * @return
     */
--- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
+++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
@ -61,11 +61,13 @@ public class XgfUserServiceImpl implements XgfUserService {
                if (entity == null || entity.size() <= 0) {
                    x.put("XGF_USER_ID", x.get("USER_ID"));
                    x.put("XGF_USER_DETAILS_ID", x.get("USER_ID"));
-                    x.put("ISDELETE", "0");
+                    x.put("XGF_USER_NAME", x.get("NAME"));
                    x.put("VALID_FLAG", "1");
                    x.put("STATUS", "2");
                    x.put("CREATED_TIME", DateUtil.getTime());
                    x.put("OPERATOR_TIME", DateUtil.getTime());
+                    x.put("IS_DELETE", "0");
+                    x.put("CREATE_TIME", DateUtil.getTime());
                    condition.clear();
                    condition.put("DEPARTMENT_ID",x.get("MANAGER_DEPARTMENT_ID"));
                    PageData regDepartmentEntity = departmentService.getCorpDepartment(condition);
@ -75,7 +77,8 @@ public class XgfUserServiceImpl implements XgfUserService {
                } else {
                    x.put("XGF_USER_ID", x.get("USER_ID"));
                    x.put("XGF_USER_DETAILS_ID", x.get("USER_ID"));
-                    x.put("ISDELETE", "0");
+                    x.put("IS_DELETE", "0");
+                    x.put("CREATE_TIME", DateUtil.getTime());
                    x.put("OPERATOR_TIME", DateUtil.getTime());
                    condition.clear();
                    condition.put("DEPARTMENT_ID",x.get("MANAGER_DEPARTMENT_ID"));
--- a/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml
+++ b/src/main/resources/mybatis/datasource/xgf/XgfUserDetailsMapper.xml
@ -15,7 +15,7 @@
 		f.BELONG_TO_CORP,
 		f.BELONG_TO_CORP_NAME,
 		f.PHONE,
-		f.CREAT_TIME,
+		f.CREATE_TIME,
 		f.DEPART_STATE,
 		f.ISDELETE,
 		f.AGE,
@ -69,7 +69,7 @@
 		BELONG_TO_CORP,
 		BELONG_TO_CORP_NAME,
 		PHONE,
-		CREAT_TIME,
+		CREATE_TIME,
 		DEPART_STATE,
 		ISDELETE,
 		AGE,
@ -124,7 +124,7 @@
        #{BELONG_TO_CORP},
        #{BELONG_TO_CORP_NAME},
        #{PHONE},
-        #{CREAT_TIME},
+        #{CREATE_TIME},
        #{DEPART_STATE},
        #{ISDELETE},
        #{AGE},
@ -203,7 +203,7 @@
        BELONG_TO_CORP = #{BELONG_TO_CORP},
        BELONG_TO_CORP_NAME = #{BELONG_TO_CORP_NAME},
        PHONE = #{PHONE},
-        CREAT_TIME = #{CREAT_TIME},
+        CREATE_TIME = #{CREATE_TIME},
        DEPART_STATE = #{DEPART_STATE},
        ISDELETE = #{ISDELETE},
        AGE = #{AGE},
--- a/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml
+++ b/src/main/resources/mybatis/datasource/xgf/XgfUserMapper.xml
@ -15,8 +15,8 @@
 		f.VALID_FLAG,
 		f.BELONG_TO_CORP,
 		f.BELONG_TO_CORP_NAME,
-		f.ISDELETE,
-		f.CREATED_TIME,
+		f.IS_DELETE,
+		f.CREATE_TIME,
 		f.CORPINFO_ID,
 		f.STATUS,
 		f.OPERATOR_TIME,
@ -32,8 +32,8 @@
 		VALID_FLAG,
 		BELONG_TO_CORP,
 		BELONG_TO_CORP_NAME,
-		ISDELETE,
-		CREATED_TIME,
+		IS_DELETE,
+		CREATE_TIME,
 		CORPINFO_ID,
 		STATUS,
 		OPERATOR_TIME,
@ -49,8 +49,8 @@
 		#{VALID_FLAG},
 		#{BELONG_TO_CORP},
 		#{BELONG_TO_CORP_NAME},
-		#{ISDELETE},
-		#{CREATED_TIME},
+		#{IS_DELETE},
+		#{CREATE_TIME},
 		#{CORPINFO_ID},
 		#{STATUS},
 		#{OPERATOR_TIME},
@ -90,7 +90,7 @@
 		BELONG_TO_CORP = #{BELONG_TO_CORP},
 		BELONG_TO_CORP_NAME = #{BELONG_TO_CORP_NAME},
 		ISDELETE = #{ISDELETE},
-		CREATED_TIME = #{CREATED_TIME},
+		CREATE_TIME = #{CREATE_TIME},
 		CORPINFO_ID = #{CORPINFO_ID},
 		STATUS = #{STATUS},
 		OPERATOR_TIME = #{OPERATOR_TIME},
@ -155,7 +155,7 @@
        <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
            and(f.BELONG_TO_CORP_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%'))
        </if>
-        ORDER BY f.CREATED_TIME DESC
+        ORDER BY f.CREATE_TIME DESC
    </select>

 	<!-- 列表(全部) -->
@ -204,6 +204,9 @@
        <if test="pd.STATUS != null and pd.STATUS != ''">
            and a.STATUS = #{pd.STATUS}
        </if>
+		<if test="pd.UN_STUDY_STATUS != null and pd.UN_STUDY_STATUS != ''">
+			and a.STUDY_STATUS != #{pd.UN_STUDY_STATUS}
+		</if>
    </select>
 	<select id="getInfoById" resultType="com.zcloud.entity.PageData">
 		select a.XGF_USER_ID,
@ -215,7 +218,7 @@
 			   b.BELONG_TO_CORP,
 			   b.BELONG_TO_CORP_NAME,
 			   b.PHONE,
-			   b.CREAT_TIME,
+			   b.CREATE_TIME,
 			   b.DEPART_STATE,
 			   b.ISDELETE,
 			   b.AGE,