失能评定调整

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java

@@ -136,6 +136,8 @@ public class DisableServiceImpl implements DisableService {
             }
             BeanUtil.copyProperties(chDisableApply, chAprTask);
             chAprTask.setDisableInfoId(chDisableInfo.getDisabInfoId());//失能人员id
+            chAprTask.setEffTime(new Date());
+            chAprTask.setFcd(null);
             aprTaskMapper.insert(chAprTask);
         }
     }

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

@@ -97,9 +97,6 @@ public class TaskController {
      */
     @RequestMapping("/aprEmpList")
     public Result<List<AprEmpVO>> aprEmpList(String provincial, String city, String area, String organName, String name, String tel, String groupLeader) {
-        if (StringUtils.isBlank(provincial) || StringUtils.isBlank(city) || StringUtils.isBlank(area)) {
-            Result.failed("参数异常!");
-        }
         List<AprEmpVO> aprEmpS = taskService.aprEmpList(provincial, city, area, organName, name, tel, groupLeader);
         return Result.success(aprEmpS);
     }

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

@@ -11,6 +11,7 @@ import com.hungraim.ltc.pojo.vo.assessment.*;
 import com.hungraim.ltc.service.TaskService;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.SerialNumberUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -99,9 +100,11 @@ public class TaskServiceImpl implements TaskService {
         如果省市区下没有对应的组长,就查询省市下的对应组长,如果省市下也没有就查询省下的组长
          */
         if (aprEmpVOS == null || aprEmpVOS.size() <= 0) {
-            aprEmpVOS = taskMapper.aprEmpList(provincial, city, null, organName, name, tel, groupLeader);
-            if (aprEmpVOS == null || aprEmpVOS.size() <= 0) {
-                aprEmpVOS = taskMapper.aprEmpList(provincial, null, null, organName, name, tel, groupLeader);
+            if (StringUtils.isNotBlank(provincial) || StringUtils.isNotBlank(city) || StringUtils.isNotBlank(area)) {
+                aprEmpVOS = taskMapper.aprEmpList(provincial, city, null, organName, name, tel, groupLeader);
+                if (aprEmpVOS == null || aprEmpVOS.size() <= 0) {
+                    aprEmpVOS = taskMapper.aprEmpList(provincial, null, null, organName, name, tel, groupLeader);
+                }
             }
         }
         return aprEmpVOS;

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

@@ -172,9 +172,9 @@
         srvOrgan.srv_organ_name srvOrganName,
         organ.organ_code organCode,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
-        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_CITY = dis.DISTRICT_CODE) districPity,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_CITY = dis.DISTRICT_CODE) districtCity,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
-        organ.organ_name orgaName,
+        organ.organ_name organName,
         organ.UNIFIED_SOCIAL_CREDIT_CODE unifiedSocialCreditCode,
         emp.real_name realName,
         emp.gender gender,
@@ -185,12 +185,12 @@
         FROM ch_apr_emp emp
         LEFT JOIN ch_apr_organ organ ON emp.apr_organ_id = organ.apr_organ_id
         LEFT JOIN ch_srv_organ srvOrgan ON organ.organ_id = srvOrgan.srv_organ_id
-        where organ.DISTRICT_PROVINCIAL = #{provincial}
+        where (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) = #{provincial}
         <if test="city != null and city != ''">
-            and organ.district_city = #{city}
+            and (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_CITY = dis.DISTRICT_CODE) = #{city}
         </if>
         <if test="area != null and area != ''">
-            and organ.district_area = #{area}
+            and (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE organ.DISTRICT_AREA = dis.DISTRICT_CODE) = #{area}
         </if>
         <if test="organName != null and organName != ''">
             and organ.organ_name like CONCAT(CONCAT('%',#{organName}) ,'%')

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/disable/ChDisableInfo.java

@@ -97,7 +97,7 @@ public class ChDisableInfo extends PageInfo implements Serializable {
     private String reason;
     private Integer hearingObstacle;
     private Integer lastTaskId;
-    private java.util.Date lCD;
+    private java.util.Date lcd;
     private String realName;
     private Integer regist;
     private Integer operNumberType;

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/AprEmpVO.java

@@ -32,5 +32,5 @@ public class AprEmpVO {
     //评定人员手机号码
     private String tel;
     //是否组长0组长，1非组长
-    private Integer groupLeader;
+    private String groupLeader;
 }