Merge remote-tracking branch 'origin/master'

apply/apply-service/src/main/java/com/hungraim/ltc/dao/ChDisableInfoChangeMapper.java

@@ -21,7 +21,7 @@ public interface ChDisableInfoChangeMapper extends BaseMapper<ChDisableInfoChang
                                                        @Param("districtArea") String districtArea,
                                                        @Param("realName") String realName,
                                                        @Param("certiCode") String certiCode,
-                                                       @Param("aplOrganName") String aplOrganName,
+                                                       @Param("aplOrganName") String srvOrganName,
                                                        @Param("applyStatus") Short applyStatus);
     /**
      * 失能信息变更-查看修改

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

@@ -4,7 +4,7 @@
 
     <select id="taskDistributionList" resultType="com.hungraim.ltc.pojo.vo.assessment.TaskDistributionVO">
         select
-        task.task_id taskId,
+        DISTINCT task.task_id taskId,
         task.apply_id applyId,
         fndOrgan.ORGAN_NAME organName,
         task.ORGAN_ID aprOrganId,
@@ -44,9 +44,7 @@
         task.assign_time assignTime,
         task.accept_time acceptTime,
         task.finish_time finishTime,
-        task.task_status taskStatus,
-        reason.refuse_reason refuseReason,
-        push.refuse_remark refuseRemark
+        task.task_status taskStatus
         from CH_APR_TASK task
         left join ch_apr_organ aprOrgan on task.apr_organ_id = aprOrgan.apr_organ_id
        -- left join ch_srv_organ organ on aprOrgan.organ_id = organ.organ_id
@@ -60,7 +58,7 @@
         <where>
             and task.APR_TYPE = 0
             <if test="organIds != null">
-                and task.apr_organ_id in
+                and task.ORGAN_ID in
                 <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                     #{organId}
                 </foreach>
@@ -92,14 +90,14 @@
             <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'">
+            <if test="isReturn != null and isReturn !='' and isReturn == 0">
                 and cate.is_valid = 1 and task.task_status in (0,4,5)
             </if>
-            <if test="isReturn != null and isReturn == '1'">
-                (and cate.is_valid = 0 or cate.is_valid is null)
+            <if test="isReturn != null  and isReturn !='' and isReturn == 1">
+                and cate.is_valid = 0 or cate.is_valid is null
             </if>
         </where>
     </select>

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/system/SystemRole.java

 package com.hungraim.ltc.pojo.entity.system;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,12 +17,11 @@ import java.util.Date;
 @TableName("LTC_ROLE")
 public class SystemRole {
 
-    @TableId
+    @TableId( type = IdType.AUTO)
     private Long roleId;
     private String roleName;
     private String status;
     private Date createdTime;
     private Date updatedTime;
 
-
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/system/SystemUser.java

 package com.hungraim.ltc.pojo.entity.system;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,7 +17,7 @@ import java.util.Date;
 @TableName("LTC_USER")
 public class SystemUser {
 
-    @TableId
+    @TableId( type = IdType.AUTO)
     private Long userId;
     private String account;
     private String password;

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/DisableInfoVo.java

@@ -45,6 +45,7 @@ public class DisableInfoVo extends PageInfo {
     private Integer starts;
 
     private String acptAddress;
+    private Integer srvSendId;
 
 
 }

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

@@ -13,6 +13,7 @@ public interface DisableInfoMapper extends BaseMapper<ChDisableInfo> {
 
 
     @Select("select s.real_name," +
+            "i.SRV_SEND_ID," +
             "       s.acpt_provincial," +
             "       s.acpt_city," +
             "       s.acpt_area," +
@@ -35,5 +36,5 @@ public interface DisableInfoMapper extends BaseMapper<ChDisableInfo> {
             "       left join ch_srv_organ j" +
             "       on i.SRV_ORGAN_ID = j.SRV_ORGAN_ID" +
             "       where i.disab_info_id=#{disableInfoId}")
-    Page<DisableInfoVo> querySrvYet(Page page,Integer disableInfoId);
+    Page<DisableInfoVo> querySrvYet(Page page, Integer disableInfoId);
 }

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})

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

@@ -44,8 +44,8 @@
     LEFT JOIN CH_APR_TASK t ON i.disab_info_id = t.DISABLE_INFO_ID
     <where>
       t.TASK_STATUS = 3
-      <if test="chSrvOrgan.srvOrganId != null and chSrvOrgan.srvOrganId != ''">
-        AND o.organ_id = #{chSrvOrgan.srvOrganId}
+      <if test="chSrvOrgan.organId != null and chSrvOrgan.organId != ''">
+        AND o.organ_id = #{chSrvOrgan.organId}
       </if>
 
       <if test="disableInfo.realName != null and disableInfo.realName != ''">
@@ -80,7 +80,7 @@
         AND s.srv_mode_id = #{chSrvSend.srvModeId}
       </if>
 
-      <if test="chSrvSend.status != null and chSrvSend.status != ''">
+      <if test="chSrvSend.status != null ">
         AND (s.status is not null and s.status = #{chSrvSend.status})
       </if>
     </where>

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

@@ -138,7 +138,7 @@
                 and detail.SRV_DATE <= #{endTime}
             </if>
             <if test="status != null and status != ''">
-                and task.status = #{status}
+                and detail.status = #{status}
             </if>
             <if test="modeId != null and modeId != ''">
                 and mode1.srv_mode_name = #{modeId}

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

@@ -56,5 +56,7 @@
                 and emp.IS_LOCK = #{status}
             </if>
         </where>
+
+        ORDER BY emp.EFF_TIME desc
     </select>
 </mapper>
\ No newline at end of file

system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/RoleController.java

@@ -66,12 +66,13 @@ public class RoleController {
         systemRole.setStatus(reqRoleInfo.getStatus());
         systemRole.setCreatedTime(new Date());
         roleService.save(systemRole);
+        Long roleId = systemRole.getRoleId();
         if(reqRoleInfo.getResource() == null){
             reqRoleInfo.setResource(new ArrayList<>());
         }
         List<SystemRoleResource> roleResources = reqRoleInfo.getResource().stream().map(resourceId -> {
             SystemRoleResource systemRoleResource = new SystemRoleResource();
-            systemRoleResource.setRoleId(systemRole.getRoleId());
+            systemRoleResource.setRoleId(roleId);
             systemRoleResource.setResourceId(resourceId);
             return systemRoleResource;
         }).collect(Collectors.toList());

system/system-admin-service/src/main/java/com/hungraim/ltc/system/controller/UserController.java

@@ -109,12 +109,13 @@ public class UserController {
         user.setUserStatus(reqUserInfo.getEnable());
         user.setCreatedTime(new Date());
         userInfoService.save(user);
+        Long userId = user.getUserId();
         //初始化权限
         List<Long> roles = reqUserInfo.getRoleIds();
         roles.add(1L);
         List<SystemUserRole> roleList = roles.stream().map(roleId -> {
             SystemUserRole systemUserRole = new SystemUserRole();
-            systemUserRole.setUserId(user.getUserId());
+            systemUserRole.setUserId(userId);
             systemUserRole.setRoleId(roleId);
             return systemUserRole;
         }).collect(Collectors.toList());