查找

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java

@@ -59,9 +59,9 @@ public class TaskController {
     public Result<Page<TaskDistributionVO>> taskDistributionList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
                                                                  String organId, String provincial, String city,
                                                                  String street, String realName, String certiCode, String taskName, String taskTel,
-                                                                 String daysRemaining, String status, String isReturn, String area) {
+                                                                 String daysRemaining, String taskStatus, String isReturn, String area) {
         Page<TaskDistributionVO> page = new Page<>(pageNum, pageSize);
-        page = taskService.taskDistributionList(page, organId, provincial, city, street, realName, certiCode, taskName, taskTel, daysRemaining, status, isReturn, area);
+        page = taskService.taskDistributionList(page, organId, provincial, city, street, realName, certiCode, taskName, taskTel, daysRemaining, taskStatus, isReturn, area);
         return Result.success(page);
     }
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/TaskMapper.java

@@ -37,7 +37,7 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
      */
     Page<TaskDistributionVO> taskDistributionList(Page<TaskDistributionVO> page, List<String> organIds, String provincial, String city,
                                                   String street, String realName, String certiCode, String taskName, String taskTel,
-                                                  String daysRemaining, String status, String isReturn, String area);
+                                                  String daysRemaining, String taskStatus, String isReturn, String area);
 
     /**
      * 评定报告录入列表

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java

@@ -25,7 +25,7 @@ public interface TaskService {
 
     Page<TaskDistributionVO> taskDistributionList(Page<TaskDistributionVO> page, String organId, String provincial, String city,
                                                   String street, String realName, String certiCode, String taskName, String taskTel,
-                                                  String daysRemaining, String status, String isReturn, String area);
+                                                  String daysRemaining, String taskStatus, String isReturn, String area);
 
     List<TaskReportVO> taskReportList(String name, String certiCode, String tel);
 

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

@@ -67,13 +67,13 @@ public class TaskServiceImpl implements TaskService {
     @Override
     public Page<TaskDistributionVO> taskDistributionList(Page<TaskDistributionVO> page, String organId, String provincial, String city,
                                                          String street, String realName, String certiCode, String taskName, String taskTel,
-                                                         String daysRemaining, String status, String isReturn, String area) {
+                                                         String daysRemaining, String taskStatus, String isReturn, String area) {
         List<String> organIds = null;
         if (StrUtil.isNotBlank(organId)) {
             organIds = Arrays.asList(organId.split(","));
         }
         return taskMapper.taskDistributionList(page, organIds, provincial, city,
-                street, realName, certiCode, taskName, taskTel, daysRemaining, status, isReturn, area);
+                street, realName, certiCode, taskName, taskTel, daysRemaining, taskStatus, isReturn, area);
     }
 
     /**

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -90,8 +90,8 @@
             <if test="daysRemaining != null and daysRemaining != ''">
                 and (to_date(to_char(task.last_apr_date,'yyyy-MM-dd'),'yyyy-MM-dd') - to_date(to_char(sysdate,'yyyy-MM-dd'),'yyyy-MM-dd')) + 1 &lt;= #{daysRemaining}
             </if>
-            <if test="status != null and status != ''">
-                and task.TASK_STATUS = #{status}
+            <if test="taskStatus != null and taskStatus != ''">
+                and task.TASK_STATUS = #{taskStatus}
             </if>
             <if test="isReturn != null and isReturn == '0'">
                 and cate.is_valid = 1 and task.task_status in (0,4,5)

governance/src/main/resources/com/hungraim/ltc/governance/mapper/BuildBedMapper.xml

@@ -14,7 +14,7 @@
         FROM CH_SRV_BUILD_BED a, CH_DISABLE_INFO b where a.DISAB_INFO_ID = b.DISAB_INFO_ID
         AND a.SRV_ORGAN_ID =#{req.srvOrganId}
         <if test="req.realName != null and req.realName != ''">
-            AND upper(a.REAL_NAME) LIKE '%' || upper#{req.realName}) || '%'
+            AND upper(a.REAL_NAME) LIKE '%' || upper(#{req.realName}) || '%'
         </if>
         <if test="req.certiCode != null and req.certiCode != ''">
             AND upper(a.CERTI_CODE) = upper(#{req.certiCode})