解决冲突

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

@@ -323,19 +323,7 @@ public class DisableServiceImpl implements DisableService {
 
     @Override
     public void DisInfoChange(ChDisableInfoChange chDisableInfoChange) {
-        //先把info的数据带出来
-        List<ChDisableInfo> disableInfoList = disableInfoMapper.selectList(new LambdaQueryWrapper<ChDisableInfo>()
-                .eq(ChDisableInfo::getRealName, chDisableInfoChange.getRealName())
-                .eq(ChDisableInfo::getCertiCode, chDisableInfoChange.getCertifNum()));
-        ChDisableInfo chDisableInfo = null;
-        if (disableInfoList.size() != 0) {
-            chDisableInfo = disableInfoList.get(0);
-        }
-        //更改完
-        ChDisableInfoChange newDisableInfoChange = new ChDisableInfoChange();
-        BeanUtil.copyProperties(chDisableInfo, newDisableInfoChange);
-        //存到这个变更表
-        chDisableInfoChangeMapper.insert(newDisableInfoChange);
+        chDisableInfoChangeMapper.insert(chDisableInfoChange);
     }
 
     @Override
@@ -354,19 +342,19 @@ public class DisableServiceImpl implements DisableService {
             List<ChDisableInfo> disableInfoList = disableInfoMapper.selectList(new LambdaQueryWrapper<ChDisableInfo>()
                     .eq(ChDisableInfo::getRealName, chDisableInfoChange.getRealName())
                     .eq(ChDisableInfo::getCertiCode, chDisableInfoChange.getCertifNum()));
-            ChDisableInfo newDisableInfo = null;
             if (disableInfoList.size() != 0) {
                 ChDisableInfo chDisableInfo = disableInfoList.get(0);
-                newDisableInfo = new ChDisableInfo();
+                //新建disable_info_his表的一条数据
+                ChDisableInfoHis chDisableInfoHis = new ChDisableInfoHis();
+                BeanUtil.copyProperties(chDisableInfo, chDisableInfoHis);
+                disableInfoHisMapper.insert(chDisableInfoHis);
+                //更新info
+                ChDisableInfo newDisableInfo = new ChDisableInfo();
                 newDisableInfo.setDisabInfoId(chDisableInfo.getDisabInfoId());
                 BeanUtil.copyProperties(chDisableInfoChange, newDisableInfo);
                 newDisableInfo.setDataFrom(1);//数据来源设置为1-信息变更
                 disableInfoMapper.updateById(newDisableInfo);
             }
-            //新建disable_info_his表的一条数据
-            ChDisableInfoHis chDisableInfoHis = new ChDisableInfoHis();
-            BeanUtil.copyProperties(newDisableInfo, chDisableInfoHis);
-            disableInfoHisMapper.insert(chDisableInfoHis);
         }
     }
 

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

@@ -10,19 +10,22 @@
         change.DISTRICT_PROVINCE districtProvince,
         change.DISTRICT_CITY districtCity,
         change.DISTRICT_AREA districtArea,
-        (select ORGAN_NAME from CH_FND_ORGAN organ where change.APL_ORGAN_ID=organ.ORGAN_ID)aplOrganName,
+        srvOrgan.SRV_ORGAN_NAME srvOrganName,
         change.REAL_NAME realName,
         change.GENDER gender,
         change.BIRTHDAY birthday,
         change.CERTIF_NUM certifNum,
         change.TEL tel,
-        (select SRV_MODE_NAME from CH_FND_SRV_MODE cfdt where disinfo.SRV_MODE_ID=cfdt.SRV_MODE_ID)srvModeName,
-        (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disinfo.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
+        srvMode.SRV_MODE_NAME srvModeName,
+        disinfo.DISE_TYPE_S diseTypeS,
         change.EFF_TIME effTime,
         change.APPLY_STATUS applyStatus
         from CH_DISABLE_INFO_CHANGE change
-        left join CH_DISABLE_INFO disinfo on change.DISAB_INFO_ID=disinfo.DISAB_INFO_ID
         left join CH_FND_ORGAN organ on change.ORGAN_ID=organ.ORGAN_ID
+        left join CH_SRV_ORGAN srvOrgan on change.APL_ORGAN_ID=srvOrgan.SRV_ORGAN_ID
+        left join CH_DISABLE_INFO disinfo on change.DISAB_INFO_ID=disinfo.DISAB_INFO_ID
+        left join CH_FND_SRV_MODE srvMode on disinfo.SRV_MODE_ID=srvMode.SRV_MODE_ID
+
         <where>
             and task.APR_TYPE = 0
             <if test="organId != null">

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableInfoChangeVo.java

@@ -16,7 +16,6 @@ public class DisableInfoChangeVo {
      * 机构代码
      */
     private String organId;
-
     /**
      * 所在省份
      */
@@ -36,6 +35,11 @@ public class DisableInfoChangeVo {
      */
     private Integer aplOrganId;
     /**
+     * 提交机构
+     */
+    private String srvOrganName;
+
+    /**
      * 申请人姓名
      */
     private String realName;