Commit 13441935 authored by fangxinjiang's avatar fangxinjiang

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

parents 10d2782f d8c64055
......@@ -118,7 +118,7 @@ public class SocialSoldierExportVo implements Serializable {
@Schema(description = "离职日期")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("离职日期")
private Date leaveDate;
private String leaveDate;
//@ExcelAttribute(name = "派单项", maxLength = 50, needExport = true)
......
......@@ -558,7 +558,7 @@ public class TDispatchInfoController {
try {
if (Common.isNotNull(requestId)) {
//主动释放锁
return tDispatchInfoService.addApplyHandle(idList,typeSub,handleStatus,handleRemark,socialType,remark,user);
return tDispatchInfoService.addApplyHandle(idList,typeSub,handleStatus,handleRemark,socialType,remark,user, false);
} else {
return R.failed(ResultConstants.NO_GETLOCK_DATA);
}
......@@ -593,7 +593,7 @@ public class TDispatchInfoController {
try {
if (Common.isNotNull(requestId)) {
//主动释放锁
return tDispatchInfoService.importSocialHandler(file.getInputStream(),mId);
return tDispatchInfoService.importSocialHandler(file.getInputStream(),mId, false);
} else {
return R.failed(ResultConstants.NO_GETLOCK_DATA);
}
......@@ -754,7 +754,7 @@ public class TDispatchInfoController {
tDispatchInfo.setAuthSql(tDispatchInfo.getAuthSql().replace(CommonConstants.A_DEPT_ID, "a.SETTLE_DOMAIN"));
}
tDispatchInfo.setCreateBy(user.getId());
return tDispatchInfoService.fundImportHandle(file.getInputStream(),tDispatchInfo);
return tDispatchInfoService.fundImportHandle(file.getInputStream(),tDispatchInfo, false);
} else {
return R.failed(ResultConstants.NO_GETLOCK_DATA);
}
......
......@@ -53,7 +53,7 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
R<List<ErrorMessage>> importDiy(InputStream inputStream, String orderId);
R<List<ErrorMessage>> importSocialHandler(InputStream inputStream,String mId);
R<List<ErrorMessage>> importSocialHandler(InputStream inputStream,String mId, boolean isAutoHandle);
void listExport(HttpServletResponse response, TDispatchInfoSearchVo searchVo);
......@@ -81,7 +81,8 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
R<List<ErrorMessage>> addApplyAudit(List<String> ids, String auditStatus, String auditRemark, String remark);
R<List<ErrorMessage>> addApplyHandle(List<String> ids, String typeSub, String handleStatus, String handleRemark, String socialType, String remark, YifuUser user);
// isAutoFlag:是否社保士兵的自动办理,true :是
R<List<ErrorMessage>> addApplyHandle(List<String> ids, String typeSub, String handleStatus, String handleRemark, String socialType, String remark, YifuUser user, boolean isAutoHandle);
/**
* @Description: 社保士兵导出
......@@ -130,7 +131,7 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
**/
R<List<ErrorMessage>> dispatchAdd(TDispatchImportVo importVo);
R<List<ErrorMessage>> fundImportHandle(InputStream inputStream,TDispatchInfo tDispatchInfo);
R<List<ErrorMessage>> fundImportHandle(InputStream inputStream,TDispatchInfo tDispatchInfo, boolean isAutoFlag);
R<Boolean> updateExportSocialFlagById(String id,String status);
......
......@@ -54,4 +54,4 @@ spring:
#社保士兵相关属性配置
soldier:
authorizations : Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiJmODA2ZjRlYzYzZjY0NjVlOGFlZjRmZmVlOTYwMzcxNiIsInN1YiI6IjIiLCJ1c2VyX3Bob25lIjoiIiwidXNlcl90eXBlIjoiMTAiLCJ1c2VyX25hbWUiOiLmtYvor5UiLCJpc19hcHAiOiIxIiwiVXNlcklkIjoiMiIsIm5iZiI6MTcxMjg5Mjk1OCwiZXhwIjoxNzIzMjYwOTU4LCJpYXQiOjE3MTI4OTI5NTh9.oTmhLfv1tLq8aPOfO3LeqM1IDYT76YGXkqpz3dwBX4M
urlPre : http://172.16.24.66:55555
\ No newline at end of file
urlPre : http://36.7.147.29:55555
\ No newline at end of file
......@@ -1230,7 +1230,7 @@
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,
s.YGS_REMARK ygsRemark,s.YSD_REMARK ysdRemark,
a.DISPATCH_CODE dispatchCode,
a.APPLY_NO dispatchCode,
a.EMP_NAME empName,
a.EMP_IDCARD empIdcard,
emp_natrue.label empType,
......@@ -1241,7 +1241,7 @@
concat(if(ifnull(h.id,0) != '0',sp1.AREA_NAME,sp2.AREA_NAME),
ifnull(if(ifnull(h.id,0) != '0',sc1.AREA_NAME,sc2.AREA_NAME),''),
ifnull(if(ifnull(h.id,0) != '0',st1.AREA_NAME,st2.AREA_NAME),'')) socialProvince,
a.LEAVE_DATE leaveDate,
DATE_FORMAT(a.LEAVE_DATE,'%Y-%m-%d') leaveDate,
a.DISPATCH_ITEM dispatchItem,
a.CREATE_NAME createUserName,
a.ORGAN_NAME organName,
......@@ -1707,7 +1707,7 @@
AND a.STATUS = "2"
and (( a.type = '0' AND (s.HANDLE_STATUS = "0" or s.HANDLE_STATUS = "4") ) or ( a.type ='1' AND (if(ifnull(h.id,0) != '0',h.HANDLE_STATUS,s.HANDLE_STATUS) in ('1','5','6','3','7') or (s.HANDLE_STATUS in ('1','5','6','3','7') and s.REDUCE_CAN = '1')) ))
and a.SOCIAL_HANDLE_STATUS in ('0','4')
and (s.YGS_HANDLE_STATUS in ('0','5') or s.YSD_HANDLE_STATUS in ('0','5') )
and (a.auto_flag='1' or s.YGS_HANDLE_STATUS ='5' or s.YSD_HANDLE_STATUS = '5' )
<!--<if test="tDispatchInfo.status != null and tDispatchInfo.status.trim() != ''">
/*待办理组合判断*/
......
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