Commit 664d0eaa authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.6.4' into MVP1.6.4

parents 0f6e7876 9e54e0ca
...@@ -3434,8 +3434,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3434,8 +3434,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
||CommonConstants.ZERO_STRING.equals(socialInfo.getWorkInjuryHandle()) ||CommonConstants.ZERO_STRING.equals(socialInfo.getWorkInjuryHandle())
||CommonConstants.FIVE_STRING.equals(socialInfo.getWorkInjuryHandle()) ||CommonConstants.FIVE_STRING.equals(socialInfo.getWorkInjuryHandle())
||CommonConstants.ZERO_STRING.equals(socialInfo.getUnemployHandle()) ||CommonConstants.ZERO_STRING.equals(socialInfo.getUnemployHandle())
||CommonConstants.FIVE_STRING.equals(socialInfo.getUnemployHandle()) ||CommonConstants.FIVE_STRING.equals(socialInfo.getUnemployHandle()))
&& CommonConstants.ZERO_STRING.equals(autoFlag))){ && CommonConstants.ZERO_STRING.equals(autoFlag)) {
socialInfo.setYgsHandleStatus(CommonConstants.ONE_STRING); socialInfo.setYgsHandleStatus(CommonConstants.ONE_STRING);
} }
if ((CommonConstants.ZERO_STRING.equals(socialInfo.getMedicalHandle()) if ((CommonConstants.ZERO_STRING.equals(socialInfo.getMedicalHandle())
...@@ -3443,9 +3443,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3443,9 +3443,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
||CommonConstants.ZERO_STRING.equals(socialInfo.getBirthHandle()) ||CommonConstants.ZERO_STRING.equals(socialInfo.getBirthHandle())
||CommonConstants.FIVE_STRING.equals(socialInfo.getBirthHandle()) ||CommonConstants.FIVE_STRING.equals(socialInfo.getBirthHandle())
||CommonConstants.ZERO_STRING.equals(socialInfo.getBigailmentHandle()) ||CommonConstants.ZERO_STRING.equals(socialInfo.getBigailmentHandle())
||CommonConstants.FIVE_STRING.equals(socialInfo.getBigailmentHandle()) ||CommonConstants.FIVE_STRING.equals(socialInfo.getBigailmentHandle()))
&& CommonConstants.ZERO_STRING.equals(autoFlag))){ && CommonConstants.ZERO_STRING.equals(autoFlag)) {
socialInfo.setYgsHandleStatus(CommonConstants.ONE_STRING); socialInfo.setYsdHandleStatus(CommonConstants.ONE_STRING);
} }
} }
socialMapper.updateById(socialInfo); socialMapper.updateById(socialInfo);
......
...@@ -44,6 +44,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile; ...@@ -44,6 +44,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -102,7 +103,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -102,7 +103,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
public MultipartFile getFile(List<SocialSoldierYgsAddVo> list, int type) { public MultipartFile getFile(List<SocialSoldierYgsAddVo> list, int type) {
if (list != null) { if (list != null) {
String fileName = "socialSoldierFile" + DateUtil.getThisTime() + CommonConstants.XLSX; String fileName = "soldierFile" + DateUtil.getThisTime() + new Date().getTime() + CommonConstants.XLSX;
ExcelWriter excelWriter = EasyExcelFactory.write(fileName).build(); ExcelWriter excelWriter = EasyExcelFactory.write(fileName).build();
WriteSheet writeSheet = EasyExcelFactory.writerSheet("社保明细").head(SocialSoldierYgsAddVo.class).build(); WriteSheet writeSheet = EasyExcelFactory.writerSheet("社保明细").head(SocialSoldierYgsAddVo.class).build();
...@@ -166,7 +167,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -166,7 +167,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
} }
MultipartFile file = this.getFile(ygsAddlist, 1); MultipartFile file = this.getFile(ygsAddlist, 1);
if (Common.isNotNull(file)) { if (Common.isNotNull(file)) {
log.error("社保增员"); log.error("社保增员"+file.getOriginalFilename());
this.getOneAppGetModuleDetail(socialIdList, file, "社保增员"); this.getOneAppGetModuleDetail(socialIdList, file, "社保增员");
} }
} }
...@@ -182,7 +183,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -182,7 +183,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
} }
MultipartFile file = this.getFile(ygsReducelist, 2); MultipartFile file = this.getFile(ygsReducelist, 2);
if (Common.isNotNull(file)) { if (Common.isNotNull(file)) {
log.error("社保减员"); log.error("社保减员"+file.getOriginalFilename());
this.getOneAppGetModuleDetail(socialIdList, file, "社保减员"); this.getOneAppGetModuleDetail(socialIdList, file, "社保减员");
} }
} }
...@@ -198,7 +199,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -198,7 +199,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
} }
MultipartFile file = this.getFile(ysdAddlist, 3); MultipartFile file = this.getFile(ysdAddlist, 3);
if (Common.isNotNull(file)) { if (Common.isNotNull(file)) {
log.error("医保增员"); log.error("医保增员"+file.getOriginalFilename());
this.getOneAppGetModuleDetail(socialIdList, file, "医保增员"); this.getOneAppGetModuleDetail(socialIdList, file, "医保增员");
} }
} }
...@@ -214,7 +215,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap ...@@ -214,7 +215,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
} }
MultipartFile file = this.getFile(ysdReducelist, 4); MultipartFile file = this.getFile(ysdReducelist, 4);
if (Common.isNotNull(file)) { if (Common.isNotNull(file)) {
log.error("医保减员"); log.error("医保减员"+file.getOriginalFilename());
this.getOneAppGetModuleDetail(socialIdList, file, "医保减员"); this.getOneAppGetModuleDetail(socialIdList, file, "医保减员");
} }
} }
......
...@@ -29,7 +29,6 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo; ...@@ -29,7 +29,6 @@ import com.yifu.cloud.plus.v1.yifu.social.entity.TAuditInfo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo; import com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo;
import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialSoldierMapper; import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialSoldierMapper;
import com.yifu.cloud.plus.v1.yifu.social.service.*; import com.yifu.cloud.plus.v1.yifu.social.service.*;
import com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil;
import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialSoldierReturnErrorVo; import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialSoldierReturnErrorVo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
...@@ -397,8 +396,16 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -397,8 +396,16 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
ygsList.add(socialInfo.getDispatchId()); ygsList.add(socialInfo.getDispatchId());
handleRemark = "社保士兵自动办理成功!"; handleRemark = "社保士兵自动办理成功!";
remark = "社保士兵自动办理成功!!"; remark = "社保士兵自动办理成功!!";
if (Common.isNotNull(excel.getMsg())) {
failConfig = getConfig(excel.getMsg(),errorMap);
if (failConfig != null) {
updateSocial.setYgsRemark(failConfig.getSimpleReason());
}
updateSocial.setYgsRemarkOld(handleRemark);
} else {
updateSocial.setYgsRemark(handleRemark); updateSocial.setYgsRemark(handleRemark);
updateSocial.setYgsRemarkOld(handleRemark); updateSocial.setYgsRemarkOld(handleRemark);
}
} else { } else {
updateSocial.setYgsRemark(excel.getMsg()); updateSocial.setYgsRemark(excel.getMsg());
updateSocial.setYgsRemarkOld(excel.getMsg()); updateSocial.setYgsRemarkOld(excel.getMsg());
...@@ -477,8 +484,16 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -477,8 +484,16 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
ysdList.add(socialInfo.getDispatchId()); ysdList.add(socialInfo.getDispatchId());
handleRemark = "社保士兵自动办理成功!"; handleRemark = "社保士兵自动办理成功!";
remark = "社保士兵自动办理成功!!"; remark = "社保士兵自动办理成功!!";
if (Common.isNotNull(excel.getMsg())) {
failConfig = getConfig(excel.getMsg(),errorMap);
if (failConfig != null) {
updateSocial.setYsdRemark(failConfig.getSimpleReason());
}
updateSocial.setYsdRemarkOld(handleRemark);
} else {
updateSocial.setYsdRemark(handleRemark); updateSocial.setYsdRemark(handleRemark);
updateSocial.setYsdRemarkOld(handleRemark); updateSocial.setYsdRemarkOld(handleRemark);
}
} else { } else {
updateSocial.setYsdRemark(excel.getMsg()); updateSocial.setYsdRemark(excel.getMsg());
updateSocial.setYsdRemarkOld(excel.getMsg()); updateSocial.setYsdRemarkOld(excel.getMsg());
...@@ -582,11 +597,13 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper, ...@@ -582,11 +597,13 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
* @return: com.yifu.cloud.plus.v1.yifu.social.entity.FailReasonConfig * @return: com.yifu.cloud.plus.v1.yifu.social.entity.FailReasonConfig
**/ **/
private FailReasonConfig getConfig(String msg, Map<String, FailReasonConfig> errorMap) { private FailReasonConfig getConfig(String msg, Map<String, FailReasonConfig> errorMap) {
if (errorMap != null) {
for (Map.Entry<String, FailReasonConfig> config : errorMap.entrySet()) { for (Map.Entry<String, FailReasonConfig> config : errorMap.entrySet()) {
if (msg.contains(config.getKey())) { if (msg.contains(config.getKey())) {
return config.getValue(); return config.getValue();
} }
} }
}
return null; return null;
} }
......
...@@ -1226,11 +1226,11 @@ ...@@ -1226,11 +1226,11 @@
<select id="getSocialSoldierList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierExportVo"> <select id="getSocialSoldierList" resultType="com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierExportVo">
SELECT SELECT
if(a.TYPE='0','派增','派减') TYPE, if(a.TYPE='0','派增','派减') TYPE,
case a.SOCIAL_HANDLE_STATUS when '0' then '未办理' when '1' then '全部办理成功' when '2' then '全部办理失败' when '3' then '部分办理成功' when '4' then '办理中' else '-' end socialHandleStatus, case SUBSTRING_INDEX(GROUP_CONCAT(a.SOCIAL_HANDLE_STATUS ORDER BY a.CREATE_TIME desc),',',1) when '0' then '未办理' when '1' then '全部办理成功' when '2' then '全部办理失败' when '3' then '部分办理成功' when '4' then '办理中' else '-' end socialHandleStatus,
case s.ygs_Handle_Status when '0' then '无' when '1' then '待办理' when '2' then '自动办理中' when '3' then '继续办理' when '4' then '中止办理' when '5' then '人工处理' when '6' then '成功' else '-' end ygsHandleStatus, case s.ygs_Handle_Status when '0' then '无' when '1' then '待办理' when '2' then '自动办理中' when '3' then '继续办理' when '4' then '中止办理' when '5' then '人工处理' when '6' then '成功' else '-' end ygsHandleStatus,
case s.ysd_Handle_Status when '0' then '无' when '1' then '待办理' when '2' then '自动办理中' when '3' then '继续办理' when '4' then '中止办理' when '5' then '人工处理' when '6' then '成功' else '-' end ysdHandleStatus, case s.ysd_Handle_Status when '0' then '无' when '1' then '待办理' when '2' then '自动办理中' when '3' then '继续办理' when '4' then '中止办理' when '5' then '人工处理' when '6' then '成功' else '-' end ysdHandleStatus,
s.YGS_REMARK ygsRemark,s.YSD_REMARK ysdRemark, s.YGS_REMARK ygsRemark,s.YSD_REMARK ysdRemark,
a.APPLY_NO dispatchCode, SUBSTRING_INDEX(GROUP_CONCAT(a.APPLY_NO ORDER BY a.CREATE_TIME desc),',',1) dispatchCode,
a.EMP_NAME empName, a.EMP_NAME empName,
a.EMP_IDCARD empIdcard, a.EMP_IDCARD empIdcard,
emp_natrue.label empType, emp_natrue.label empType,
...@@ -1259,6 +1259,7 @@ ...@@ -1259,6 +1259,7 @@
left join sys_area st2 on st2.id = s.SOCIAL_TOWN left join sys_area st2 on st2.id = s.SOCIAL_TOWN
left join view_sys_dict_item emp_natrue on emp_natrue.value=a.EMP_TYPE and emp_natrue.type='emp_natrue' left join view_sys_dict_item emp_natrue on emp_natrue.value=a.EMP_TYPE and emp_natrue.type='emp_natrue'
<include refid="where_getSocialSoldier"/> <include refid="where_getSocialSoldier"/>
group by s.id
order by a.AUDIT_TIME desc order by a.AUDIT_TIME desc
</select> </select>
...@@ -1288,10 +1289,15 @@ ...@@ -1288,10 +1289,15 @@
<select id="getSocialSoldierCount" resultType="java.lang.Integer"> <select id="getSocialSoldierCount" resultType="java.lang.Integer">
SELECT SELECT
count(1) count(1)
from (
SELECT
1
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
<include refid="where_getSocialSoldier"/> <include refid="where_getSocialSoldier"/>
group by s.id
) a
</select> </select>
<resultMap id="socialSoldierPageMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TSocialSoldierPageVo" extends="tDispatchInfoMap"> <resultMap id="socialSoldierPageMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TSocialSoldierPageVo" extends="tDispatchInfoMap">
...@@ -1307,13 +1313,91 @@ ...@@ -1307,13 +1313,91 @@
<!-- hgw 2024-5-10 10:42:33 社保士兵列表查询 --> <!-- hgw 2024-5-10 10:42:33 社保士兵列表查询 -->
<select id="getTSocialSoldierHandlePage" resultMap="socialSoldierPageMap"> <select id="getTSocialSoldierHandlePage" resultMap="socialSoldierPageMap">
SELECT SELECT
<include refid="Base_Column_List"/> a.ID,
a.EMP_ID,
a.EMP_NAME,
a.EMP_NO,
a.EMP_IDCARD,
a.EMP_TYPE,
a.EMP_MOBILE,
a.EMP_NATIONAL,
a.STATUS,
a.TYPE,
a.SOCIAL_ID,
a.FUND_ID,
a.TYPE_SUB,
a.PROCESS_INST_ID,
a.SETTLE_DOMAIN,
a.DELETE_FLAG,
a.SOCIAL_REDUCE_DATE,
a.FUND_REDUCE_DATE,
a.LEAVE_DATE,
a.REDUCE_REASON,
a.REDUCE_REMARK,
a.BELONG_UNIT,
a.CURRENT_OPERATOR,
a.DISPATCH_ID_BAK,
a.CONTRACT_START,
a.CONTRACT_END,
a.CONTRACT_TERM,
a.EMP_REGIS_TYPE,
a.ENJOIN_DATE,
a.FILE_ADDR,
a.POST,
a.TRUST_REMARK,
a.FILE_PROVINCE,
a.FILE_CITY,
a.FILE_TOWN,
a.CONTRACT_TYPE,
SUBSTRING_INDEX(GROUP_CONCAT(a.SOCIAL_HANDLE_STATUS ORDER BY a.CREATE_TIME desc),',',1) SOCIAL_HANDLE_STATUS,
a.FUND_HANDLE_STATUS,
a.HANDLE_REMARK,
a.AUDIT_REMARK,
a.FUND_HANDLE_REMARK,
a.SOCIAL_HANDLE_REMARK,
a.SOCIAL_PROVINCE,
a.SOCIAL_CITY,
a.SOCIAL_TOWN,
a.FUND_PROVINCE,
a.FUND_CITY,
a.FUND_TOWN,
a.AUDIT_USER,
a.AUDIT_USER_NAME,
a.AUDIT_TIME,
a.WORKING_HOURS,
a.CREATE_BY,
a.UPDATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_TIME,
a.ORGAN_NAME,
a.DISPATCH_ITEM,
a.SETTLE_DOMAIN_NAME,
a.BELONG_UNIT_NAME,
a.DISPATCH_CODE,
a.AGAIN_DISPATCH_CODE,
a.SETTLE_DOMAIN_CODE,
a.CONTRACT_SUB_NAME,
a.CONTRACT_ID,
a.EDUCATION_NAME,
a.TRY_PERIOD,
a.ID_CARD_PROVINCE,
a.ID_CARD_CITY,
a.ID_CARD_TOWN,
a.ID_CARD_ADDRESS,
SUBSTRING_INDEX(GROUP_CONCAT(a.APPLY_NO ORDER BY a.CREATE_TIME desc),',',1) APPLY_NO,
a.ORDER_ID,
a.SCHOOL_NAME,
a.MAJOR,
a.FIRST_PAY_TIME,
a.GRADUATION_TIME,a.AUTO_FLAG
,a.SOCIAL_HOUSEHOLD_NAME,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS ,a.SOCIAL_HOUSEHOLD_NAME,s.YGS_HANDLE_STATUS,s.YSD_HANDLE_STATUS
,s.YGS_REMARK,s.YSD_REMARK,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD ,s.YGS_REMARK,s.YSD_REMARK,s.YGS_REMARK_OLD,s.YSD_REMARK_OLD
FROM t_dispatch_info a FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
<include refid="where_getSocialSoldier"/> <include refid="where_getSocialSoldier"/>
group by s.id
order by a.AUDIT_TIME desc order by a.AUDIT_TIME desc
</select> </select>
......
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = '0' if(ifnull(h.id,0) != '0',h.UNEMPLOY_HANDLE,s.UNEMPLOY_HANDLE) = '0'
) )
and (sd.id is null or NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE) and (sd.id is null or NOW() <![CDATA[ <= ]]> sd.SOCIAL_END_DATE)
group by a.id group by s.id
</select> </select>
<sql id="where_getSocialSoldier_base_handler"> <sql id="where_getSocialSoldier_base_handler">
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = '0' if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = '0'
) )
and (sd.id is null or NOW() <![CDATA[ <= ]]> sd.MEDICAL_END_DATE) and (sd.id is null or NOW() <![CDATA[ <= ]]> sd.MEDICAL_END_DATE)
group by a.id group by s.id
</select> </select>
<!-- 社保士兵医生大减少模板--> <!-- 社保士兵医生大减少模板-->
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = '5' if(ifnull(h.id,0) != '0',h.BIGAILMENT_HANDLE,s.BIGAILMENT_HANDLE) = '5'
) )
and (sd.id is null or NOW() <![CDATA[ <= ]]> sd.MEDICAL_END_DATE) and (sd.id is null or NOW() <![CDATA[ <= ]]> sd.MEDICAL_END_DATE)
group by a.id group by s.id
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment