隐患考评调整

web-adapter/src/main/java/com/zcloud/hidden/evaluation/web/HiddenEvaluationRecordController.java

@@ -64,8 +64,8 @@ public class HiddenEvaluationRecordController {
 
     @ApiOperation("考评列表")
     @PostMapping("/hiddenEvalPage")
-    public PageResponse<HiddenEvalCO> hidddenEvalPage(@RequestBody HiddenEvalPageQry qry) {
+    public PageResponse<HiddenEvalCO> hiddenEvalPage(@RequestBody HiddenEvalPageQry qry) {
-        return hiddenEvaluationRecordService.hidddenEvalPage(qry);
+        return hiddenEvaluationRecordService.hiddenEvalPage(qry);
     }
 
     @ApiOperation("分公司绩效好评-首页列表")

web-app/src/main/java/com/zcloud/hidden/evaluation/command/query/HiddenEvaluationRecordQueryExe.java

@@ -112,9 +112,9 @@ public class HiddenEvaluationRecordQueryExe {
         return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
     }
 
-    public PageResponse<HiddenEvalCO> hidddenEvalPage(HiddenEvalPageQry qry) {
+    public PageResponse<HiddenEvalCO> hiddenEvalPage(HiddenEvalPageQry qry) {
         Map<String, Object> params = PageQueryHelper.toHashMap(qry);
-        PageResponse<HiddenEvalDO> pageResponse = hiddenEvaluationRecordRepository.hidddenEvalPage(params);
+        PageResponse<HiddenEvalDO> pageResponse = hiddenEvaluationRecordRepository.hiddenEvalPage(params);
 
         List<HiddenEvalCO> examCenterCOS =hiddenEvaluationRecordCoConvertor.converHiddenEvalDOsToCOs(pageResponse.getData());
 

web-app/src/main/java/com/zcloud/hidden/evaluation/service/HiddenEvaluationRecordServiceImpl.java

@@ -77,8 +77,8 @@ public class HiddenEvaluationRecordServiceImpl implements HiddenEvaluationRecord
     }
 
     @Override
-    public PageResponse<HiddenEvalCO> hidddenEvalPage(HiddenEvalPageQry qry) {
+    public PageResponse<HiddenEvalCO> hiddenEvalPage(HiddenEvalPageQry qry) {
-        return  hiddenEvaluationRecordQueryExe.hidddenEvalPage(qry);
+        return  hiddenEvaluationRecordQueryExe.hiddenEvalPage(qry);
     }
 
     @Override

web-client/src/main/java/com/zcloud/hidden/evaluation/api/HiddenEvaluationRecordServiceI.java

@@ -32,7 +32,7 @@ public interface HiddenEvaluationRecordServiceI {
 
     PageResponse<UserEvalStatisticsCO> userEvalStatisticsPage(UserEvalStatisticsPageQry qry);
 
-    PageResponse<HiddenEvalCO> hidddenEvalPage(HiddenEvalPageQry qry);
+    PageResponse<HiddenEvalCO> hiddenEvalPage(HiddenEvalPageQry qry);
 
     void exportUserEvalStatisticsPage(Long[] ids, Long corpinfoId,HttpServletResponse httpServletResponse);
 

web-client/src/main/java/com/zcloud/hidden/evaluation/dto/HiddenEvalPageQry.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 
 /**
@@ -49,6 +50,7 @@ public class HiddenEvalPageQry extends PageQuery {
     @ApiModelProperty(value = "兑换标识 0-未兑换 1-已兑换")
     private Integer exchangeFlag;
 
-
+  /*  @ApiModelProperty(value = "考评结果.1:考核未完成,2:考评合格,3:考核不合格")
+    private List<Integer> evaluationResultList;*/
 }
 

web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/mapper/HiddenEvaluationRecordMapper.java

@@ -32,7 +32,7 @@ public interface HiddenEvaluationRecordMapper extends BaseMapper<HiddenEvaluatio
 
     IPage<UserEvalStatisticsDO> userEvalStatisticsPage(IPage<UserEvalStatisticsDO> iPage, Map<String, Object> params, String menuPerms);
 
-    IPage<HiddenEvalDO> hidddenEvalPage(IPage<HiddenEvalDO> iPage, Map<String, Object> params);
+    IPage<HiddenEvalDO> hiddenEvalPage(IPage<HiddenEvalDO> iPage, Map<String, Object> params);
 
     IPage<CorpEvalDO> corpEvalPage(IPage<CorpEvalDO> iPage, Map<String, Object> params, String menuPerms);
 }

web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/HiddenEvaluationRecordRepository.java

@@ -27,7 +27,7 @@ public interface HiddenEvaluationRecordRepository extends BaseRepository<HiddenE
 
     PageResponse<UserEvalStatisticsDO> userEvalStatisticsPage(Map<String, Object> params);
 
-    PageResponse<HiddenEvalDO> hidddenEvalPage(Map<String, Object> params);
+    PageResponse<HiddenEvalDO> hiddenEvalPage(Map<String, Object> params);
 
     List<HiddenEvaluationRecordDO> findRecordsToExchange(Long userId);
 

web-infrastructure/src/main/java/com/zcloud/hidden/evaluation/persistence/repository/impl/HiddenEvaluationRecordRepositoryImpl.java

@@ -88,9 +88,9 @@ public class HiddenEvaluationRecordRepositoryImpl extends BaseRepositoryImpl<Hid
     }
 
     @Override
-    public PageResponse<HiddenEvalDO> hidddenEvalPage(Map<String, Object> params) {
+    public PageResponse<HiddenEvalDO> hiddenEvalPage(Map<String, Object> params) {
         IPage<HiddenEvalDO> iPage = new Query<HiddenEvalDO>().getPage(params);
-        IPage<HiddenEvalDO> result = hiddenEvaluationRecordMapper.hidddenEvalPage(iPage, params);
+        IPage<HiddenEvalDO> result = hiddenEvaluationRecordMapper.hiddenEvalPage(iPage, params);
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 

web-infrastructure/src/main/resources/mapper/HiddenEvaluationRecordMapper.xml

@@ -65,7 +65,7 @@
                 ) ec_all ON ec_all.corpinfo_id = ec.corpinfo_id AND ec_all.evaluation_type = ec.evaluation_type
         WHERE ec.delete_enum = 'FALSE'
           AND ci.delete_enum = 'FALSE'
-          AND ci.type IN (0, 1, 6)
+          AND ci.type IN (0, 1, 2, 6)
           AND ci.use_flag = 1
         <if test="params.corpinfoName != null and params.corpinfoName != ''">
             AND ci.corp_name LIKE CONCAT('%', #{params.corpinfoName}, '%')
@@ -74,7 +74,7 @@
             AND ec.evaluation_type = #{params.evaluationType}
         </if>
         <if test="params.userName != null and params.userName != ''">
-            AND u.name LIKE CONCAT('%', #{params.userName}, '%')
+            AND ec_all.evaluationMembers LIKE CONCAT('%-%', #{params.userName}, '%')
         </if>
         GROUP BY ec.corpinfo_id, ec.evaluation_type
         ORDER BY ecorp.create_time desc
@@ -209,7 +209,7 @@
                     SELECT 1
                     FROM hidden_evaluation_detail hed2
                     JOIN hidden_evaluation_record her2 ON hed2.hidden_evaluation_record_id = her2.hidden_evaluation_record_id
-                    WHERE her2.hidden_id = h.id
+                    WHERE her2.hidden_id = h.hidden_id
                     AND hed2.evaluation_user_id = #{params.currentUserId}
                     AND hed2.delete_enum = 'FALSE'
                     )
@@ -220,7 +220,7 @@
                     SELECT 1
                     FROM hidden_evaluation_detail hed2
                     JOIN hidden_evaluation_record her2 ON hed2.hidden_evaluation_record_id = her2.hidden_evaluation_record_id
-                    WHERE her2.hidden_id = h.id
+                    WHERE her2.hidden_id = h.hidden_id
                     AND hed2.evaluation_user_id = #{params.currentUserId}
                     AND hed2.delete_enum = 'FALSE'
                     )
@@ -344,7 +344,7 @@
         ORDER BY u.sort ,u.create_time desc
     </select>
 
-    <select id="hidddenEvalPage" resultType="com.zcloud.hidden.evaluation.persistence.dataobject.HiddenEvalDO">
+    <select id="hiddenEvalPage" resultType="com.zcloud.hidden.evaluation.persistence.dataobject.HiddenEvalDO">
         select h.source,
         h.hidden_id                                                             AS hiddenId,
         h.id                                                          AS hiddenSnowFlakeId,
@@ -366,6 +366,7 @@
         left join user u on hd.evaluation_user_id = u.id and u.delete_enum = 'FALSE'
 
         where her.delete_enum = 'FALSE'  and her.find_user_id = #{params.findUserId}
+        and her.evaluation_result=2
           AND h.state = 301 -- 已验收
           -- 来源4/5必须满足final_check=1，其他只需要state=301
           AND (