Merge remote-tracking branch 'origin/develop' into develop

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java

@@ -91,7 +91,15 @@ public interface CommonConstants {
 	 */
 	Integer SUCCESS = 200;
 
+	/**
+	 * 商险导出最大值
+	 */
+	Integer EXPORT_TWENTY_THOUSAND = 20000;
 
+	/**
+	 * 商险导入最大值
+	 */
+	Integer IMPORT_TWENTY_THOUSAND = 20000;
 
 	/**
 	 * 失败标记

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -1066,6 +1066,17 @@ public class InsurancesConstants {
 	public static final String SYSTEM_TRIGGER = "系统触发";
 
 
+	/**
+	 * 一次性导出不可超过20000条，请分批导出
+	 */
+	public static final String EXPORT_TOO_LONG = "一次性导出不可超过20000条，请分批导出";
+
+	/**
+	 * 一次性导入不可超过20000条，请分批导入
+	 */
+	public static final String IMPORT_TOO_LONG = "一次性导入不可超过20000条，请分批导入";
+
+
 
 
 

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceEkp.java

@@ -38,7 +38,7 @@ public class TInsuranceEkp implements Serializable {
 	/**
 	 * 单据类型 (0、与薪资合并结算 1、单独结算)
 	 */
-	private Integer settleType;
+	private String settleType;
 
     /**
      * 项目编码
@@ -138,7 +138,7 @@ public class TInsuranceEkp implements Serializable {
     /**
      * 单据状态
      */
-    private Integer interactiveType;
+    private String interactiveType;
 
     /**
      * 重发标识

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

@@ -9,6 +9,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
+import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.Dept;
 import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService;
@@ -94,7 +95,7 @@ public class TInsuranceDetailController {
 	@PostMapping("/getInsuranceList")
 	@PreAuthorize("@pms.hasPermission('insurance_custserve_insure_export')")
 	public R<List<InsuranceListVO>> getInsuranceList(@RequestBody InsuranceListParam param) {
-		return R.ok(tInsuranceDetailService.getInsuranceList(param));
+		return tInsuranceDetailService.getInsuranceList(param);
 	}
 
 	/**
@@ -255,6 +256,9 @@ public class TInsuranceDetailController {
 		if (user == null || Common.isEmpty(user.getId())) {
 			return R.failed(CommonConstants.PLEASE_LOG_IN);
 		}
+		if(param.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
+			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
+		}
 		return tInsuranceDetailService.insuranceHandleImport(user,param);
 	}
 
@@ -355,8 +359,8 @@ public class TInsuranceDetailController {
 	@Operation(summary = "已投保列表不分页查询", description = "已投保列表不分页查询")
 	@PostMapping("/getInsuredList")
 	@PreAuthorize("@pms.hasPermission('insurance_custserve_insured_export')")
-	public R<List<InsuredListVo>> getInsuredList(@RequestBody InsuredParam param) {
-		return R.ok(tInsuranceDetailService.getInsuredList(param),"查询成功");
+	public R getInsuredList(@RequestBody InsuredParam param) {
+		return tInsuranceDetailService.getInsuredList(param);
 	}
 
 	/**
@@ -382,8 +386,8 @@ public class TInsuranceDetailController {
 	@Operation(summary = "已减员列表导出", description = "已减员列表导出")
 	@PostMapping("/getInsuranceRefundList")
 	@PreAuthorize("@pms.hasPermission('insurance_custserve_reduction_export')")
-	public R<List<InsuranceRefundListVo>> getInsuranceRefundList(@RequestBody InsuranceRefundParam param) {
-		return R.ok(tInsuranceDetailService.getInsuranceRefundList(param));
+	public R getInsuranceRefundList(@RequestBody InsuranceRefundParam param) {
+		return tInsuranceDetailService.getInsuranceRefundList(param);
 	}
 
 
@@ -410,7 +414,7 @@ public class TInsuranceDetailController {
 	@Operation(summary = "导出减员列表", description = "导出减员列表")
 	@PostMapping("/getInsuranceRefundHandlingList")
 	@PreAuthorize("@pms.hasPermission('handle_down_export')")
-	public R<List<RefundExportListVo>> getInsuranceRefundHandlingList(@RequestBody RefundExportListParam param) {
+	public R getInsuranceRefundHandlingList(@RequestBody RefundExportListParam param) {
 		return tInsuranceDetailService.getInsuranceRefundHandlingList(param);
 	}
 

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceDetailService.java

@@ -54,9 +54,9 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 *
 	 * @author licancan
 	 * @param param
-	 * @return {@link List<InsuranceListVO>}
+	 * @return {@link R<List<InsuranceListVO>>}
 	 */
-	List<InsuranceListVO> getInsuranceList(InsuranceListParam param);
+	R<List<InsuranceListVO>> getInsuranceList(InsuranceListParam param);
 
 	/**
 	 * 投保办理分页查询
@@ -206,7 +206,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @param param 查询参数
 	 * @return {@link List< InsuredListVo>}
 	 */
-	List<InsuredListVo> getInsuredList(InsuredParam param);
+	R getInsuredList(InsuredParam param);
 
 	/**
 	 * 已减员列表分页查询
@@ -225,7 +225,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @param param 查询参数
 	 * @return {@link List<  InsuranceRefundListVo >}
 	 */
-	List<InsuranceRefundListVo> getInsuranceRefundList(InsuranceRefundParam param);
+	R getInsuranceRefundList(InsuranceRefundParam param);
 
 	/**
 	 * 减员办理列表分页查询

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceEkpMapper.xml

@@ -32,6 +32,7 @@
             <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
             <result property="pushTime" column="PUSH_TIME" jdbcType="TIMESTAMP"/>
 			<result property="pushType" column="PUSH_TYPE" jdbcType="TINYINT"/>
+		<result property="settleType" column="SETTLE_TYPE" jdbcType="TINYINT"/>
 
     </resultMap>
 
@@ -44,7 +45,7 @@
         POLICY_END,BUY_STANDARD,MEDICAL_QUOTA,
         DIE_DISABLE_QUOTA,ACTUAL_PREMIUM,ESTIMATE_PREMIUM,
         SETTLE_MONTH,INTERACTIVE_TYPE,RESEND_FLAG,
-        CREATE_TIME,PUSH_TIME,PUSH_TYPE
+        CREATE_TIME,PUSH_TIME,PUSH_TYPE,SETTLE_TYPE
     </sql>
 
 	<select id="getEkpRefundList" resultMap="BaseResultMap">

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/constants/OrderConstants.java

@@ -110,4 +110,8 @@ public class OrderConstants {
 	 * 附件超出上传上限
 	 */
 	public static final String ENCLOSURE_SIZE_ERROR = "附件超出上传上限";
+	/**
+	 * 一次性导出不可超过20000条，请分批导出
+	 */
+	public static final String EXPORT_TOO_LONG = "一次性导出不可超过20000条，请分批导出";
 }

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/controller/OrderController.java

@@ -60,7 +60,7 @@ public class OrderController {
 	@GetMapping("/getOrderList")
 	@PreAuthorize("@pms.hasPermission('order:order_getOrderList')")
 	public R<List<OrderListVO>> getOrderList(OrderListParam param) {
-		return R.ok(tOrderService.getOrderList(param));
+		return tOrderService.getOrderList(param);
 	}
 
 	/**

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/TOrderService.java

@@ -34,9 +34,9 @@ public interface TOrderService extends IService<TOrder> {
 	 *
 	 * @author licancan
 	 * @param param
-	 * @return {@link List<OrderListVO>}
+	 * @return {@link R<List<OrderListVO>>}
 	 */
-	List<OrderListVO> getOrderList(OrderListParam param);
+	R<List<OrderListVO>> getOrderList(OrderListParam param);
 
 	/**
 	 * 变更订单状态

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/impl/TOrderServiceImpl.java

@@ -83,7 +83,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 	 * @author licancan
 	 */
 	@Override
-	public List<OrderListVO> getOrderList(OrderListParam param) {
+	public R<List<OrderListVO>> getOrderList(OrderListParam param) {
 		YifuUser user = SecurityUtils.getUser();
 		List<OrderListVO> list;
 		if (CollectionUtils.isNotEmpty(param.getIdList())){
@@ -91,7 +91,12 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 		}else {
 			list = baseMapper.getOrderList(param,user.getUsername());
 		}
-		return list;
+		if (CollectionUtils.isNotEmpty(list)){
+			if(list.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
+				return R.failed(OrderConstants.EXPORT_TOO_LONG);
+			}
+		}
+		return R.ok(list);
 	}
 
 	/**

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

 package com.yifu.cloud.plus.v1.yifu.social.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -124,6 +125,7 @@ public class IncomeExportVo implements Serializable {
 	/**
 	 * 数据生成时间
 	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
 	@NotBlank(message = "数据生成时间 不能为空")
 	@ExcelAttribute(name = "数据生成时间", isNotEmpty = true, errorInfo = "数据生成时间 不能为空", isDate = true)
 	@Schema(description = "数据生成时间")

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

@@ -1868,7 +1868,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				// 五险派单 如果前面兼职工伤没派减 不可派增
 				flag =  (BigDecimalUtils.safeAdd(sf.getUnitPersionMoney(),sf.getUnitBigailmentMoney(),
 						sf.getUnitBirthMoney(),sf.getUnitMedicalMoney(),sf.getUnitUnemploymentMoney(),
-						sf.getUnitInjuryMoney()).compareTo(BigDecimalUtils.isNullToZero(sf.getUnitInjuryMoney())) == 0)
+						sf.getUnitInjuryMoney()).compareTo(BigDecimalUtils.isNullToZero(sf.getUnitInjuryMoney())) == 0
+						&& BigDecimalUtils.isNullToZero(sf.getUnitInjuryMoney()).compareTo(BigDecimal.ZERO) != 0 )
 						&& !(CommonConstants.TEN_STRING.equals(sf.getSocialStatus())
 						||  CommonConstants.THREE_STRING.equals(sf.getWorkInjuryHandle())
 						||  CommonConstants.TWO_STRING.equals(sf.getWorkInjuryHandle()));

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

@@ -2223,6 +2223,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 					}
 				}
 			}
+			if (CommonConstants.ZERO_STRING.equals(settleDomain.getSocialType())) {
+				continue;
+			}
 			EkpPushSocialParam socialParam = new EkpPushSocialParam();
 			//员工姓名
 			socialParam.setFd_3adfe8c79989d4(library.getEmpName());
@@ -2451,6 +2454,9 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 					}
 				}
 			}
+			if (CommonConstants.ZERO_STRING.equals(settleDomain.getFundType())) {
+				continue;
+			}
 			EkpPushFundParam fundParam = new EkpPushFundParam();
 			//员工姓名
 			fundParam.setFd_3adfe8c79989d4(library.getEmpName());

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

@@ -2381,8 +2381,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			//订单类型
 			socialParam.setFd_3add9dd7833db8(SocialConstants.DIFF_TYPE_THR);
 			//是否有预估
-			if (Common.isNotNull(settleDomain.getMrSettleType()) &&
-					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
+			if (Common.isNotNull(settleDomain.getSocialType()) &&
+					CommonConstants.ONE_STRING.equals(settleDomain.getSocialType())) {
 				socialParam.setFd_3add9de0be85e4(CommonConstants.IS_TRUE);
 			} else {
 				socialParam.setFd_3add9de0be85e4(CommonConstants.IS_FALSE);
@@ -2598,8 +2598,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			//订单类型
 			fundParam.setFd_3add9dd7833db8(SocialConstants.DIFF_TYPE_THR);
 			//是否有预估
-			if (Common.isNotNull(settleDomain.getMrSettleType()) &&
-					CommonConstants.ONE_STRING.equals(settleDomain.getMrSettleType())) {
+			if (Common.isNotNull(settleDomain.getFundType()) &&
+					CommonConstants.ONE_STRING.equals(settleDomain.getFundType())) {
 				fundParam.setFd_3add9de0be85e4(CommonConstants.IS_TRUE);
 			} else {
 				fundParam.setFd_3add9de0be85e4(CommonConstants.IS_FALSE);