批量办理 100%

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/exception/ErrorCodes.java

@@ -476,4 +476,8 @@ public interface ErrorCodes {
 	 * 派减异常： 无对应项目编码的公积金信息
 	 */
 	String EMP_DISPATCH_REDUCE_FUND_DEPARTNO_ERROR = "emp.dispatch.reduce.fund.depart.no.error";
+	/**
+	 * 派增异常： 单派工伤其他起缴日期不可填写
+	 */
+	String EMP_DISPATCH_SOCIAL_DIY_INJURY_ERROR = "emp.dispatch.social.diy.injury.error";
 }

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -181,6 +181,8 @@ emp.dispatch.reduce.social.depart.no.error=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u65E0
 
 emp.dispatch.reduce.fund.depart.no.error=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u65E0\u5BF9\u5E94\u9879\u76EE\u7F16\u7801\u7684\u516C\u79EF\u91D1\u4FE1\u606F
 
+emp.dispatch.social.diy.injury.error=\u6D3E\u589E\u5F02\u5E38\uFF1A \u5355\u6D3E\u5DE5\u4F24\u5176\u4ED6\u8D77\u7F34\u65E5\u671F\u4E0D\u53EF\u586B\u5199
+
 
 
 

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TAuditInfo.java

@@ -73,6 +73,13 @@ public class TAuditInfo implements Serializable {
 	@Schema(description = "审核意见" )
 	@ExcelProperty("审核意见" )
 	private String auditRemark;
+	/**
+	 * 备注-说明
+	 */
+	@ExcelAttribute(name = "备注-说明",  maxLength = 200)
+	@Schema(description = "备注-说明" )
+	@ExcelProperty("备注-说明" )
+	private String remark;
 	/**
 	 * 审核人
 	 */

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleSearchVo.java

@@ -49,4 +49,6 @@ public class SocialHandleSearchVo extends TDispatchInfo {
 	 * 查询数据止
 	 **/
 	private int limitEnd;
+
+	private String idStr;
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java

@@ -306,9 +306,8 @@ public class TDispatchInfoController {
 	@SysLog("导出社保花名册信息")
 	//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportSocialRecordRoster')")
 	public void doexportSocialRecordRoster(HttpServletResponse response, HttpServletRequest request,
-										   @RequestParam(name = "idStr", required = false) String idStr,
-										   @RequestBody String[] exportFields, SocialHandleSearchVo searchVo) {
-		tDispatchInfoService.doexportSocialRecordRoster(response,searchVo,idStr,exportFields);
+										   @RequestBody  SocialHandleSearchVo searchVo) {
+		tDispatchInfoService.doexportSocialRecordRoster(response,searchVo,searchVo.getIdStr(),null);
 	}
 
 	/**
@@ -323,13 +322,12 @@ public class TDispatchInfoController {
 	@SysLog("导出公积金变更清册")
 	@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportFundRecordChange')")
 	public void doexportFundRecordChange(HttpServletResponse response, HttpServletRequest request,
-										 @RequestParam(name = "idStr", required = false) String idStr,
-										 @RequestBody String[] exportFields, SocialHandleSearchVo searchVo) {
+										 @RequestBody SocialHandleSearchVo searchVo) {
 		// 获取项目权限 TODO
 		List<String> settleDomains = null;
 		// 获取自定义sql TODO
 		String sql = CommonConstants.EMPTY_STRING;
-		tDispatchInfoService.doexportFundRecordChange(response, idStr,searchVo,settleDomains,sql);
+		tDispatchInfoService.doexportFundRecordChange(response, searchVo.getIdStr(),searchVo,settleDomains,sql);
 	}
 	/**
 	 * @Author fxj

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TDispatchInfoService.java

@@ -58,7 +58,7 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
 	R<List<ErrorMessage>> importReduceDiy(InputStream inputStream);
 
 	@GlobalTransactional
-	void batchReduceDispatch(List<TDispatchReduceVo> excelVOList, List<ErrorMessage> errorMessageList);
+	void batchReduceDispatch(List<TDispatchReduceVo> excelVOList, List<ErrorMessage> errorMessageList, YifuUser user);
 
 	R<Boolean> removeByIdDiy(String id);
 

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java

@@ -32,7 +32,6 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
-import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants;
 import com.yifu.cloud.plus.v1.yifu.social.entity.*;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.*;
@@ -399,7 +398,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			}
 			List<TDispatchReduceVo> dispatchImportList = new ArrayList<>();
 			dispatchImportList.add(dispatchReduceVo);
-			dispatchInfoService.batchReduceDispatch(dispatchImportList, errorMessageList);
+			dispatchInfoService.batchReduceDispatch(dispatchImportList, errorMessageList, user);
 			//  处理派减结果
 			errorMessage = handleDispatchAddRes(preInfo,errorMessageList);
 			if (null != errorMessage){
@@ -495,7 +494,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 				dispatchReduce(dispatchReduceVo, pre);
 				List<TDispatchReduceVo> dispatchImportList = new ArrayList<>();
 				dispatchImportList.add(dispatchReduceVo);
-				dispatchInfoService.batchReduceDispatch(dispatchImportList, errorMessageList);
+				dispatchInfoService.batchReduceDispatch(dispatchImportList, errorMessageList, user);
 
 				//处理派减结果
 				handleDispatchAddRes(pre, errorMessageList);

yifu-social/yifu-social-biz/src/main/resources/mapper/TAuditInfoMapper.xml

@@ -37,6 +37,7 @@
     <result property="color" column="COLOR"/>
     <result property="dispatchInfoId" column="DISPATCH_INFO_ID"/>
     <result property="type" column="TYPE"/>
+	  <result property="remark" column="REMARK"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -51,7 +52,7 @@
                 a.TITLE,
                 a.COLOR,
                 a.DISPATCH_INFO_ID,
-                a.TYPE
+                a.TYPE,a.REMARK
     </sql>
     <sql id="tAuditInfo_where">
         <if test="tAuditInfo != null">

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -691,6 +691,9 @@
 			</if>-->
 
 			<if test="tDispatchInfo != null">
+				<if test="tDispatchInfo.type != null and tDispatchInfo.type.trim() != ''">
+					AND a.TYPE = #{tDispatchInfo.type}
+				</if>
 				<if test="tDispatchInfo.socialProvince != null and tDispatchInfo.socialProvince!= null">
 					AND  b.social_province = #{tDispatchInfo.socialProvince}
 					<if test="tDispatchInfo.socialCity != null and tDispatchInfo.socialCity!= null">
@@ -792,6 +795,9 @@
 				<if test="tDispatchInfo.fundProvince != null and tDispatchInfo.fundProvince.trim() != ''">
 					AND a.FUND_PROVINCE = #{tDispatchInfo.fundProvince}
 				</if>
+				<if test="tDispatchInfo.type != null and tDispatchInfo.type.trim() != ''">
+					AND a.TYPE = #{tDispatchInfo.type}
+				</if>
 				<if test="tDispatchInfo.fundCity != null and tDispatchInfo.fundCity.trim() != ''">
 					AND a.FUND_CITY = #{tDispatchInfo.fundCity}
 				</if>