失能申请调整

apply/apply-service/src/main/java/com/hungraim/ltc/ApplyApplication.java

@@ -4,6 +4,7 @@ package com.hungraim.ltc;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 /**
  * 申请服务
@@ -12,6 +13,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
  */
 @SpringBootApplication
 @EnableDiscoveryClient
+@EnableTransactionManagement
 public class ApplyApplication {
     public static void main(String[] args) {
         SpringApplication.run(ApplyApplication.class, args);

apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java

@@ -6,7 +6,6 @@ import com.hungraim.ltc.pojo.entity.disable.*;
 import com.hungraim.ltc.pojo.vo.disable.*;
 import com.hungraim.ltc.service.DisableService;
 import com.hungraim.ltc.util.Result;
-import com.hungraim.ltc.util.ResultCode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -108,9 +107,9 @@ public class DisableController {
      */
     @RequestMapping("/fndDiseaseList")
     public Result<List<ChFndDiseaseType>> fndDiseaseList(String parDiseTypeId) {
-        if (StrUtil.isNotBlank(parDiseTypeId)) {
+        /*if (StrUtil.isBlank(parDiseTypeId)) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
-        }
+        }*/
         List<ChFndDiseaseType> chFndDiseaseTypes = disableService.fndDiseaseList(parDiseTypeId);
         return Result.success(chFndDiseaseTypes);
     }

apply/apply-service/src/main/java/com/hungraim/ltc/service/DisableService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.entity.disable.*;
 import com.hungraim.ltc.pojo.vo.disable.*;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -26,6 +27,7 @@ public interface DisableService {
      * @param applyId 申请id
      * @return 失能审核信息详情
      */
+    @Transactional()
     DisableExamineInfoVO disableExamineInfo(String applyId);
 
     void addDisable(ChDisableApply chDisableApply);

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

@@ -129,7 +129,7 @@ public class DisableServiceImpl implements DisableService {
             disableInfoMapper.insert(chDisableInfo);
             //添加失能评定信息
             ChAprTask chAprTask = new ChAprTask();
-            ChCfgPara chCfgPara = cfgParaMapper.selectOne(new QueryWrapper<ChCfgPara>().eq("ORGAN_ID", chAprTask.getOrganId()));
+            ChCfgPara chCfgPara = cfgParaMapper.selectOne(new QueryWrapper<ChCfgPara>().eq("ORGAN_ID", chDisableApply.getOrganId()));
             if (chCfgPara != null && chCfgPara.getCfgArgTime() != null) {
                 Calendar cd = Calendar.getInstance();
                 cd.setTime(date);
@@ -137,6 +137,8 @@ public class DisableServiceImpl implements DisableService {
                 chAprTask.setLastAprDate(cd.getTime());//鉴定截至日期
             }
             BeanUtil.copyProperties(chDisableApply, chAprTask);
+            chAprTask.setDisableInfoId(chDisableInfo.getDisabInfoId());
+            //TODO 审核人id
             aprTaskMapper.insert(chAprTask);
         }
     }
@@ -177,7 +179,7 @@ public class DisableServiceImpl implements DisableService {
     public List<ChFndOrgan> fndOrganRoot() {
         QueryWrapper<ChFndOrgan> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("IS_LEAF", "1");
-        queryWrapper.eq("STATUS","1");
+        queryWrapper.eq("STATUS", "1");
         queryWrapper.and(wrapper -> wrapper.isNull("PARENT_ID").or().eq("PARENT_ID", ""));
         return fndOrganMapper.selectList(queryWrapper);
     }
@@ -249,7 +251,7 @@ public class DisableServiceImpl implements DisableService {
     public List<ChFndOrgan> fndAllOrgan() {
         QueryWrapper<ChFndOrgan> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("IS_LEAF", "1");
-        queryWrapper.eq("STATUS","1");
+        queryWrapper.eq("STATUS", "1");
         return fndOrganMapper.selectList(queryWrapper);
     }
 }
\ No newline at end of file

apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml

@@ -35,13 +35,13 @@
                 </foreach>
             </if>
             <if test="provincial != null and provincial != ''">
-                and a.DISTRICT_PROVINCIAL = #{provincial}
+                and (select DISTRICT_NAME from CH_FND_DISTRICT dis where a.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) = #{provincial}
             </if>
             <if test="city != null and city != ''">
-                and a.DISTRICT_CITY = #{city}
+                and (select DISTRICT_NAME from CH_FND_DISTRICT dis where a.DISTRICT_CITY = dis.DISTRICT_CODE) = #{city}
             </if>
             <if test="area != null and area != ''">
-            and a.DISTRICT_AREA = #{area}
+                and (select DISTRICT_NAME from CH_FND_DISTRICT dis where a.DISTRICT_AREA = dis.DISTRICT_CODE) = #{area}
             </if>
             <if test="name != null and name != ''">
                 and a.REAL_NAME like CONCAT(CONCAT('%',#{name}) ,'%')

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

@@ -14,7 +14,7 @@ import java.io.Serializable;
 @KeySequence(value = "SEQ_CH_DISABLE_INFO")
 public class ChDisableInfo extends PageInfo implements Serializable {
     @TableId(value = "DISAB_INFO_ID", type = IdType.INPUT)
-    private Long disabInfoId;
+    private Integer disabInfoId;
     private String agentLatitude;
     private String acptRoadDetail;
     private java.util.Date checkTime;

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChCfgPara.java

@@ -6,22 +6,20 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
 /**
  * CH_CFG_PARA
- * @author 
  */
 @Data
 @TableName("CH_CFG_PARA")
 @KeySequence("SEQ_CH_CFG_PARA")
-public class ChCfgPara implements Serializable {
+public class ChCfgPara {
     /**
      * 服务配置主键id
      */
-    @TableId(type = IdType.INPUT)
+    @TableId(value = "para_id", type = IdType.INPUT)
     private Long paraId;
 
     /**
@@ -115,6 +113,4 @@ public class ChCfgPara implements Serializable {
      * 享受标准(元/天)
      */
     private BigDecimal enjoyStandard;
-
-    private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

governance/src/main/java/com/hungraim/ltc/governance/service/DisableAssessmentCriteriaService.java

@@ -4,6 +4,7 @@ import cn.hutool.json.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.vo.governance.CfgAprVO;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 失能评定标准service
@@ -12,6 +13,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public interface DisableAssessmentCriteriaService {
+    @Transactional()
     void addOrUpdateDisableAssessmentCriteria(Long aprId, String organId, String estimateName, String remark, Integer status, JSONArray project);
 
     Page<CfgAprVO> getDisableAssessmentCriteriaList(Page<CfgAprVO> page, String organIds, String aprName, String status);

governance/src/main/java/com/hungraim/ltc/governance/service/SrvProgramService.java

@@ -5,6 +5,7 @@ import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
 import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.ProgramListVo;
 import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -63,6 +64,7 @@ public interface SrvProgramService {
      * 添加或者修改服务方案
      * @param programDetailVo 包装对象
      */
+    @Transactional()
     void addProgramAndProgramSetList(ProgramDetailVo programDetailVo);
 
     /**

governance/src/main/java/com/hungraim/ltc/governance/service/SrvSendService.java

@@ -7,6 +7,7 @@ import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
 import com.hungraim.ltc.pojo.vo.governance.DisableInfoTaskVO;
 import com.hungraim.ltc.pojo.vo.governance.SrvSendVO;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -16,8 +17,10 @@ public interface SrvSendService extends IService<ChSrvSend> {
 
     IPage<SrvSendVO> selectPage(ChDisableInfo disableInfo, ChSrvOrgan chSrvOrgan, ChSrvSend chSrvSend);
 
+    @Transactional()
     DisableInfoTaskVO selectTaskById(Integer disableInfoId, Integer srvOrganId);
 
+    @Transactional()
     List<DisableInfoTaskVO> selectBydisableInfoId(Integer disableInfoId);
 
     Long selectMaxId();

governance/src/main/java/com/hungraim/ltc/governance/service/SrvTaskService.java

@@ -3,6 +3,7 @@ package com.hungraim.ltc.governance.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.vo.governance.*;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
@@ -25,5 +26,6 @@ public interface SrvTaskService {
     /**
      * 新增或者修改服务计划
      */
+    @Transactional()
     void addOrUpdateSrvTask(SrvTaskInfoListVO param);
 }

governance/src/main/java/com/hungraim/ltc/governance/service/impl/DisableAssessmentCriteriaServiceImpl.java

@@ -15,7 +15,6 @@ import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprItemClause;
 import com.hungraim.ltc.pojo.vo.governance.CfgAprVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -36,7 +35,6 @@ public class DisableAssessmentCriteriaServiceImpl implements DisableAssessmentCr
     @Autowired
     private ChCfgAprItemClauseMapper chCfgAprItemClauseMapper;
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public void addOrUpdateDisableAssessmentCriteria(Long aprId, String organId, String estimateName, String remark, Integer status, JSONArray project) {
         Date date = new Date();

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvProgramServiceImpl.java

@@ -4,17 +4,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.governance.dao.ChSrvProgramMapper;
 import com.hungraim.ltc.governance.dao.ChSrvProgramSetMapper;
+import com.hungraim.ltc.governance.dao.ChSrvSendMapper;
+import com.hungraim.ltc.governance.service.SrvProgramService;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgramSet;
 import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo;
 import com.hungraim.ltc.pojo.vo.governance.ProgramListVo;
 import com.hungraim.ltc.pojo.vo.governance.ProgramSetAndProjectVo;
 import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo;
-import com.hungraim.ltc.governance.dao.ChSrvSendMapper;
-import com.hungraim.ltc.governance.service.SrvProgramService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
@@ -60,7 +59,6 @@ public class SrvProgramServiceImpl implements SrvProgramService {
         return chSrvProgramMapper.getProgramDetailWithAdd(disabInfoId, srvOrganId);
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public void addProgramAndProgramSetList(ProgramDetailVo programDetailVo) {
         Date date = new Date();

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvSendServiceImpl.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hungraim.ltc.governance.dao.SrvSendMapper;
 import com.hungraim.ltc.governance.service.SrvSendService;
-import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
 import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend;
@@ -13,10 +12,8 @@ import com.hungraim.ltc.pojo.vo.governance.DisableInfoTaskVO;
 import com.hungraim.ltc.pojo.vo.governance.SrvSendVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 
 @Service
@@ -42,7 +39,6 @@ public class SrvSendServiceImpl extends ServiceImpl<SrvSendMapper, ChSrvSend> im
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public DisableInfoTaskVO selectTaskById(Integer disableInfoId, Integer srvOrganId) {
         DisableInfoTaskVO disableInfoTaskVO = sendMapper.selectBydisableInfoId(disableInfoId);
         String s = sendMapper.selectByOrganId(srvOrganId);
@@ -51,7 +47,6 @@ public class SrvSendServiceImpl extends ServiceImpl<SrvSendMapper, ChSrvSend> im
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public List<DisableInfoTaskVO> selectBydisableInfoId(Integer disableInfoId) {
         return sendMapper.selectTaskByDisableInfoId(disableInfoId);
     }

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvTaskServiceImpl.java

@@ -12,7 +12,6 @@ import com.hungraim.ltc.pojo.vo.governance.*;
 import com.hungraim.ltc.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -81,7 +80,6 @@ public class SrvTaskServiceImpl implements SrvTaskService {
         return srvTaskInfoList;
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public void addOrUpdateSrvTask(SrvTaskInfoListVO param) {
         String programId = param.getProgramId();