Merge remote-tracking branch 'origin/master'

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/PostCheckedProblem.java

@@ -87,7 +87,7 @@ public class PostCheckedProblem extends BaseEntity {
     @ApiModelProperty("问题等级")
     @TableField(value = "problem_level")
     @Excel(name = "问题等级", readConverterExp = "1一般、2 重要")
-    private String problemLevel;
+    private Integer problemLevel;
 
     @ApiModelProperty("职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；")
     @TableField(value = "duty_type")
@@ -102,7 +102,7 @@ public class PostCheckedProblem extends BaseEntity {
     @ApiModelProperty("问题类别")
     @TableField(value = "problem_category")
     @Excel(name = "问题类别", readConverterExp = "职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他")
-    private String problemCategory;
+    private Integer problemCategory;
 
     @ApiModelProperty("问题描述")
     @TableField(value = "description")

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostCheckedProblemServiceImpl.java

@@ -1179,9 +1179,9 @@ public class PostCheckedProblemServiceImpl extends ServiceImpl<PostCheckedProble
         );
         List<ProblemAttributeCategoryView> list = new ArrayList<>();
         if (postCheckedProblems != null && postCheckedProblems.size() > 0) {
-            Map<String, List<PostCheckedProblem>> collect = postCheckedProblems.stream().collect(Collectors.groupingBy(PostCheckedProblem::getProblemCategory));
+            Map<Integer, List<PostCheckedProblem>> collect = postCheckedProblems.stream().collect(Collectors.groupingBy(PostCheckedProblem::getProblemCategory));
 //           问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）
-            for (Map.Entry<String, List<PostCheckedProblem>> stringListEntry : collect.entrySet()) {
+            for (Map.Entry<Integer, List<PostCheckedProblem>> stringListEntry : collect.entrySet()) {
                 List<PostCheckedProblem> value = stringListEntry.getValue();
                 if (value != null && value.size() > 0) {
 

ruoyi-postcheck/src/main/resources/mapper/postCheck/PostCheckedProblemMapper.xml

@@ -120,7 +120,7 @@
             <if test="deptApproveTime != null "> and t1.dept_approve_time = #{deptApproveTime}</if>
             <if test="specialityDepartmentReviewerId != null "> and t1.speciality_department_reviewer_id = #{specialityDepartmentReviewerId}</if>
             <if test="specialityDepartmentReviewTime != null "> and t1.speciality_department_review_time = #{specialityDepartmentReviewTime}</if>
-            <if test="problemLevel != null  and problemLevel != ''"> and t1.problem_level = #{problemLevel}</if>
+            <if test="problemLevel != null"> and t1.problem_level = #{problemLevel}</if>
             <if test="problemAttribute != null"> and t1.problem_attribute = #{problemAttribute}</if>
             <if test="problemCategory != null"> and t1.problem_category = #{problemCategory}</if>
             <if test="description != null  and description != ''"> and t1.description = #{description}</if>
@@ -158,7 +158,7 @@
 
     <select id="selectPostCheckedProblemById" parameterType="Long" resultMap="PostCheckedProblemResult">
         <include refid="selectPostCheckedProblemVo"/>
-        where id = #{id}
+        where t1.id = #{id}
     </select>
 
     <insert id="insertPostCheckedProblem" parameterType="PostCheckedProblem">
@@ -174,7 +174,7 @@
             <if test="deptApproveTime != null">dept_approve_time,</if>
             <if test="specialityDepartmentReviewerId != null">speciality_department_reviewer_id,</if>
             <if test="specialityDepartmentReviewTime != null">speciality_department_review_time,</if>
-            <if test="problemLevel != null and problemLevel != ''">problem_level,</if>
+            <if test="problemLevel != null">problem_level,</if>
             <if test="problemAttribute != null">problem_attribute,</if>
             <if test="problemCategory != null">problem_category,</if>
             <if test="description != null">description,</if>
@@ -213,9 +213,9 @@
             <if test="deptApproveTime != null">#{deptApproveTime},</if>
             <if test="specialityDepartmentReviewerId != null">#{specialityDepartmentReviewerId},</if>
             <if test="specialityDepartmentReviewTime != null">#{specialityDepartmentReviewTime},</if>
-            <if test="problemLevel != null and problemLevel != ''">#{problemLevel},</if>
+            <if test="problemLevel != null">#{problemLevel},</if>
             <if test="problemAttribute != null">#{problemAttribute},</if>
-            <if test="problemCategory != null and problemCategory != ''">#{problemCategory},</if>
+            <if test="problemCategory != null">#{problemCategory},</if>
             <if test="description != null">#{description},</if>
             <if test="problemCause != null">#{problemCause},</if>
             <if test="isImmediatelyCorrected != null">#{isImmediatelyCorrected},</if>
@@ -255,7 +255,7 @@
             <if test="deptApproveTime != null">dept_approve_time = #{deptApproveTime},</if>
             <if test="specialityDepartmentReviewerId != null">speciality_department_reviewer_id = #{specialityDepartmentReviewerId},</if>
             <if test="specialityDepartmentReviewTime != null">speciality_department_review_time = #{specialityDepartmentReviewTime},</if>
-            <if test="problemLevel != null and problemLevel != ''">problem_level = #{problemLevel},</if>
+            <if test="problemLevel != null">problem_level = #{problemLevel},</if>
             <if test="problemAttribute != null">problem_attribute = #{problemAttribute},</if>
             <if test="problemCategory != null">problem_category = #{problemCategory},</if>
             <if test="description != null">description = #{description},</if>