merge

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -356,8 +356,12 @@ public class TaskServiceImpl implements TaskService {
         }
         //更新任务组状态
         chAprTaskPush.setStatus(status.shortValue());
-        chAprTaskPush.setRefuseReason(refuseReason);
-        chAprTaskPush.setRefuseRemark(refuseRemark);
+        if(refuseReason != null) {
+            chAprTaskPush.setRefuseReason(refuseReason);
+        }
+        if(StringUtils.isNotBlank(refuseRemark)){
+            chAprTaskPush.setRefuseRemark(refuseRemark);
+        }
         taskPushMapper.updateById(chAprTaskPush);
         //更新评定任务状态
         ChAprTask chAprTask = taskMapper.selectById(chAprTaskPush.getTaskId());
@@ -624,4 +628,4 @@ public class TaskServiceImpl implements TaskService {
         return chAprTaskPage;
 
     }
-}
\ No newline at end of file
+}

governance/src/main/java/com/hungraim/ltc/governance/dao/DisableInfoMapper.java

@@ -33,7 +33,7 @@ public interface DisableInfoMapper extends BaseMapper<ChDisableInfo> {
             "       left join ch_disable_info s " +
             "       on s.disab_info_id = i.disab_info_id" +
             "       left join ch_srv_organ j" +
-            "       on s.organ_id = j.organ_id" +
+            "       on i.SRV_ORGAN_ID = j.SRV_ORGAN_ID" +
             "       where i.disab_info_id=#{disableInfoId}")
     Page<DisableInfoVo> querySrvYet(Page page,Integer disableInfoId);
 }

governance/src/main/java/com/hungraim/ltc/governance/dao/SrvSendMapper.java

@@ -57,12 +57,14 @@ public interface SrvSendMapper extends BaseMapper<ChSrvSend> {
             "       s.certi_code," +
             "       s.tel," +
             "       s.DISE_TYPE_S," +
+            "        o.evaluate_rating," +
             "       i.finish_time," +
             "       i.re_apr_time," +
             "       i.task_status" +
             "       from ch_apr_task i" +
             "       left join ch_disable_info s " +
             "       on s.disab_info_id = i.disable_info_id" +
+            "       left join ch_apr_report o on i.task_id = o.task_id" +
             "       where i.disable_info_id=#{disableInfoId}")
     List<DisableInfoTaskVO> selectTaskByDisableInfoId(Integer disableInfoId);