Merge branch 'develop' into feature-licancan

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TSettleDomain.java

@@ -397,4 +397,60 @@ public class TSettleDomain extends BaseEntity {
 	@Schema(description = "县")
 	@TableField(exist = false)
 	private String eTown;
+
+	/**
+	 * 管理费风险金的结算方式：1预估2实缴
+	 */
+	@ExcelAttribute(name = "管理费风险金的结算方式：1预估2实缴"  , maxLength = 1 )
+	@Length(max=1,message = "管理费风险金的结算方式：1预估2实缴不能超过1个字符")
+	@ExcelProperty("管理费风险金的结算方式：1预估2实缴")
+	private String mrSettleType;
+	/**
+	 * 管理费风险金的收取服务项目：1社保2公积金3商险4薪酬
+	 */
+	@ExcelAttribute(name = "管理费风险金的收取服务项目：1社保2公积金3商险4薪酬"  , maxLength = 4 )
+	@Length(max=4,message = "管理费风险金的收取服务项目：1社保2公积金3商险4薪酬不能超过4个字符")
+	@ExcelProperty("管理费风险金的收取服务项目：1社保2公积金3商险4薪酬")
+	private String mrServerItem;
+	/**
+	 * 管理费是否收费（0收费/1不收费）
+	 */
+	@ExcelAttribute(name = "管理费是否收费（0收费/1不收费）"  , maxLength = 1 )
+	@Length(max=1,message = "管理费是否收费（0收费/1不收费）不能超过1个字符")
+	@ExcelProperty("管理费是否收费（0收费/1不收费）")
+	private String managementTag;
+	/**
+	 * 管理费费率/管理费金额
+	 */
+	@ExcelAttribute(name = "管理费费率/管理费金额"  )
+	@ExcelProperty("管理费费率/管理费金额")
+	private BigDecimal managementFee;
+	/**
+	 * 管理费收费方式：1按比例2金额-人数3金额-人次
+	 */
+	@ExcelAttribute(name = "管理费收费方式：1按比例2金额-人数3金额-人次"  , maxLength = 32 )
+	@Length(max=32,message = "管理费收费方式：1按比例2金额-人数3金额-人次不能超过32个字符")
+	@ExcelProperty("管理费收费方式：1按比例2金额-人数3金额-人次")
+	private String managementType;
+	/**
+	 * 风险金是否收取
+	 */
+	@ExcelAttribute(name = "风险金是否收取"  , maxLength = 1 )
+	@Length(max=1,message = "风险金是否收取不能超过1个字符")
+	@ExcelProperty("风险金是否收取")
+	private String riskFundTag;
+	/**
+	 * 风险金收取费用/税率
+	 */
+	@ExcelAttribute(name = "风险金收取费用/税率"  )
+	@ExcelProperty("风险金收取费用/税率")
+	private BigDecimal riskFundFee;
+	/**
+	 * 风险金收费方式：1按比例2金额-人数3金额-人次
+	 */
+	@ExcelAttribute(name = "风险金收费方式：1按比例2金额-人数3金额-人次"  , maxLength = 32 )
+	@Length(max=32,message = "风险金收费方式：1按比例2金额-人数3金额-人次不能超过32个字符")
+	@ExcelProperty("风险金收费方式：1按比例2金额-人数3金额-人次")
+	private String riskFundType;
+
 }

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TSettleDomainMapper.xml

@@ -78,6 +78,14 @@
 		<result property="unitOfOurCompany" column="UNIT_OF_OUR_COMPANY"/>
 		<result property="customerNo" column="CUSTOMER_NO"/>
 		<result property="customerName" column="CUSTOMER_NAME"/>
+		<result property="mrSettleType" column="MR_SETTLE_TYPE"/>
+		<result property="mrServerItem" column="MR_SERVER_ITEM"/>
+		<result property="managementTag" column="MANAGEMENT_TAG"/>
+		<result property="managementFee" column="MANAGEMENT_FEE"/>
+		<result property="managementType" column="MANAGEMENT_TYPE"/>
+		<result property="riskFundTag" column="RISK_FUND_TAG"/>
+		<result property="riskFundFee" column="RISK_FUND_FEE"/>
+		<result property="riskFundType" column="RISK_FUND_TYPE"/>
 	</resultMap>
 
 	<sql id="Base_Column_List">
@@ -139,7 +147,15 @@
 		a.CUSTOMER_NAME,
 		a.UNIT_OF_OUR_COMPANY,
 		a.INVOICE_TITLE,
-		a.FUND_TYPE
+		a.FUND_TYPE,
+		a.MR_SETTLE_TYPE,
+		a.MR_SERVER_ITEM,
+		a.MANAGEMENT_TAG,
+		a.MANAGEMENT_FEE,
+		a.MANAGEMENT_TYPE,
+		a.RISK_FUND_TAG,
+		a.RISK_FUND_FEE,
+		a.RISK_FUND_TYPE
 	</sql>
 
 	<resultMap id="tSettleDomainSelectVoMap" type="com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo">

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/vo/RowIndex.java

 package com.yifu.cloud.plus.v1.yifu.common.core.vo;
 
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -12,5 +13,6 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 public class RowIndex {
+	@ExcelAttribute(name = "行号")
 	private Integer rowIndex;
 }

yifu-common/yifu-common-ekp/pom.xml

@@ -31,5 +31,11 @@
             <version>5.8.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.yifu.cloud.plus.v1</groupId>
+            <artifactId>yifu-insurances-api</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/config/EkpInsuranceProperties.java

+package com.yifu.cloud.plus.v1.yifu.ekp.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-31 08:57:02
+ */
+@Data
+@Component
+@PropertySource("classpath:ekpInsuranceConfig.properties")
+@ConfigurationProperties(value = "insurance",ignoreInvalidFields = false)
+public class EkpInsuranceProperties {
+
+	String insuranceUrl;
+
+	String insuranceFdModelId;
+
+	String insuranceFdFlowId;
+
+	String insuranceDocStatus;
+
+	String insuranceLoginName;
+
+	String insuranceFocSubject;
+}

yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/config/EkpSalaryProperties.java

@@ -29,4 +29,5 @@ public class EkpSalaryProperties {
 	String LoginName;
 
 	String docSubject;
+
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/EKPUtil.java → yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpInsuranceUtil.java

-package com.yifu.cloud.plus.v1.yifu.insurances.util;
+package com.yifu.cloud.plus.v1.yifu.ekp.util;
 
 import cn.hutool.json.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.EKPInteractiveParam;
+import com.yifu.cloud.plus.v1.yifu.ekp.config.EkpInsuranceProperties;
+import com.yifu.cloud.plus.v1.yifu.ekp.vo.EKPInsurancePushParam;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInteractiveParam;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.TInsuranceSettlePushParam;
-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.http.*;
-import org.springframework.stereotype.Component;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
+import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 
@@ -26,82 +27,36 @@ import java.time.format.DateTimeFormatter;
  * @date 2022-08-05 09:42:33
  */
 @Slf4j
-@Component
-public class EKPUtil {
-
-	@Getter
-	public static String url;
-
-	@Getter
-	public static String LoginName;
-
-	@Getter
-	private static String fdModelId;
-
-	@Getter
-	private static String fdFlowId;
-
-	@Getter
-	private static String docStatus;
-
-	@Getter
-	private static String docSubject;
-
-	@Value("${ekp.url}")
-	public void setUrl(String db) {
-		url = db;
-	}
-
-	@Value("${ekp.LoginName}")
-	public void setLoginName(String db) {
-		LoginName = db;
-	}
-
-	@Value("${ekp.fdModelId}")
-	public void setFdModelId(String db) {
-		fdModelId = db;
-	}
-
-	@Value("${ekp.fdFlowId}")
-	public void setFdFlowId(String db) {
-		fdFlowId = db;
-	}
-
-	@Value("${ekp.docStatus}")
-	public void setDocStatus(String db) {
-		docStatus = db;
-	}
-
-	@Value("${ekp.docSubject}")
-	public void setDocSubject(String db) {
-		docSubject = db;
-	}
+@EnableConfigurationProperties(EkpInsuranceProperties.class)
+public class EkpInsuranceUtil {
 
+	@Resource
+	private EkpInsuranceProperties ekpInsuranceProperties;
 
 	/**
 	 * 多层级的VO对象，且包含上传功能的样例
 	 * 注意key的书写格式,类似EL表达式的方式，属性关系用'.', 列表和数组关系用[]，Map关系用["xxx"]
 	 */
-	public static String sendToEKP(EKPInteractiveParam param){
+	public String sendToEkp(EkpInteractiveParam param){
 		log.info("推送EKP开始");
 		RestTemplate yourRestTemplate = new RestTemplate();
-		TInsuranceSettlePushParam pushParam = insuranceDetail2PushParam(param);
+		EKPInsurancePushParam pushParam = insuranceDetail2PushParam(param);
 		try{
 			String formValues = new ObjectMapper().writeValueAsString(pushParam);
 			log.info("formValues:"+formValues);
 			//指向EKP的接口url
 			//把ModelingAppModelParameterAddForm转换成MultiValueMap
 			JSONObject loginName = new JSONObject();
-			loginName.append("LoginName",LoginName);
+			loginName.append("LoginName",ekpInsuranceProperties.getInsuranceLoginName());
 			String loginData = new ObjectMapper().writeValueAsString(loginName);
 			MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
 			//wholeForm.add("docSubject", new String(docSubject.getBytes("UTF-8"),"ISO-8859-1") );
-			wholeForm.add("docSubject",docSubject);
+			wholeForm.add("docSubject",ekpInsuranceProperties.getInsuranceFocSubject());
 			wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}");
 			//wholeForm.add("docCreator", loginData);
-			wholeForm.add("docStatus", docStatus);
-			wholeForm.add("fdModelId", fdModelId);
-			wholeForm.add("fdFlowId", fdFlowId);
+			wholeForm.add("docStatus", ekpInsuranceProperties.getInsuranceDocStatus());
+			wholeForm.add("fdModelId", ekpInsuranceProperties.getInsuranceFdModelId());
+			wholeForm.add("fdFlowId", ekpInsuranceProperties.getInsuranceFdFlowId());
 			//wholeForm.add("formValues", new String(formValues.getBytes("UTF-8"),"ISO-8859-1"));
 			wholeForm.add("formValues", formValues);
 			//wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".getBytes("UTF-8"),"ISO-8859-1") );
@@ -113,17 +68,18 @@ public class EKPUtil {
 			//必须设置上传类型，如果入参是字符串，使用MediaType.TEXT_PLAIN；如果
 			HttpEntity<MultiValueMap<String,Object>> entity = new HttpEntity<MultiValueMap<String,Object>>(wholeForm,headers);
 			//有返回值的情况 VO可以替换成具体的JavaBean
-			ResponseEntity<String> obj = yourRestTemplate.exchange(url, HttpMethod.POST, entity, String.class);
+			ResponseEntity<String> obj = yourRestTemplate.exchange(ekpInsuranceProperties.getInsuranceUrl(), HttpMethod.POST, entity, String.class);
+			log.info("obj:"+obj);
 			String body = obj.getBody();
 			if (StringUtils.isBlank(body)){
-				log.error("交易失败");
+				log.error("交易失败"+body);
 				return null;
 			}else{
 				log.info("交易成功："+body);
 				return body;
 			}
 		}catch (Exception e){
-			log.info(e.getMessage());
+			log.error("交易失败:", e);
 			return null;
 		}
 	}
@@ -135,9 +91,9 @@ public class EKPUtil {
 	 * @param param 转换类
 	 * @return {@link TInsuranceSettlePushParam}
 	 */
-	public static TInsuranceSettlePushParam insuranceDetail2PushParam(EKPInteractiveParam param){
+	public static EKPInsurancePushParam insuranceDetail2PushParam(EkpInteractiveParam param){
 			String format = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-			TInsuranceSettlePushParam pushParam = new TInsuranceSettlePushParam();
+			EKPInsurancePushParam pushParam = new EKPInsurancePushParam();
 			param.setHappenDate(format);
 			//ekpId
 			if(null != param.getDetailId() && null != param.getDefaultSettleId()){
@@ -149,7 +105,7 @@ public class EKPUtil {
 			if(null != param.getSettleType()){
 				pushParam.setFd_3adfe6af71a1cc(param.getSettleType());
 			}else{
-				pushParam.setFd_3adfe6af71a1cc(CommonConstants.ZERO_INT);
+				pushParam.setFd_3adfe6af71a1cc(CommonConstants.EMPTY_STRING);
 			}
 			//项目编码
 			pushParam.setFd_3adfe658c6229e(param.getDeptNo());
@@ -273,9 +229,15 @@ public class EKPUtil {
 			if(null != param.getInteractiveType()){
 				pushParam.setFd_3af9197b31071c(param.getInteractiveType());
 			}else{
-				pushParam.setFd_3af9197b31071c(CommonConstants.ZERO_INT);
+				pushParam.setFd_3af9197b31071c(CommonConstants.EMPTY_STRING);
 			}
 
+			//有无预估
+			if(null != param.getEstimateStatus()){
+				pushParam.setFd_3b0a5937928c8c(param.getEstimateStatus());
+			}else{
+				pushParam.setFd_3b0a5937928c8c(CommonConstants.EMPTY_STRING);
+			}
 		return pushParam;
 	}
 	}

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/constant/EkpConstants.java

@@ -16,4 +16,14 @@ public interface EkpConstants {
 	 * 推送失败
 	 */
 	String SEND_FAILED = "推送失败";
+
+	/**
+	 * 有
+	 */
+	String HAVE = "有";
+
+	/**
+	 * 无
+	 */
+	String NOTHING = "无";
 }

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EKPInsurancePushParam.java

+package com.yifu.cloud.plus.v1.yifu.ekp.vo;
+
+import lombok.Data;
+
+/**
+ * @author zhaji
+ * @description 结算信息推送类
+ * @date 2022-08-05 10:32:16
+ */
+@Data
+public class EKPInsurancePushParam {
+
+	/**
+	 * 单据类型 200 单选（1,预估单，2,实缴单，3,差异单）
+	 */
+	private String	fd_3adfe6af71a1cc;
+
+	/**
+	 * 交易类型 交易类型 1新增结算单,2作废结算信息,3更新保单信息
+	 */
+	private String	fd_3af9197b31071c;
+
+	/**
+	 * 项目编码 200
+	 */
+	private String	fd_3adfe658c6229e;
+
+	/**
+	 * 项目名称 200
+	 */
+	private String	fd_3adfe6592b4158;
+
+	/**
+	 * 客户编码 200
+	 */
+	private String	fd_3adfe6598281e8;
+
+	/**
+	 * 客户名称 200
+	 */
+	private String	fd_3adfe7a2688902;
+
+	/**
+	 * 发生日期 	"xxxx--xx--xx"
+	 */
+	private String fd_3adfe67c24dace;
+
+	/**
+	 * 姓名 200
+	 */
+	private String	fd_3adfe65d759650;
+
+	/**
+	 * 身份证号 200
+	 */
+	private String	fd_3adfe65dbd9f68;
+
+	/**
+	 * 发票号 200
+	 */
+	private String	fd_3adfe65e0cd094;
+
+	/**
+	 * 险种
+	 */
+	private String	fd_3adfe65f6599e4;
+
+	/**
+	 * 保险公司
+	 */
+	private String	fd_3adfe65ea04728;
+
+	/**
+	 * 保单号
+	 */
+	private String	fd_3adfe65e60e110;
+
+	/**
+	 * 保险开始日期 "xxxx--xx--xx"
+	 */
+	private String fd_3adfe6b7e0ede8;
+
+	/**
+	 * 保险结束日期 "xxxx--xx--xx"
+	 */
+	private String fd_3adfe6b847bfe6;
+
+	/**
+	 * 购买标准
+	 */
+	private String	fd_3adfe6d55384c6;
+
+	/**
+	 * 实际保费
+	 */
+	private String fd_3adfe6610c0d2c;
+
+	/**
+	 * 医保 精确到小数点后两位
+	 */
+	private String	fd_3adfe66041a996;
+
+	/**
+	 * 事故或残疾 200
+	 */
+	private String	fd_3adfe6609aa810;
+
+	/**
+	 * 预估保费（应收） 精确到小数点后两位
+	 */
+	private String	fd_3adfe6e30f2a3c;
+
+	/**
+	 * 结算月份 200
+	 */
+	private String	fd_3aea2f0180eccc;
+
+	/**
+	 * 商险ID（商险id_结算id）
+	 */
+	private String	fd_3afa8a70006bea;
+
+	/**
+	 * 有无预估（有，无）
+	 */
+	private String	fd_3b0a5937928c8c;
+
+
+
+
+}

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushFundParam.java

@@ -136,5 +136,9 @@ public class EkpPushFundParam implements Serializable {
 	 * 我司到款单位
 	 **/
 	private String fd_3b019a2e9bfdd6;
+	/**
+	 * 公积金id
+	 **/
+	private String fd_3b0afbaf10df2c;
 
 }
\ No newline at end of file

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushSocialParam.java

@@ -240,5 +240,9 @@ public class EkpPushSocialParam implements Serializable {
 	 * 我司到款单位
 	 **/
 	private String fd_3b01953871b8be;
+	/**
+	 * 社保id
+	 **/
+	private String fd_3b0afbe1f94a08;
 
 }
\ No newline at end of file

yifu-common/yifu-common-ekp/src/main/resources/META-INF/spring.factories

 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+    com.yifu.cloud.plus.v1.yifu.ekp.util.EkpInsuranceUtil,\
     com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil,\
     com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil,\
     com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil
\ No newline at end of file

yifu-common/yifu-common-ekp/src/main/resources/ekpInsuranceConfig.properties

+insurance.insuranceUrl=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
+insurance.insuranceFdModelId=181d73279372e5a55438a47d7436ab7e
+insurance.insuranceFdFlowId=18267f206233f29cbd3c5ee425c9408a
+insurance.insuranceDocStatus=20
+insurance.insuranceLoginName=admin
+insurance.insuranceFocSubject=\u85AA\u8D44\u8BA2\u5355\u660E\u7EC6\u6570\u636E\u63A5\u53E3
+
+

yifu-common/yifu-common-ekp/src/main/resources/ekpSalaryConfig.properties

@@ -4,3 +4,5 @@ ekp.fdFlowId=182b40249c1bc940d7226b941c7a4183
 ekp.docStatus=20
 ekp.LoginName=admin
 ekp.docSubject=\u85AA\u8D44\u8BA2\u5355\u660E\u7EC6\u6570\u636E\u63A5\u53E3
+
+

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

@@ -1025,6 +1025,31 @@ public class InsurancesConstants {
 	public static final String BUY_TYPE_ERROR = "购买类型错误";
 
 
+	/**
+	 * 预估单
+	 */
+	public static final String ESTIMATE_SETTLE_BILL = "预估单";
+
+	/**
+	 * 实缴单
+	 */
+	public static final String ACTUAL_SETTLE_BILL = "实缴单";
+
+	/**
+	 * 新增结算单
+	 */
+	public static final String NEW_SETTLE_BILL = "新增结算单";
+
+	/**
+	 * 结算中
+	 */
+	public static final String UPDATE_SETTLE_BILL = "更新结算单信息";
+
+	/**
+	 * 结算中
+	 */
+	public static final String ABOLISH_SETTLE_BILL = "作废结算单信息";
+
 
 
 }

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

 package com.yifu.cloud.plus.v1.yifu.insurances.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
@@ -20,6 +22,7 @@ public class TInsuranceEkp implements Serializable {
     /**
      * 主键id
      */
+	@TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**

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

@@ -74,6 +74,12 @@ public class TInsuranceRefund extends BaseEntity {
 	@Schema(description = "创建人所在部门名称")
 	private String createUserDeptName;
 
+	/**
+	 * 派单类型
+	 */
+	@Schema(description = " 购买类型， 1新增、3批增、4替换，5减员")
+	private Integer buyType;
+
 
 	private static final long serialVersionUID = 1L;
 

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EKPInteractiveParam.java → yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/EkpInteractiveParam.java

@@ -15,7 +15,7 @@ import java.time.LocalDate;
  * @date 2022-08-09 11:09:12
  */
 @Data
-public class EKPInteractiveParam implements Serializable {
+public class EkpInteractiveParam implements Serializable {
 
 	private static final long serialVersionUID = -2689686777914935788L;
 
@@ -43,7 +43,7 @@ public class EKPInteractiveParam implements Serializable {
 	 * 单据类型 (0、与薪资合并结算 1、单独结算)
 	 */
 	@Schema(description = "单据类型 (1、预估单 2、实缴单)")
-	private Integer settleType;
+	private String settleType;
 
 	/**
 	 * 项目编码
@@ -163,7 +163,7 @@ public class EKPInteractiveParam implements Serializable {
 	 * 	单据状态
 	 */
 	@Schema(description = "状态:1新增结算单,2更新结算单信息,3作废结算单信息")
-	private Integer interactiveType;
+	private String interactiveType;
 
 	/**
 	 * 	EKP推送类型
@@ -171,4 +171,9 @@ public class EKPInteractiveParam implements Serializable {
 	@Schema(description = "1推送预估费用,2推送实缴费用,3变更结算月,4推送作废信息,5推送红冲信息,6投保退回红冲，7变更保单保费")
 	private Integer pushType;
 
+	/**
+	 * 	有无预估
+	 */
+	@Schema(description = "状态:有，无")
+	private String estimateStatus;
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/TInsuranceSettlePushParam.java

@@ -23,6 +23,12 @@ public class TInsuranceSettlePushParam{
 	@Schema(description = "单据类型")
 	private Integer	fd_3adfe6af71a1cc;
 
+	/**
+	 * 交易类型 200
+	 */
+	@Schema(description = "交易类型 1新增结算单,2作废结算信息,3更新保单信息")
+	private Integer	fd_3af9197b31071c;
+
 	/**
 	 * 项目编码 200
 	 */
@@ -134,19 +140,12 @@ public class TInsuranceSettlePushParam{
 	@Schema(description = "预估保费")
 	private String	fd_3adfe6e30f2a3c;
 
-
 	/**
 	 * 结算月份 200
 	 */
 	@Schema(description = "结算月份")
 	private String	fd_3aea2f0180eccc;
 
-	/**
-	 * 交易类型 200
-	 */
-	@Schema(description = "交易类型 1新增结算单,2作废结算信息,3更新保单信息")
-	private Integer	fd_3af9197b31071c;
-
 	/**
 	 * 商险ID 200
 	 */

yifu-insurances/yifu-insurances-biz/pom.xml

@@ -65,6 +65,12 @@
 			<artifactId>commons-collections</artifactId>
 			<version>3.2.2</version>
 		</dependency>
+        <dependency>
+            <groupId>com.yifu.cloud.plus.v1</groupId>
+            <artifactId>yifu-common-ekp</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 	<build>

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java

@@ -216,16 +216,6 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 */
 	TInsuranceDetail selectByRegionSql(@Param("regionSql") String regionSql, @Param("id") String id);
 
-	/**
-	 * 商险订单投保列表查询
-	 *
-	 * @author zhaji
-	 * @param page
-	 * @param param
-	 * @return {@link IPage< InsuredOrderListVo>}
-	 */
-	IPage<InsuredOrderListVo> getOrderInsuredListPage(Page<InsuredOrderListVo> page,@Param("param")  InsuredOrderParam param);
-
 	/**
 	 * 商险订单减员列表查询
 	 *
@@ -234,7 +224,7 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 * @param param
 	 * @return {@link IPage< InsuredOrderListVo>}
 	 */
-	IPage<InsuredOrderListVo> getOrderRefundInsuredListPage(Page<InsuredOrderListVo> page,@Param("param")  InsuredOrderParam param);
+	IPage<InsuredOrderListVo> getOrderInsuredListPage(Page<InsuredOrderListVo> page, @Param("param")  InsuredOrderParam param);
 
 
 }

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

@@ -20,6 +20,8 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.RedisUtil;
 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.security.util.SecurityUtils;
+import com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants;
+import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpInsuranceUtil;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.*;
 import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceDetailMapper;
@@ -80,6 +82,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	private TInsuranceRefundService tInsuranceRefundService;
 	@Resource
 	private TInsuranceEkpService tInsuranceEkpService;
+	@Resource
+	private EkpInsuranceUtil eKPInsuranceUtil;
+
 	@Resource
 	private EkpSettleService ekpSettleService;
 
@@ -2908,6 +2913,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				TInsuranceRefund insuranceRefund = new TInsuranceRefund();
 				TInsuranceOperate insuranceOperate = new TInsuranceOperate();
 				insuranceRefund.setInsDetailId(refund.getId());
+				insuranceRefund.setBuyType(CommonConstants.FIVE_INT);
 				insuranceRefund.setReduceHandleStatus(CommonConstants.ONE_INT);
 				insuranceRefund.setCreateBy(user.getId());
 				insuranceRefund.setCreateName(user.getNickname());
@@ -3386,9 +3392,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			//先更新本地状态再集中推送至EKP
 			//当前保单结算信息不为空且已推送的情况下，推送EKP进行变更
 			threadPool.execute(()->{
-				List<EKPInteractiveParam> deptDetail = getDeptDetail(ekpList);
-				for (EKPInteractiveParam ekpInteractiveParam : deptDetail) {
-					String body = EKPUtil.sendToEKP(ekpInteractiveParam);
+				List<EkpInteractiveParam> deptDetail = getDeptDetail(ekpList);
+				for (EkpInteractiveParam ekpInteractiveParam : deptDetail) {
+					String body = eKPInsuranceUtil.sendToEkp(ekpInteractiveParam);
 					if (!StringUtils.isBlank(body)){
 						TInsuranceOperate insuranceOperate = new TInsuranceOperate();
 						insuranceOperate.setInsuranceDetailId(ekpInteractiveParam.getDetailId());
@@ -3443,7 +3449,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				//预估保费
 				BigDecimal estimatePremium = success.getEstimatePremium();
 				//EKP推送类
-				EKPInteractiveParam interactiveParam = new EKPInteractiveParam();
+				EkpInteractiveParam interactiveParam = new EkpInteractiveParam();
 				TInsuranceDetail one = getOne(lambdaQuery().getWrapper().eq(TInsuranceDetail::getId, success.getId()));
 				BeanCopyUtils.copyProperties(one,interactiveParam);
 				LambdaUpdateWrapper<TInsuranceDetail> updateWrapper = new LambdaUpdateWrapper<>();
@@ -3500,8 +3506,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							interactiveParam.setCustomerName(success.getOldCustomerName());
 							interactiveParam.setDeptNo(success.getOldDeptNo());
 							interactiveParam.setDeptName(success.getOldDeptName());
-							interactiveParam.setInteractiveType(CommonConstants.THREE_INT);
-							String deleteBody = EKPUtil.sendToEKP(interactiveParam);
+							interactiveParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL);
+							String deleteBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 							if (StringUtils.isNotBlank(deleteBody)) {
 								//推送成功更新作废推送状态
 								cancel.setIsCancelPush(CommonConstants.ONE_INT);
@@ -3509,14 +3515,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								//变更后为单独结算
 								if (CommonConstants.ONE_INT == newSettleType) {
 									//推送新的结算信息至EKP
-									interactiveParam.setSettleType(CommonConstants.ONE_INT);
-									interactiveParam.setInteractiveType(CommonConstants.ONE_INT);
+									interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
+									interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 									interactiveParam.setCustomerCode(success.getNewCustomerCode());
 									interactiveParam.setCustomerName(success.getNewCustomerName());
 									interactiveParam.setDeptNo(success.getNewDeptNo());
 									interactiveParam.setDeptName(success.getNewDeptName());
 									interactiveParam.setActualPremium(success.getActualPremium());
-									String addBody = EKPUtil.sendToEKP(interactiveParam);
+									String addBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 									if (StringUtils.isNotBlank(addBody)){
 										newInsuranceSettle.setActualPushTime(LocalDateTime.now());
 										newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT);
@@ -3534,22 +3540,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 									interactiveParam.setCustomerName(success.getNewCustomerName());
 									interactiveParam.setDeptNo(success.getNewDeptNo());
 									interactiveParam.setDeptName(success.getNewDeptName());
-									interactiveParam.setInteractiveType(CommonConstants.ONE_INT);
+									interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 									//推送预估单
 									interactiveParam.setEstimatePremium(success.getEstimatePremium());
 									interactiveParam.setActualPremium(null);
-									interactiveParam.setSettleType(CommonConstants.ZERO_INT);
-									String estimateBody = EKPUtil.sendToEKP(interactiveParam);
+									interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
+									String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 									if (StringUtils.isNotBlank(estimateBody)) {
 										newInsuranceSettle.setEstimatePushTime(LocalDateTime.now());
 										newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
 										newInsuranceSettle.setUpdateTime(LocalDateTime.now());
 										tInsuranceSettleService.updateById(newInsuranceSettle);
 										//推送实缴单
-										interactiveParam.setSettleType(CommonConstants.ONE_INT);
+										interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
 										interactiveParam.setEstimatePremium(null);
 										interactiveParam.setActualPremium(success.getActualPremium());
-										String actualBody = EKPUtil.sendToEKP(interactiveParam);
+										String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 										if (StringUtils.isNotBlank(actualBody)) {
 											//推送成功后更新本地推送状态
 											newInsuranceSettle.setActualPushTime(LocalDateTime.now());
@@ -3571,14 +3577,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							//变更后为单独结算
 							if (CommonConstants.ONE_INT == newSettleType) {
 								//推送新的结算信息至EKP
-								interactiveParam.setSettleType(CommonConstants.ONE_INT);
-								interactiveParam.setInteractiveType(CommonConstants.ONE_INT);
+								interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
+								interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 								interactiveParam.setCustomerCode(success.getNewCustomerCode());
 								interactiveParam.setCustomerName(success.getNewCustomerName());
 								interactiveParam.setDeptNo(success.getNewDeptNo());
 								interactiveParam.setDeptName(success.getNewDeptName());
 								interactiveParam.setActualPremium(success.getActualPremium());
-								String addBody = EKPUtil.sendToEKP(interactiveParam);
+								String addBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 								if (StringUtils.isNotBlank(addBody)){
 									newInsuranceSettle.setActualPushTime(LocalDateTime.now());
 									newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT);
@@ -3596,22 +3602,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 								interactiveParam.setCustomerName(success.getNewCustomerName());
 								interactiveParam.setDeptNo(success.getNewDeptNo());
 								interactiveParam.setDeptName(success.getNewDeptName());
-								interactiveParam.setInteractiveType(CommonConstants.ONE_INT);
+								interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 								//推送预估单
 								interactiveParam.setEstimatePremium(success.getEstimatePremium());
 								interactiveParam.setActualPremium(null);
-								interactiveParam.setSettleType(CommonConstants.ZERO_INT);
-								String estimateBody = EKPUtil.sendToEKP(interactiveParam);
+								interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
+								String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 								if (StringUtils.isNotBlank(estimateBody)) {
 									newInsuranceSettle.setEstimatePushTime(LocalDateTime.now());
 									newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
 									newInsuranceSettle.setUpdateTime(LocalDateTime.now());
 									tInsuranceSettleService.updateById(newInsuranceSettle);
 									//推送实缴单
-									interactiveParam.setSettleType(CommonConstants.ONE_INT);
+									interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
 									interactiveParam.setEstimatePremium(null);
 									interactiveParam.setActualPremium(success.getActualPremium());
-									String actualBody = EKPUtil.sendToEKP(interactiveParam);
+									String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 									if (StringUtils.isNotBlank(actualBody)) {
 										//推送成功后更新本地推送状态
 										newInsuranceSettle.setActualPushTime(LocalDateTime.now());
@@ -3655,11 +3661,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							interactiveParam.setCustomerName(success.getNewCustomerName());
 							interactiveParam.setDeptNo(success.getNewDeptNo());
 							interactiveParam.setDeptName(success.getNewDeptName());
-							interactiveParam.setInteractiveType(CommonConstants.ONE_INT);
+							interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 							interactiveParam.setEstimatePremium(success.getEstimatePremium());
 							interactiveParam.setActualPremium(null);
-							interactiveParam.setSettleType(CommonConstants.ZERO_INT);
-							String estimateBody = EKPUtil.sendToEKP(interactiveParam);
+							interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
+							String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 							if(StringUtils.isNotBlank(estimateBody)){
 								//推送成功后更新本地推送状态
 								tInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
@@ -3707,11 +3713,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							interactiveParam.setCustomerName(success.getOldCustomerName());
 							interactiveParam.setDeptNo(success.getOldDeptNo());
 							interactiveParam.setDeptName(success.getOldDeptName());
-							interactiveParam.setInteractiveType(CommonConstants.THREE_INT);
+							interactiveParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL);
 							interactiveParam.setEstimatePremium(one.getEstimatePremium());
 							interactiveParam.setActualPremium(one.getActualPremium());
-							interactiveParam.setSettleType(CommonConstants.ONE_INT);
-							String deleteBody = EKPUtil.sendToEKP(interactiveParam);
+							interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
+							String deleteBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 							if(StringUtils.isNotBlank(deleteBody)){
 								//推送成功更新作废推送状态
 								cancel.setIsCancelPush(CommonConstants.ONE_INT);
@@ -3726,11 +3732,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 									interactiveParam.setCustomerName(success.getNewCustomerName());
 									interactiveParam.setDeptNo(success.getNewDeptNo());
 									interactiveParam.setDeptName(success.getNewDeptName());
-									interactiveParam.setInteractiveType(CommonConstants.ONE_INT);
+									interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 									interactiveParam.setEstimatePremium(null);
 									interactiveParam.setActualPremium(success.getActualPremium());
-									interactiveParam.setSettleType(CommonConstants.ONE_INT);
-									String actualBody = EKPUtil.sendToEKP(interactiveParam);
+									interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
+									String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 									if(StringUtils.isNotBlank(actualBody)){
 										//推送成功，更新推送状态
 										newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT);
@@ -3749,11 +3755,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 									interactiveParam.setCustomerName(success.getNewCustomerName());
 									interactiveParam.setDeptNo(success.getNewDeptNo());
 									interactiveParam.setDeptName(success.getNewDeptName());
-									interactiveParam.setInteractiveType(CommonConstants.ONE_INT);
+									interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 									interactiveParam.setEstimatePremium(null);
 									interactiveParam.setActualPremium(success.getActualPremium());
-									interactiveParam.setSettleType(CommonConstants.ONE_INT);
-									String actualBody = EKPUtil.sendToEKP(interactiveParam);
+									interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
+									String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 									//推送成功，更新预估和实际保费的推送状态
 									if(StringUtils.isNotBlank(actualBody)){
 										newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
@@ -3779,33 +3785,33 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							interactiveParam.setCustomerName(success.getOldCustomerName());
 							interactiveParam.setDeptNo(success.getOldDeptNo());
 							interactiveParam.setDeptName(success.getOldDeptName());
-							interactiveParam.setInteractiveType(CommonConstants.THREE_INT);
+							interactiveParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL);
 							interactiveParam.setEstimatePremium(one.getEstimatePremium());
 							interactiveParam.setActualPremium(one.getActualPremium());
-							interactiveParam.setSettleType(CommonConstants.ONE_INT);
-							String deleteBody = EKPUtil.sendToEKP(interactiveParam);
+							interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
+							String deleteBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 							if(StringUtils.isNotBlank(deleteBody)){
 								//先推送预估，再推送实际
 								interactiveParam.setCustomerCode(success.getNewCustomerCode());
 								interactiveParam.setCustomerName(success.getNewCustomerName());
 								interactiveParam.setDeptNo(success.getNewDeptNo());
 								interactiveParam.setDeptName(success.getNewDeptName());
-								interactiveParam.setInteractiveType(CommonConstants.ONE_INT);
+								interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 								//推送预估单
 								interactiveParam.setEstimatePremium(success.getEstimatePremium());
 								interactiveParam.setActualPremium(null);
-								interactiveParam.setSettleType(CommonConstants.ZERO_INT);
-								String estimateBody = EKPUtil.sendToEKP(interactiveParam);
+								interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
+								String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 								if (StringUtils.isNotBlank(estimateBody)) {
 									newInsuranceSettle.setEstimatePushTime(LocalDateTime.now());
 									newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
 									newInsuranceSettle.setUpdateTime(LocalDateTime.now());
 									tInsuranceSettleService.updateById(newInsuranceSettle);
 									//推送实缴单
-									interactiveParam.setSettleType(CommonConstants.ONE_INT);
+									interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
 									interactiveParam.setEstimatePremium(null);
 									interactiveParam.setActualPremium(success.getActualPremium());
-									String actualBody = EKPUtil.sendToEKP(interactiveParam);
+									String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 									if (StringUtils.isNotBlank(actualBody)) {
 										//推送成功后更新本地推送状态
 										newInsuranceSettle.setActualPushTime(LocalDateTime.now());
@@ -3829,22 +3835,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							interactiveParam.setCustomerName(success.getNewCustomerName());
 							interactiveParam.setDeptNo(success.getNewDeptNo());
 							interactiveParam.setDeptName(success.getNewDeptName());
-							interactiveParam.setInteractiveType(CommonConstants.ONE_INT);
+							interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 							//推送预估单
 							interactiveParam.setEstimatePremium(success.getEstimatePremium());
 							interactiveParam.setActualPremium(null);
-							interactiveParam.setSettleType(CommonConstants.ZERO_INT);
-							String estimateBody = EKPUtil.sendToEKP(interactiveParam);
+							interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
+							String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 							if (StringUtils.isNotBlank(estimateBody)) {
 								newInsuranceSettle.setEstimatePushTime(LocalDateTime.now());
 								newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
 								newInsuranceSettle.setUpdateTime(LocalDateTime.now());
 								tInsuranceSettleService.updateById(newInsuranceSettle);
 								//推送实缴单
-								interactiveParam.setSettleType(CommonConstants.ONE_INT);
+								interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
 								interactiveParam.setEstimatePremium(null);
 								interactiveParam.setActualPremium(success.getActualPremium());
-								String actualBody = EKPUtil.sendToEKP(interactiveParam);
+								String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 								if (StringUtils.isNotBlank(actualBody)) {
 									//推送成功后更新本地推送状态
 									newInsuranceSettle.setActualPushTime(LocalDateTime.now());
@@ -3868,10 +3874,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							interactiveParam.setCustomerName(success.getOldCustomerName());
 							interactiveParam.setDeptNo(success.getOldDeptNo());
 							interactiveParam.setDeptName(success.getOldDeptName());
-							interactiveParam.setInteractiveType(CommonConstants.THREE_INT);
+							interactiveParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL);
 							interactiveParam.setEstimatePremium(one.getEstimatePremium());
-							interactiveParam.setSettleType(CommonConstants.ZERO_INT);
-							String deleteBody = EKPUtil.sendToEKP(interactiveParam);
+							interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
+							String deleteBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 							if (StringUtils.isNotBlank(deleteBody)){
 								//推送成功后更新作废信息推送状态
 								cancel.setIsCancelPush(CommonConstants.ONE_INT);
@@ -3902,11 +3908,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 									interactiveParam.setCustomerName(success.getNewCustomerName());
 									interactiveParam.setDeptNo(success.getNewDeptNo());
 									interactiveParam.setDeptName(success.getNewDeptName());
-									interactiveParam.setInteractiveType(CommonConstants.ONE_INT);
+									interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 									interactiveParam.setEstimatePremium(success.getEstimatePremium());
 									interactiveParam.setActualPremium(null);
-									interactiveParam.setSettleType(CommonConstants.ONE_INT);
-									String estimateBody = EKPUtil.sendToEKP(interactiveParam);
+									interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
+									String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 									if(StringUtils.isNotBlank(estimateBody)){
 										//推送成功更新预估推送状态
 										newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
@@ -3928,11 +3934,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							interactiveParam.setCustomerName(success.getNewCustomerName());
 							interactiveParam.setDeptNo(success.getNewDeptNo());
 							interactiveParam.setDeptName(success.getNewDeptName());
-							interactiveParam.setInteractiveType(CommonConstants.ONE_INT);
+							interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
 							interactiveParam.setEstimatePremium(success.getEstimatePremium());
 							interactiveParam.setActualPremium(null);
-							interactiveParam.setSettleType(CommonConstants.ONE_INT);
-							String estimateBody = EKPUtil.sendToEKP(interactiveParam);
+							interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
+							String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
 							if(StringUtils.isNotBlank(estimateBody)){
 								//推送成功更新预估推送状态
 								newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
@@ -5062,8 +5068,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 */
 	@Override
 	public R getDeptList(){
-		List<TInsuranceDetail> detailList = new ArrayList<>();
-		//EKPUtil.testAddNewsInRestTemplate(detailList);
 		List<Dept> deptList = new ArrayList<>();
 		R<TSettleDomainListVo> tSettleDomainListVoR = archivesDaprUtil.selectAllSettleDomainSelectVos();
 		if (null != tSettleDomainListVoR && tSettleDomainListVoR.getCode() == CommonConstants.SUCCESS && Common.isNotNull(tSettleDomainListVoR.getData())) {
@@ -5220,9 +5224,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (StringUtils.isBlank(orderNo)) {
 			return R.failed(InsurancesConstants.ORDER_NO_IS_EMPTY);
 		}
-		//查询所有投保信息
-		IPage<InsuredOrderListVo> orderInsuredList = baseMapper.getOrderRefundInsuredListPage(page, param);
-		//查询所有的减员信息
+		//查询所有保单信息
+		IPage<InsuredOrderListVo> orderInsuredList = baseMapper.getOrderInsuredListPage(page, param);
 		return R.ok(orderInsuredList);
 	}
 
@@ -5294,15 +5297,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 *
 	 * @author zhaji
 	 * @param list
-	 * @return {@link List< EKPInteractiveParam>}
+	 * @return {@link List<  EkpInteractiveParam >}
 	 */
-	public List<EKPInteractiveParam> getDeptDetail(List<SettleMonthChangeCheckParam> list){
+	public List<EkpInteractiveParam> getDeptDetail(List<SettleMonthChangeCheckParam> list){
 		//根据项目编码获取项目名称
 		List<String> collect = list.stream().map(SettleMonthChangeCheckParam::getDeptNo).distinct().collect(Collectors.toList());
-		List<EKPInteractiveParam> ekpInteractiveParams = new ArrayList<>();
+		List<EkpInteractiveParam> ekpInteractiveParams = new ArrayList<>();
 		R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(collect);
 		if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
-			EKPInteractiveParam ekpInteractiveParam = new EKPInteractiveParam();
+			EkpInteractiveParam ekpInteractiveParam = new EkpInteractiveParam();
 			Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
 			for (SettleMonthChangeCheckParam param : list) {
 				ProjectSetInfoVo projectSetInfoVo = data.get(param.getDeptNo());
@@ -5328,11 +5331,17 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	public String pushEstimate(TInsuranceDetail tInsuranceDetail,Integer type){
 		Integer pushType = null;
 		//1,推送预估保费，2，推送实际保费，3推送预估冲正保费，4更新实际保费
-		EKPInteractiveParam param = new EKPInteractiveParam();
+		EkpInteractiveParam param = new EkpInteractiveParam();
 		List<String> deptNoList =new ArrayList<>();
 		deptNoList.add(tInsuranceDetail.getDeptNo());
 		BeanCopyUtils.copyProperties(tInsuranceDetail,param);
 		param.setDetailId(tInsuranceDetail.getId());
+		Integer settleType = tInsuranceDetail.getSettleType();
+		if(CommonConstants.ZERO_INT == settleType){
+			param.setEstimateStatus(EkpConstants.HAVE);
+		}else {
+			param.setEstimateStatus(EkpConstants.NOTHING);
+		}
 		//获取当前项目的名称，客户名称和客户编码
 		R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(deptNoList);
 		if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
@@ -5345,14 +5354,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		}
 		//1,推送预估保费(用户办理成功，推送预估保费)
 		if(CommonConstants.ONE_INT == type){
-			param.setInteractiveType(CommonConstants.ONE_INT);
-			param.setSettleType(CommonConstants.ONE_INT);
+			param.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
+			param.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
 			pushType = CommonConstants.ONE_INT;
 		}
 		//2，推送实际保费(用于登记保单保费未推送过实缴保费)
 		if(CommonConstants.TWO_INT == type){
-			param.setInteractiveType(CommonConstants.ONE_INT);
-			param.setSettleType(CommonConstants.TWO_INT);
+			param.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
+			param.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
 			pushType = CommonConstants.TWO_INT;
 		}
 		//3推送预估冲正保费(用于投保退回场景)
@@ -5366,21 +5375,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			if(null != byId.getActualPremium()){
 				param.setActualPremium(byId.getActualPremium().negate());
 			}
-			param.setInteractiveType(CommonConstants.ONE_INT);
-			param.setSettleType(CommonConstants.ONE_INT);
+			param.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
+			param.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
 			pushType = CommonConstants.FIVE_INT;
 		}
 		//4更新实际保费(用于登记保单保费场景推送过实缴保费)
 		if(CommonConstants.FOUR_INT == type){
-			param.setInteractiveType(CommonConstants.TWO_INT);
-			param.setSettleType(CommonConstants.ONE_INT);
+			param.setInteractiveType(InsurancesConstants.UPDATE_SETTLE_BILL);
+			param.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
 			pushType = CommonConstants.SEVEN_INT;
 		}
-		if(StringUtils.isBlank(EKPUtil.sendToEKP(param))){
+		if(StringUtils.isBlank(eKPInsuranceUtil.sendToEkp(param))){
 			saveInsuranceEkp(param,pushType);
 			return null;
 		}else {
-			return EKPUtil.sendToEKP(param);
+			return eKPInsuranceUtil.sendToEkp(param);
 		}
 	}
 
@@ -5405,9 +5414,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @param
 	 * @return {@link String}
 	 */
-	public Boolean saveInsuranceEkp(EKPInteractiveParam param,Integer pushType){
+	public Boolean saveInsuranceEkp(EkpInteractiveParam param, Integer pushType){
 		TInsuranceEkp ekp = new TInsuranceEkp();
 		BeanCopyUtils.copyProperties(param,ekp);
+		ekp.setId(null);
 		ekp.setCreateTime(LocalDateTime.now());
 		ekp.setPushType(pushType);
 		tInsuranceEkpService.save(ekp);

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpInsuranceUtil;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp;
@@ -16,8 +17,7 @@ import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpSer
 import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleService;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.BigDecimalUtils;
-import com.yifu.cloud.plus.v1.yifu.insurances.util.EKPUtil;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.EKPInteractiveParam;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInteractiveParam;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -40,6 +40,9 @@ import java.util.List;
 @Slf4j
 public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, TInsuranceEkp> implements TInsuranceEkpService {
 
+	@Resource
+	EkpInsuranceUtil ekpInsuranceUtil;
+
 	@Resource
 	TInsuranceSettleService tInsuranceSettleService;
 	@Resource
@@ -80,10 +83,10 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 					failList.add(tInsuranceEkp);
 					continue;
 				}
-				EKPInteractiveParam ekpParam = new EKPInteractiveParam();
+				EkpInteractiveParam ekpParam = new EkpInteractiveParam();
 				BeanCopyUtils.copyProperties(tInsuranceEkp,ekpParam);
 				if(actualStatus.equals(InsurancesConstants.SETTLE_ZERO)){
-					String s = EKPUtil.sendToEKP(ekpParam);
+					String s = ekpInsuranceUtil.sendToEkp(ekpParam);
 					//如果发送成功
 					if (StringUtils.isNotBlank(s)){
 						//预估则更新预估保费
@@ -129,8 +132,8 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 						if(!BigDecimalUtils.isNullOrZero(actualPremium)){
 							ekpParam.setActualPremium(actualPremium.negate());
 						}
-						ekpParam.setInteractiveType(CommonConstants.ONE_INT);
-						String s = EKPUtil.sendToEKP(ekpParam);
+						ekpParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
+						String s = ekpInsuranceUtil.sendToEkp(ekpParam);
 						if(StringUtils.isNotBlank(s)){
 							tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
 							successLit.add(tInsuranceEkp);
@@ -139,7 +142,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 						}
 					//如果为红冲数据则正常发送
 					}else if(CommonConstants.FIVE_INT == pushType || CommonConstants.SIX_INT == pushType){
-						String s = EKPUtil.sendToEKP(ekpParam);
+						String s = ekpInsuranceUtil.sendToEkp(ekpParam);
 						if(StringUtils.isNotBlank(s)){
 							tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
 							successLit.add(tInsuranceEkp);

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

@@ -258,6 +258,7 @@
 		</if>
 		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>
+	<!--通过id查询商险信息-->
 	<select id="getInsuranceDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceDetailVO">
 		select
 		detail.id as id,
@@ -305,7 +306,7 @@
 		left join t_insurance_settle tis on detail.DEFAULT_SETTLE_ID = tis.ID
 		where detail.ID = #{id}
 	</select>
-	<!-- 导出办理勾选查询结果-->
+	<!--导出办理勾选查询结果-->
 	<select id="getInsuranceExportListBySelect" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceExportListVO">
 		select detail.id as id,
 		detail.DEPT_NO as deptNo,
@@ -389,11 +390,13 @@
 		</if>
 		ORDER BY detail.CREATE_TIME DESC
 	</select>
+	<!--批量更新保单号-->
 	<update id="updatePolicyNoBatch">
 		<foreach collection="details" index="index" item="item" separator=";">
 				update t_insurance_detail set POLICY_NO = #{item.policyNo} where ID = #{item.id}
 		</foreach>
 	</update>
+	<!--批量更新发票号-->
 	<update id="updateInvoiceNoBatch">
 		<foreach collection="details" index="index" item="item" separator=";">
 			update t_insurance_detail set INVOICE_NO = #{item.invoiceNo} where ID = #{item.id}
@@ -904,6 +907,7 @@
 		</where>
 		ORDER BY CREATE_TIME desc
 	</select>
+	<!--查询所有在保，未出险，未过期，未失效，未减员的保单信息-->
     <select id="selectListByEmpIdcardNo" resultType="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail">
 		SELECT
 			<include refid="Base_Column_List"/>
@@ -934,8 +938,8 @@
 		</where>
 		ORDER BY CREATE_TIME desc
 	</select>
-	<!--商险订单减员列表查询-->
-	<select id="getOrderRefundInsuredListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredOrderListVo">
+	<!--商险订单列表查询-->
+	<select id="getOrderInsuredListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredOrderListVo">
 		(
 		select
 			detail.id as id,
@@ -1021,45 +1025,5 @@
 			</if>
 		)order by createTime desc
 	</select>
-	<select id="getOrderInsuredListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredOrderListVo">
-		select
-			detail.id as id,
-			detail.BUY_TYPE as buyType,
-			detail.EMP_NAME as empName,
-			detail.EMP_IDCARD_NO as empIdcardNo,
-			detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
-			detail.INSURANCE_TYPE_NAME as insuranceTypeName,
-			detail.BUY_STANDARD as buyStandard,
-			detail.MEDICAL_QUOTA as medicalQuota,
-			detail.DIE_DISABLE_QUOTA as dieDisableQuota,
-			detail.CREATE_NAME as createName,
-			detail.CREATE_USER_DEPT_NAME as createUserDeptName,
-			detail.CREATE_TIME as createTime,
-			detail.BUY_HANDLE_STATUS as buyHandleStatus
-		from
-		     t_insurance_detail detail
-		where
-		    detail.DELETE_FLAG = 0
-		and
-			detail.ORDER_NO = #{param.orderNo}
-		<if test="param.empName != null and param.empName.trim() != ''">
-			and detail.EMP_NAME like concat('%',replace(replace(#{param.empName},'_','\_'),'%','\%'),'%')
-		</if>
-		<if test="param.empIdcardNo != null and param.empIdcardNo.trim() != ''">
-			and detail.EMP_IDCARD_NO like concat('%',replace(replace(#{param.empIdcardNo},'_','\_'),'%','\%'),'%')
-		</if>
-		<if test="param.startDate != null and param.startDate.trim() != ''">
-			AND detail.CREATE_TIME <![CDATA[ >= ]]>  concat(#{param.startDate}, '00:00:00')
-		</if>
-		<if test="param.endDate != null and param.endDate.trim() != ''">
-			AND detail.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, '23:59:59')
-		</if>
-		<if test="param.deptNoList != null">
-			and detail.DEPT_NO in
-			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-		</if>
-	</select>
 
 </mapper>

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/THaveSalaryNosocial.java

@@ -111,12 +111,12 @@ public class THaveSalaryNosocial extends BaseEntity {
     private String settlementOrganNo;
 
 	/**
-     * 结算月
+     * 生成月--- 生成数据的月份 删除用
      */
-    @Length(max = 10, message = "结算月不能超过10个字符")
-    @ExcelAttribute(name = "结算月", maxLength = 10, needExport = true)
-    @Schema(description = "结算月", name = "settleMonth")
-    private String settleMonth;
+    @Length(max = 10, message = "生成月不能超过10个字符")
+    @ExcelAttribute(name = "生成月", maxLength = 10, needExport = true)
+    @Schema(description = "生成月", name = "createMonth")
+    private String createMonth;
 
 
     /**

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryAccount.java

@@ -385,5 +385,11 @@ public class TSalaryAccount extends BaseEntity {
 
 	@TableField(exist = false)
 	private List<TSalaryAccountItem> saiList = new ArrayList<>();  //工资组成部分明细
-
+	/**
+	 * 订单ID
+	 */
+	@ExcelAttribute(name = "订单ID")
+	@Schema(description = "订单ID" )
+	@ExcelProperty("订单ID" )
+	private String orderId;
 }

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java

@@ -335,4 +335,12 @@ public class TSalaryStandard extends BaseEntity {
 	@Length(max = 50, message = "封面抬头不能超过50个字符")
 	@ExcelProperty("封面抬头")
 	private String invoiceTitle;
+
+	/**
+	 * 订单ID
+	 */
+	@ExcelAttribute(name = "订单ID")
+	@Schema(description = "订单ID" )
+	@ExcelProperty("订单ID" )
+	private String orderId;
 }

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsBonus.java

@@ -17,6 +17,7 @@
 
 package com.yifu.cloud.plus.v1.yifu.salary.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -47,7 +48,7 @@ public class TStatisticsBonus {
 	 * ID
 	 */
 	@TableId(type = IdType.ASSIGN_ID)
-	@ExcelProperty("ID")
+	@ExcelIgnore
 	@Schema(description = "ID")
 	private String id;
 	/**
@@ -61,10 +62,10 @@ public class TStatisticsBonus {
 	/**
 	 * 申报月份（YYYYMM）
 	 */
-	@ExcelAttribute(name = "申报月份（YYYYMM）", isNotEmpty = true, errorInfo = "申报月份（YYYYMM）不能为空", maxLength = 6)
+	@ExcelAttribute(name = "申报月份", isNotEmpty = true, errorInfo = "申报月份（YYYYMM）不能为空", maxLength = 6)
 	@NotBlank(message = "申报月份（YYYYMM）不能为空")
 	@Length(max = 6, message = "申报月份（YYYYMM）不能超过6个字符")
-	@ExcelProperty("申报月份（YYYYMM）")
+	@ExcelProperty("申报月份")
 	@Schema(description = "申报月份（YYYYMM）")
 	private String declareMonth;
 	/**
@@ -78,9 +79,9 @@ public class TStatisticsBonus {
 	/**
 	 * 身份证号
 	 */
-	@ExcelAttribute(name = "身份证号", maxLength = 32)
+	@ExcelAttribute(name = "证件号码", maxLength = 32)
 	@Length(max = 32, message = "身份证号不能超过32个字符")
-	@ExcelProperty("身份证号")
+	@ExcelProperty("证件号码")
 	@Schema(description = "身份证号")
 	private String empIdcard;
 	/**

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsCurrentReport.java

@@ -71,9 +71,9 @@ public class TStatisticsCurrentReport {
 	/**
 	 * 身份证号
 	 */
-	@ExcelAttribute(name = "身份证号", maxLength = 25)
+	@ExcelAttribute(name = "身份证号码", maxLength = 25)
 	@Length(max = 25, message = "身份证号不能超过25个字符")
-	@ExcelProperty("身份证号")
+	@ExcelProperty("身份证号码")
 	private String empIdcard;
 	/**
 	 * 本期收入

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsLabor.java

@@ -17,6 +17,7 @@
 
 package com.yifu.cloud.plus.v1.yifu.salary.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -44,7 +45,7 @@ public class TStatisticsLabor {
 	 * ID
 	 */
 	@TableId(type = IdType.ASSIGN_ID)
-	@ExcelProperty("ID")
+	@ExcelIgnore
 	private String id;
 	/**
 	 * 申报单位
@@ -56,10 +57,10 @@ public class TStatisticsLabor {
 	/**
 	 * 申报月份（YYYYMM）
 	 */
-	@ExcelAttribute(name = "申报月份（YYYYMM）", isNotEmpty = true, errorInfo = "申报月份（YYYYMM）不能为空", maxLength = 6)
+	@ExcelAttribute(name = "申报月份", isNotEmpty = true, errorInfo = "申报月份不能为空", maxLength = 6)
 	@NotBlank(message = "申报月份（YYYYMM）不能为空")
 	@Length(max = 6, message = "申报月份（YYYYMM）不能超过6个字符")
-	@ExcelProperty("申报月份（YYYYMM）")
+	@ExcelProperty("申报月份")
 	private String declareMonth;
 	/**
 	 * 员工姓名
@@ -71,9 +72,9 @@ public class TStatisticsLabor {
 	/**
 	 * 身份证号
 	 */
-	@ExcelAttribute(name = "身份证号", maxLength = 32)
+	@ExcelAttribute(name = "证件号码", maxLength = 32)
 	@Length(max = 32, message = "身份证号不能超过32个字符")
-	@ExcelProperty("身份证号")
+	@ExcelProperty("证件号码")
 	private String empIdcard;
 	/**
 	 * 证件类型

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsRemuneration.java

@@ -17,6 +17,7 @@
 
 package com.yifu.cloud.plus.v1.yifu.salary.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -44,7 +45,7 @@ public class TStatisticsRemuneration {
 	 * ID
 	 */
 	@TableId(type = IdType.ASSIGN_ID)
-	@ExcelProperty("ID")
+	@ExcelIgnore
 	private String id;
 	/**
 	 * 申报单位
@@ -56,10 +57,10 @@ public class TStatisticsRemuneration {
 	/**
 	 * 申报月份（YYYYMM）
 	 */
-	@ExcelAttribute(name = "申报月份（YYYYMM）", isNotEmpty = true, errorInfo = "申报月份（YYYYMM）不能为空", maxLength = 6)
+	@ExcelAttribute(name = "申报月份", isNotEmpty = true, errorInfo = "申报月份不能为空", maxLength = 6)
 	@NotBlank(message = "申报月份（YYYYMM）不能为空")
 	@Length(max = 6, message = "申报月份（YYYYMM）不能超过6个字符")
-	@ExcelProperty("申报月份（YYYYMM）")
+	@ExcelProperty("申报月份")
 	private String declareMonth;
 	/**
 	 * 员工姓名

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatisticsCurrentReportMarketVo.java

@@ -97,210 +97,210 @@ public class TStatisticsCurrentReportMarketVo extends RowIndex implements Serial
 	/**
 	 * 本期收入
 	 */
-	@ExcelAttribute(name = "本期收入")
+	@ExcelAttribute(name = "本期收入", maxLength = 12)
 	@Schema(description = "本期收入")
 	@ExcelProperty("本期收入")
 	private BigDecimal realSalary;
 	/**
 	 * 本期费用
 	 */
-	@ExcelAttribute(name = "本期费用")
+	@ExcelAttribute(name = "本期费用", maxLength = 12)
 	@Schema(description = "本期费用")
 	@ExcelProperty("本期费用")
 	private BigDecimal currentExpenses;
 	/**
 	 * 本期免税收入
 	 */
-	@ExcelAttribute(name = "本期免税收入")
+	@ExcelAttribute(name = "本期免税收入", maxLength = 12)
 	@Schema(description = "本期免税收入")
 	@ExcelProperty("本期免税收入")
 	private BigDecimal currentTaxFreeIncome;
 	/**
 	 * 本期基本养老保险费
 	 */
-	@ExcelAttribute(name = "本期基本养老保险费")
+	@ExcelAttribute(name = "本期基本养老保险费", maxLength = 12)
 	@Schema(description = "本期基本养老保险费")
 	@ExcelProperty("本期基本养老保险费")
 	private BigDecimal personalPensionMoney;
 	/**
 	 * 本期基本医疗
 	 */
-	@ExcelAttribute(name = "本期基本医疗保险费")
+	@ExcelAttribute(name = "本期基本医疗保险费", maxLength = 12)
 	@Schema(description = "本期基本医疗保险费")
 	@ExcelProperty("本期基本医疗保险费")
 	private BigDecimal personalMedicalMoney;
 	/**
 	 * 本期失业
 	 */
-	@ExcelAttribute(name = "本期失业保险费")
+	@ExcelAttribute(name = "本期失业保险费", maxLength = 12)
 	@Schema(description = "本期失业保险费")
 	@ExcelProperty("本期失业保险费")
 	private BigDecimal personalUnemploymentMoney;
 	/**
 	 * 本期住房公积金
 	 */
-	@ExcelAttribute(name = "本期住房公积金")
+	@ExcelAttribute(name = "本期住房公积金", maxLength = 12)
 	@Schema(description = "本期住房公积金")
 	@ExcelProperty("本期住房公积金")
 	private BigDecimal personalProvidentFee;
 	/**
 	 * 本期企业(职业)年金
 	 */
-	@ExcelAttribute(name = "本期企业(职业)年金")
+	@ExcelAttribute(name = "本期企业(职业)年金", maxLength = 12)
 	@Schema(description = "本期企业(职业)年金")
 	@ExcelProperty("本期企业(职业)年金")
 	private BigDecimal enterpriseAnnuity;
 	/**
 	 * 本期商业健康保险费
 	 */
-	@ExcelAttribute(name = "本期商业健康保险费")
+	@ExcelAttribute(name = "本期商业健康保险费", maxLength = 12)
 	@Schema(description = "本期商业健康保险费")
 	@ExcelProperty("本期商业健康保险费")
 	private BigDecimal nowTakingRisks;
 	/**
 	 * 本期税延养老保险费
 	 */
-	@ExcelAttribute(name = "本期税延养老保险费")
+	@ExcelAttribute(name = "本期税延养老保险费", maxLength = 12)
 	@Schema(description = "本期税延养老保险费")
 	@ExcelProperty("本期税延养老保险费")
 	private BigDecimal nowTaxDeferred;
 	/**
 	 * 本期其他扣除(其他)
 	 */
-	@ExcelAttribute(name = "本期其他扣除(其他)")
+	@ExcelAttribute(name = "本期其他扣除(其他)", maxLength = 12)
 	@Schema(description = "本期其他扣除(其他)")
 	@ExcelProperty("本期其他扣除(其他)")
 	private BigDecimal nowOther;
 	/**
 	 * 累计收入额
 	 */
-	@ExcelAttribute(name = "累计收入额")
+	@ExcelAttribute(name = "累计收入额", maxLength = 12)
 	@Schema(description = "累计收入额")
 	@ExcelProperty("累计收入额")
 	private BigDecimal allIncome;
 	/**
 	 * 累计减除费用
 	 */
-	@ExcelAttribute(name = "累计减除费用")
+	@ExcelAttribute(name = "累计减除费用", maxLength = 12)
 	@Schema(description = "累计减除费用")
 	@ExcelProperty("累计减除费用")
 	private BigDecimal costReduction;
 	/**
 	 * 累计专项扣除
 	 */
-	@ExcelAttribute(name = "累计专项扣除")
+	@ExcelAttribute(name = "累计专项扣除", maxLength = 12)
 	@Schema(description = "累计专项扣除")
 	@ExcelProperty("累计专项扣除")
 	private BigDecimal specialDeduction;
 	/**
 	 * 累计子女教育支出扣除
 	 */
-	@ExcelAttribute(name = "累计子女教育支出扣除")
+	@ExcelAttribute(name = "累计子女教育支出扣除", maxLength = 12)
 	@Schema(description = "累计子女教育支出扣除")
 	@ExcelProperty("累计子女教育支出扣除")
 	private BigDecimal childEduinfoMoney;
 	/**
 	 * 累计继续教育支出扣除
 	 */
-	@ExcelAttribute(name = "累计继续教育支出扣除")
+	@ExcelAttribute(name = "累计继续教育支出扣除", maxLength = 12)
 	@Schema(description = "累计继续教育支出扣除")
 	@ExcelProperty("累计继续教育支出扣除")
 	private BigDecimal continuingEducationExpenseMoney;
 	/**
 	 * 累计住房贷款利息支出扣除
 	 */
-	@ExcelAttribute(name = "累计住房贷款利息支出扣除")
+	@ExcelAttribute(name = "累计住房贷款利息支出扣除", maxLength = 12)
 	@Schema(description = "累计住房贷款利息支出扣除")
 	@ExcelProperty("累计住房贷款利息支出扣除")
 	private BigDecimal housingLoanInterestExpenseMoney;
 	/**
 	 * 累计住房租金支出扣除
 	 */
-	@ExcelAttribute(name = "累计住房租金支出扣除")
+	@ExcelAttribute(name = "累计住房租金支出扣除", maxLength = 12)
 	@Schema(description = "累计住房租金支出扣除")
 	@ExcelProperty("累计住房租金支出扣除")
 	private BigDecimal housingRentalinfoMoney;
 	/**
 	 * 累计赡养老人支出扣除
 	 */
-	@ExcelAttribute(name = "累计赡养老人支出扣除")
+	@ExcelAttribute(name = "累计赡养老人支出扣除", maxLength = 12)
 	@Schema(description = "累计赡养老人支出扣除")
 	@ExcelProperty("累计赡养老人支出扣除")
 	private BigDecimal supportElderlyExpenseMoney;
 	/**
 	 * 累计3岁以下婴幼儿照护
 	 */
-	@ExcelAttribute(name = "累计3岁以下婴幼儿照护")
+	@ExcelAttribute(name = "累计3岁以下婴幼儿照护", maxLength = 12)
 	@Schema(description = "累计3岁以下婴幼儿照护")
 	@ExcelProperty("累计3岁以下婴幼儿照护")
 	private BigDecimal sumBabyMoney;
 	/**
 	 * 累计其他扣除
 	 */
-	@ExcelAttribute(name = "累计其他扣除")
+	@ExcelAttribute(name = "累计其他扣除", maxLength = 12)
 	@Schema(description = "累计其他扣除")
 	@ExcelProperty("累计其他扣除")
 	private BigDecimal allOther;
 	/**
 	 * 累计准予扣除的捐赠
 	 */
-	@ExcelAttribute(name = "累计准予扣除的捐赠")
+	@ExcelAttribute(name = "累计准予扣除的捐赠", maxLength = 12)
 	@Schema(description = "累计准予扣除的捐赠")
 	@ExcelProperty("累计准予扣除的捐赠")
 	private BigDecimal allDonate;
 	/**
 	 * 累计应纳税所得额
 	 */
-	@ExcelAttribute(name = "累计应纳税所得额")
+	@ExcelAttribute(name = "累计应纳税所得额", maxLength = 12)
 	@Schema(description = "累计应纳税所得额")
 	@ExcelProperty("累计应纳税所得额")
 	private BigDecimal taxable;
 	/**
 	 * 税率
 	 */
-	@ExcelAttribute(name = "税率")
+	@ExcelAttribute(name = "税率", maxLength = 12)
 	@Schema(description = "税率")
 	@ExcelProperty("税率")
 	private BigDecimal taxFee;
 	/**
 	 * 速算扣除数
 	 */
-	@ExcelAttribute(name = "速算扣除数")
+	@ExcelAttribute(name = "速算扣除数", maxLength = 12)
 	@Schema(description = "速算扣除数")
 	@ExcelProperty("速算扣除数")
 	private BigDecimal quickDeducation;
 	/**
 	 * 累计应纳税额
 	 */
-	@ExcelAttribute(name = "累计应纳税额")
+	@ExcelAttribute(name = "累计应纳税额", maxLength = 12)
 	@Schema(description = "累计应纳税额")
 	@ExcelProperty("累计应纳税额")
 	private BigDecimal salaryTax;
 	/**
 	 * 累计减免税额
 	 */
-	@ExcelAttribute(name = "累计减免税额")
+	@ExcelAttribute(name = "累计减免税额", maxLength = 12)
 	@Schema(description = "累计减免税额")
 	@ExcelProperty("累计减免税额")
 	private BigDecimal allTaxDeduction;
 	/**
 	 * 累计应扣缴税额
 	 */
-	@ExcelAttribute(name = "累计应扣缴税额")
+	@ExcelAttribute(name = "累计应扣缴税额", maxLength = 12)
 	@Schema(description = "累计应扣缴税额")
 	@ExcelProperty("累计应扣缴税额")
 	private BigDecimal allWithholdingTax;
 	/**
 	 * 累计已预缴税额
 	 */
-	@ExcelAttribute(name = "累计已预缴税额")
+	@ExcelAttribute(name = "累计已预缴税额", maxLength = 12)
 	@Schema(description = "累计已预缴税额")
 	@ExcelProperty("累计已预缴税额")
 	private BigDecimal allTaxPrepaid;
 	/**
 	 * 累计应补(退)税额
 	 */
-	@ExcelAttribute(name = "累计应补(退)税额")
+	@ExcelAttribute(name = "累计应补(退)税额", maxLength = 12)
 	@Schema(description = "累计应补(退)税额")
 	@ExcelProperty("累计应补(退)税额")
 	private BigDecimal allTaxPayable;

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/SalaryUploadController.java

@@ -47,8 +47,8 @@ public class SalaryUploadController {
 	@SysLog("上传薪资表")
 	@PostMapping("/upload")
 	public R upload(@RequestBody String jsonString, @RequestParam String settleDepart, @RequestParam(required = false) String configId
-			, @RequestParam String salaryType) {
-		return salaryUploadService.salaryUpload(jsonString, settleDepart, configId, salaryType);
+			, @RequestParam String salaryType, @RequestParam(required = false) String orderId) {
+		return salaryUploadService.salaryUpload(jsonString, settleDepart, configId, salaryType,orderId);
 	}
 
 	/**
@@ -61,8 +61,8 @@ public class SalaryUploadController {
 	@Operation(description = "保存并提交")
 	@SysLog("保存并提交薪资表")
 	@PostMapping("/saveAndSubmit")
-	public R saveAndSubmit(@RequestBody List<TSalaryAccountVo> savList) {
-		return salaryUploadService.saveAndSubmit(savList);
+	public R saveAndSubmit(@RequestBody List<TSalaryAccountVo> savList, @RequestParam(required = false)String orderId) {
+		return salaryUploadService.saveAndSubmit(savList,orderId);
 	}
 
 	@Operation(description = "打开结算单")

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TStatisticsLaborMapper.java

@@ -46,5 +46,5 @@ public interface TStatisticsLaborMapper extends BaseMapper<TStatisticsLabor> {
 	 * @Description: 统计
 	 * @return:
 	 **/
-	List<TStatisticsLabor> doStatisticsLabor(@Param("nowMonth") String nowMonth, @Param("lastYear") String lastYear);
+	List<TStatisticsLabor> doStatisticsLabor(@Param("nowMonth") String nowMonth, @Param("lastMonth") String lastMonth);
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TStatisticsRemunerationMapper.java

@@ -46,5 +46,5 @@ public interface TStatisticsRemunerationMapper extends BaseMapper<TStatisticsRem
 	 * @Description: 统计
 	 * @return:
 	 **/
-	List<TStatisticsRemuneration> doStatisticsRemuneration(@Param("nowMonth") String nowMonth, @Param("lastYear") String lastYear);
+	List<TStatisticsRemuneration> doStatisticsRemuneration(@Param("nowMonth") String nowMonth, @Param("lastMonth") String lastMonth);
 }

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/SalaryUploadService.java

@@ -20,21 +20,23 @@ public interface SalaryUploadService extends IService<TSalaryStandard> {
 	/**
 	 * @param jsonString
 	 *repeatFlag 默认 0：不允许重复导入已存在系统内的数据；1：允许重复导入
+	 * @param orderId
 	 * @Description: 普通工资上传
 	 * @Author: hgw
 	 * @Date: 2019/9/4 15:58
 	 * @return: com.yifu.cloud.v1.common.core.util.R
 	 **/
-	R salaryUpload(String jsonString, String settleDepart, String configId, String formType);
+	R salaryUpload(String jsonString, String settleDepart, String configId, String formType, String orderId);
 
 	/**
 	 * @param savList
+	 * @param orderId
 	 * @Description: 保存并提交报账表
 	 * @Author: hgw
 	 * @Date: 2019/9/18 18:42
 	 * @return: com.yifu.cloud.v1.common.core.util.R
 	 **/
-	R<String> saveAndSubmit(List<TSalaryAccountVo> savList);
+	R<String> saveAndSubmit(List<TSalaryAccountVo> savList, String orderId);
 
 	R<TSalaryDetailVo> getBill(String salaryFormId);
 

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -96,13 +96,14 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 	/**
 	 * @param jsonString 客户原表数据
 	 *                   repeatFlag 默认 0：不允许重复导入已存在系统内的数据；1：允许重复导入
+	 * @param orderId
 	 * @Description: 普通工资上传
 	 * @Author: hgw
 	 * @Date: 2019/9/4 15:58
 	 * @return: com.yifu.cloud.v1.common.core.util.R
 	 **/
 	@Override
-	public R salaryUpload(String jsonString, String settleDepart, String configId, String salaryType) {
+	public R salaryUpload(String jsonString, String settleDepart, String configId, String salaryType, String orderId) {
 		if (Common.isNotNull(jsonString) && Common.isNotNull(settleDepart) && Common.isNotNull(salaryType)) {
 
 			R<TSettleDomainSelectVo> sdr = HttpDaprUtil.invokeMethodPost(archivesProperties.getAppUrl(), archivesProperties.getAppId()
@@ -202,11 +203,11 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 						// return R.ok(saList)
 						//薪资导入
 						if (CommonConstants.ZERO_STRING.equals(salaryType)) {
-							return this.saveAndSubmit(saList);
+							return this.saveAndSubmit(saList, orderId);
 						}
 						//劳务费和稿酬导入
 						if (CommonConstants.THREE_STRING.equals(salaryType) || CommonConstants.FOUR_STRING.equals(salaryType)) {
-							return this.saveLaborSubmit(saList, dept, salaryType);
+							return this.saveLaborSubmit(saList, dept, salaryType,orderId);
 						}
 					} else {
 						return R.failed("导入数据不可为空");
@@ -306,13 +307,14 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 
 	/**
 	 * @param savList 报账表Vo
+	 * @param orderId
 	 * @Description: 保存并提交
 	 * @Author: hgw
 	 * @Date: 2019/9/20 17:05
 	 * @return: com.yifu.cloud.v1.common.core.util.R
 	 **/
 	@Override
-	public R saveAndSubmit(List<TSalaryAccountVo> savList) {
+	public R saveAndSubmit(List<TSalaryAccountVo> savList, String orderId) {
 		if (Common.isNotNull(savList) && !savList.isEmpty()) {
 			TSalaryAccountVo salaryAccountVo = savList.get(0);
 			List<TSalaryAccountItem> saiList = null;  //报账明细List
@@ -372,6 +374,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 					salaryLockService.save(lock);
 					TSalaryLock lockUpdate;
 					try {
+						//设置订单号  20220831
+						salary.setOrderId(orderId);
 						// 薪资核心导入代码
 						return this.doCoreSalary(savList, salaryAccountVo, saiList, sai, dept, invoiceTitle, user, nowTime, salary, isActual);
 					} catch (Exception e) {
@@ -897,6 +901,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			saiList = account.getSaiList();
 			account.setSaiList(null);
 			account.setSalaryFormId(salary.getId());
+			account.setOrderId(salary.getOrderId());
 			tSalaryAccountService.save(account);
 			money = SalaryConstants.B_ZERO;
 			for (TSalaryAccountItem item : saiList) {
@@ -1469,12 +1474,13 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 
 	/**
 	 * @param savList 报账表Vo
+	 * @param orderId
 	 * @Description: 保存并提交
 	 * @Author: huyc
 	 * @Date: 2022/8/16
 	 * @return: com.yifu.cloud.v1.common.core.util.R
 	 **/
-	public R saveLaborSubmit(List<TSalaryAccountVo> savList, TSettleDomainSelectVo dept, String salaryType) {
+	public R saveLaborSubmit(List<TSalaryAccountVo> savList, TSettleDomainSelectVo dept, String salaryType, String orderId) {
 		if (Common.isNotNull(savList) && !savList.isEmpty()) {
 			TSalaryAccountVo salaryAccountVo = savList.get(0);
 			List<TSalaryAccountItem> saiList = null;  //报账明细List
@@ -1493,6 +1499,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			}
 
 			if (salary != null) {
+				// 复制EKP订单ID 20220831 fxj
+				salary.setOrderId(orderId);
 				// 薪资导入、删除前加锁：
 				TSalaryLock lock = salaryLockService.lambdaQuery()
 						.eq(TSalaryLock::getDeptId, dept.getId())
@@ -1663,6 +1671,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		for (TSalaryAccount account : aList) {
 			saiList = account.getSaiList();
 			account.setSaiList(null);
+			account.setOrderId(salary.getOrderId());
 			account.setSalaryFormId(salary.getId());
 			tSalaryAccountService.save(account);
 			for (TSalaryAccountItem item : saiList) {
@@ -1929,6 +1938,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		for (TSalaryAccount account : aList) {
 			saiList = account.getSaiList();
 			account.setSaiList(null);
+			account.setOrderId(salary.getOrderId());
 			account.setSalaryFormId(salary.getId());
 			tSalaryAccountService.save(account);
 			for (TSalaryAccountItem item : saiList) {

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/THaveSalaryNosocialServiceImpl.java

@@ -117,7 +117,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
     @Override
     public void generate(String salaryMonth) {
         //重新跑上月数据
-        this.remove(Wrappers.<THaveSalaryNosocial>query().lambda().eq(THaveSalaryNosocial::getMonth,salaryMonth));
+        this.remove(Wrappers.<THaveSalaryNosocial>query().lambda().eq(THaveSalaryNosocial::getCreateMonth,salaryMonth));
         List<THaveSalaryNosocial> haveSalaryNosocialList = salaryAccountService.getLastMonthTHaveSalaryNosocial(salaryMonth);
         if(!Common.isNotEmpty(haveSalaryNosocialList)){
             log.error("获取有社保无工资数据为空");
@@ -126,7 +126,13 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
         //去缴费库查询查询这些人社保是否存在
         Map<String, TPaymentInfo> empPaymentInfoMap=Maps.newHashMap();
         R<HaveSalaryNoSocialVo> noSocialVoR = socialDaprUtils.getPaymentinfoListByEmpdIdCard(Common.listObjectToStrList(haveSalaryNosocialList, "employeeIdCard"), salaryMonth);
-        if (Common.isNotNull(noSocialVoR)&& Common.isNotNull(noSocialVoR.getData())) {
+        if (Common.isEmpty(noSocialVoR) || noSocialVoR.getCode() == CommonConstants.FAIL){
+			log.error("获取社保公积金信息失败");
+			return;
+		}
+		if (Common.isNotNull(noSocialVoR)
+				&& Common.isNotNull(noSocialVoR.getData())
+				&& Common.isNotNull(noSocialVoR.getData().getPaymentInfos())) {
             for (TPaymentInfo paymentInfo : noSocialVoR.getData().getPaymentInfos()) {
                 empPaymentInfoMap.put(paymentInfo.getEmpIdcard(),paymentInfo);
             }
@@ -134,6 +140,10 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
         //结算主体
 		R<TSettleDomainListVo> domainListVoR = archivesDaprUtil.selectAllSettleDomainSelectVos();
         HashMap<String, TSettleDomainSelectVo> settleDomainSelectVoMap = Maps.newHashMap();
+		if (Common.isEmpty(domainListVoR) || domainListVoR.getCode() == CommonConstants.FAIL){
+			log.error("获取项目信息失败");
+			return;
+		}
 		if (Common.isNotNull(domainListVoR)
 				&& Common.isNotNull(domainListVoR.getData())
 				&& Common.isNotNull(domainListVoR.getData().getListSelectVO()))
@@ -163,6 +173,7 @@ public class THaveSalaryNosocialServiceImpl extends ServiceImpl<THaveSalaryNosoc
                 haveSalaryNosocial.setCreateBy(allUserDTOMap.get(haveSalaryNosocial.getCreateBy()));
             }
             haveSalaryNosocial.setCreateTime(LocalDateTime.now());
+			haveSalaryNosocial.setCreateMonth(salaryMonth);
             this.save(haveSalaryNosocial);
         }
 

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TMinSalaryServiceImpl.java

@@ -91,7 +91,7 @@ public class TMinSalaryServiceImpl extends ServiceImpl<TMinSalaryMapper, TMinSal
 			if (res >  CommonConstants.ZERO_INT){
 				return R.failed("已存在对应区域在用的配置信息");
 			}
-			baseMapper.updateById(entity);
+			baseMapper.updateById(tMinSalary);
 			return R.ok(true,CommonConstants.UPDATE_SUCCESS);
 		}else {
 			return R.failed(false,CommonConstants.SAVE_FAILED);

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsBonusServiceImpl.java

@@ -278,7 +278,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 					} else {
 						//年终奖单独扣税
 						finalSalaryNoSalary = calculationSalary(annousTax,infoVo.getAnnualBonus());
-						BigDecimal annualTSalary = calculationSalaryT(personTax,infoVo.getAnnualTSalary(),sumTax);
+						BigDecimal annualTSalary = calculationSalaryT(personTax,infoVo.getAnnualTSalary());
 						finalSalaryNoSalary = BigDecimalUtils.safeAdd(finalSalaryNoSalary,annualTSalary);
 						wSalary = BigDecimalUtils.safeAdd(infoVo.getAnnualBonus(), infoVo.getAnnualTSalary());
 						finalSalaryWithSalary = calculationSalary(annousTax, wSalary);
@@ -491,7 +491,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 	}
 
 	/**
-	 * @param annousTax 年终奖扣税阶梯表list
+	 * @param annousTax 薪资扣税阶梯表list
 	 * @param annualSalary 年终奖
 	 * @Description: 计算薪资扣税-个税
 	 * @Author: huyc
@@ -528,7 +528,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 	 * @Date: 2022/8/23
 	 * @return: java.math.BigDecimal
 	 **/
-	private static BigDecimal calculationSalaryT(List<TSalaryTaxConfig> personTax, BigDecimal annualSalary, BigDecimal sumTax) {
+	private static BigDecimal calculationSalaryT(List<TSalaryTaxConfig> personTax, BigDecimal annualSalary) {
 		//本次年终奖纳税额
 		BigDecimal res = BigDecimal.ZERO;
 		//计算年终奖税
@@ -539,7 +539,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 				//annualSalary = realDeduSalary * ((double) ((annualSalary.getTaxRate() * 1.0) / 100)) - sumTax - sub.getQuick();
 				res = annualSalary.multiply(new BigDecimal(sub.getWithholdingRate()).divide(
 								SalaryConstants.B_ONEHUNDRED, SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP))
-						.subtract(sumTax).subtract(sub.getQuickDeducation());// 应纳税额
+								.subtract(sub.getQuickDeducation());// 应纳税额
 				break;
 			}
 		}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsCurrentReportMarketServiceImpl.java

@@ -136,8 +136,13 @@ public class TStatisticsCurrentReportMarketServiceImpl extends ServiceImpl<TStat
 							}
 							if (Common.isEmpty(declareMonth)) {
 								errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT
-										, "请检查‘税款所属期起’单元格格式是文本格式，且满足日期格式yyyy-MM-dd或yyyyMMdd:CreateStart="
-										+ cachedDataList.get(0).getCreateStart() + "|| yearMonth=" + declareMonth));
+										, "请检查‘税款所属期起’单元格格式是文本格式，且满足日期格式yyyy-MM-dd或yyyyMMdd"));
+							}
+							try {
+								Integer.parseInt(declareMonth);
+							} catch (Exception e) {
+								errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT
+										, "请检查‘税款所属期起’单元格格式是文本格式，且满足日期格式yyyy-MM-dd或yyyyMMdd"));
 							}
 							declareTitle = cachedDataList.get(0).getInvoiceTitle();
 							if (Common.isEmpty(declareTitle)) {

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsCurrentReportServiceImpl.java

@@ -153,7 +153,7 @@ public class TStatisticsCurrentReportServiceImpl extends ServiceImpl<TStatistics
 	}
 
 	private LambdaQueryWrapper buildQueryWrapper(TStatisticsCurrentReportSearchVo entity) {
-		LambdaQueryWrapper<TStatisticsCurrentReport> wrapper = Wrappers.lambdaQuery();
+		LambdaQueryWrapper<TStatisticsCurrentReport> wrapper = Wrappers.lambdaQuery(entity);
 		return wrapper;
 	}
 

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsLaborServiceImpl.java

@@ -254,8 +254,7 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
 			return R.failed("上月数据已生成，不可重复生成！");
 		} else {
 			String lastMonth =  DateUtil.addMonth(-1);  //上月
-			String lastYear = lastMonth.substring(0,4);
-			List<TStatisticsLabor> stdvoList = baseMapper.doStatisticsLabor(nowMonth,lastYear);
+			List<TStatisticsLabor> stdvoList = baseMapper.doStatisticsLabor(nowMonth,lastMonth);
 			for (TStatisticsLabor declarer : stdvoList) {
 				this.save(declarer);
 			}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsRemunerationServiceImpl.java

@@ -156,8 +156,7 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
 			return R.failed("上月数据已生成，不可重复生成！");
 		} else {
 			String lastMonth =  DateUtil.addMonth(-1);  //上月
-			String lastYear = lastMonth.substring(0,4);
-			List<TStatisticsRemuneration> stdvoList = baseMapper.doStatisticsRemuneration(nowMonth,lastYear);
+			List<TStatisticsRemuneration> stdvoList = baseMapper.doStatisticsRemuneration(nowMonth,lastMonth);
 			for (TStatisticsRemuneration remuneration : stdvoList) {
 				this.save(remuneration);
 			}

yifu-salary/yifu-salary-biz/src/main/resources/mapper/SysMessageSalaryMapper.xml

@@ -59,6 +59,8 @@
 		a.REASON_TYPE,
 		a.CREATE_BY,
 		a.CREATE_NAME
+		,a.CREATE_NAME,
+		a.CREATE_TIME
          </sql>
     <sql id="sysMessageSalary_where">
         <if test="sysMessageSalary != null">
@@ -68,6 +70,9 @@
             <if test="sysMessageSalary.actualSalary != null">
                 AND a.actual_salary = #{sysMessageSalary.actualSalary}
             </if>
+			<if test="sysMessageSalary.createName != null">
+				AND a.CREATE_NAME = #{sysMessageSalary.createName}
+			</if>
             <if test="sysMessageSalary.salaryBase != null">
                 AND a.salary_base = #{sysMessageSalary.salaryBase}
             </if>
@@ -127,6 +132,7 @@
         <where>
           <include refid="sysMessageSalarySql"/>
           <include refid="sysMessageSalary_where"/>
+		  order by  a.CREATE_TIME desc
         </where>
     </select>
 
@@ -181,7 +187,9 @@
 			DEPT_ID as DEPART_ID,
 			DEPT_NAME as DEPART_NAME,
 			DEPT_NO as DEPART_NO,
-            0 as TYPE
+            0 as TYPE,
+			CREATE_NAME,
+			CREATE_TIME
             FROM
                 (
                     SELECT
@@ -197,6 +205,8 @@
                         sum(i.SALARY_MONEY) AS actual_salary,
                         sum(l.SALARY_MONEY) AS relay_Salary,
 						s.CREATE_BY AS CREATE_BY,
+						s.CREATE_NAME AS CREATE_NAME,
+						s.CREATE_TIME AS CREATE_TIME,
                         min(IFNULL(t.salary_base,c.salary_base)) AS salary_base,
                       a.PROVINCE,
                       a.CITY,
@@ -209,6 +219,7 @@
                     LEFT JOIN t_salary_account_item i ON i.SALARY_ACCOUNT_ID = a.id and i.JAVA_FIED_NAME = 'actualSalarySum'
                     LEFT JOIN t_salary_account_item l ON l.SALARY_ACCOUNT_ID = a.id and l.JAVA_FIED_NAME = 'relaySalary'
                     WHERE
+					(t.`STATUS`=1 or t.id is null) and (c.`STATUS`=1 or c.id is null) and
                     a.DELETE_FLAG = 0
 					and a.FORM_TYPE='0'
                     and	a.SALARY_MONTH = #{settleMonth}

yifu-salary/yifu-salary-biz/src/main/resources/mapper/THaveSalaryNosocialMapper.xml

@@ -37,7 +37,7 @@
                   a.SETTLEMENT_ORGAN_NAME,
                   a.SETTLEMENT_ORGAN_NO,
                   a.month,
-                  a.SETTLE_MONTH,
+                  a.CREATE_MONTH,
                   a.relay_salary,
                   a.FEED_BACK,
 				  a.CREATE_NAME,
@@ -75,8 +75,8 @@
             <if test="tHaveSalaryNosocial.month != null">
                 AND a.month = #{tHaveSalaryNosocial.month}
             </if>
-            <if test="tHaveSalaryNosocial.settleMonth != null">
-                AND a.SETTLE_MONTH = #{tHaveSalaryNosocial.settleMonth}
+            <if test="tHaveSalaryNosocial.createMonth != null">
+                AND a.CREATE_MONTH = #{tHaveSalaryNosocial.createMonth}
             </if>
 			<if test="tHaveSalaryNosocial.createName != null">
 				AND a.CREATE_NAME = #{tHaveSalaryNosocial.createName}
@@ -205,7 +205,7 @@
         ,b.*
         FROM t_have_salary_nosocial a
         left join t_feed_back b  on  a.ID=b.RELATE_ID
-        where  a.SETTLE_MONTH in(#{lastOneMonth},#{lastTwoMonth},#{lastThreeMonth}) and b.REASON_TYPE is not null
+        where  a.CREATE_MONTH in(#{lastOneMonth},#{lastTwoMonth},#{lastThreeMonth}) and b.REASON_TYPE is not null
 
     </select>
 	<select id="noPageDiy" resultMap="haveSalaryNoSocialExportMap">

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccount2022Mapper.xml

@@ -312,7 +312,7 @@
 					 left join t_salary_account_item annualBonusTax on annualBonusTax.SALARY_ACCOUNT_ID = a.id and annualBonusTax.JAVA_FIED_NAME='annualBonusTax'
 					 left join t_salary_account_item annualBonus on annualBonus.SALARY_ACCOUNT_ID = a.id and annualBonus.JAVA_FIED_NAME='annualBonus'
 			where
-				a.SETTLEMENT_MONTH = #{lastMonth} and a.DELETE_FLAG = 0 and a.FORM_TYPE != '7' and a.FORM_TYPE != '3' and s.DELETE_FLAG = 0
+				a.SETTLEMENT_MONTH = #{lastMonth} and a.DELETE_FLAG = 0 and a.FORM_TYPE != '7' and a.FORM_TYPE != '3' and a.FORM_TYPE != '4' and s.DELETE_FLAG = 0
 			GROUP BY a.EMP_IDCARD,a.INVOICE_TITLE,a.SETTLEMENT_MONTH)
 	</insert>
 

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -77,6 +77,7 @@
 	<result property="sendUser" column="SEND_USER"/>
 	<result property="sendUserName" column="SEND_USER_NAME"/>
 	<result property="sendMonth" column="SEND_MONTH"/>
+	<result property="orderId" column="ORDER_ID"/>
   </resultMap>
 
 	<!-- 对接EKP的参数 -->
@@ -197,7 +198,8 @@
                 a.SEND_TIME,
                 a.SEND_USER,
                 a.SEND_USER_NAME,
-                a.SEND_MONTH
+                a.SEND_MONTH,
+				a.ORDER_ID
     </sql>
     <sql id="tSalaryAccount_where">
         <if test="tSalaryAccount != null">
@@ -207,6 +209,9 @@
                     <if test="tSalaryAccount.invoiceTitle != null and tSalaryAccount.invoiceTitle.trim() != ''">
                         AND a.INVOICE_TITLE = #{tSalaryAccount.invoiceTitle}
                     </if>
+					<if test="tSalaryAccount.orderId != null and tSalaryAccount.orderId.trim() != ''">
+						AND a.ORDER_ID = #{tSalaryAccount.orderId}
+					</if>
                     <if test="tSalaryAccount.salaryFormId != null and tSalaryAccount.salaryFormId.trim() != ''">
                         AND a.SALARY_FORM_ID = #{tSalaryAccount.salaryFormId}
                     </if>
@@ -387,7 +392,7 @@
 			 , a.EMP_IDCARD       employee_id_card
 			 , a.EMP_NAME         employee_name
 			 , GROUP_CONCAT(a.relaySalary)    relay_salary
-			 , a.CREATE_BY      CREATE_USER_ID
+			 , a.CREATE_BY      CREATE_BY
 			 , GROUP_CONCAT(a.SALARY_MONTH)      month
 			 , a.EMP_NAME         employee_name
 			 , a.EMP_IDCARD       employee_id_card
@@ -395,6 +400,7 @@
 			 , a.DEPT_NAME        SETTLEMENT_ORGAN_NAME
 			 , a.DEPT_NO          SETTLEMENT_ORGAN_NO
 			 , a.SETTLEMENT_MONTH SETTLE_MONTH
+		     ,a.CREATE_NAME,a.CREATE_TIME
 		from (
 				 select a.id
 					  , s.DEPT_ID
@@ -411,6 +417,7 @@
 					  , sum(if(item.JAVA_FIED_NAME in
 							   ('unitSocial', 'personalSocial', 'withholidingUnitSocial', 'withholidingPersonSocial'),
 							   item.SALARY_MONEY, 0))                                 social
+					  ,a.CREATE_NAME,a.CREATE_TIME
 				 from mvp_salary.t_salary_account a
 						  left join mvp_salary.t_salary_account_item item on item.SALARY_ACCOUNT_ID = a.id
 						  LEFT JOIN mvp_salary.t_salary_standard s on a.SALARY_FORM_ID = s.id
@@ -420,7 +427,7 @@
 				   and a.FORM_TYPE='0'
 				   and a.SALARY_MONTH in ( #{month} , #{month2} , #{month3})
 				   AND s.STATUS IN (3, 4)
-				 GROUP BY a.EMP_IDCARD, a.SALARY_MONTH limit 10
+				 GROUP BY a.EMP_IDCARD, a.SALARY_MONTH
 			 ) a
 		where a.relaySalary > 0
 		  and a.social = 0

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml

@@ -72,6 +72,7 @@
     <result property="repeatNums" column="REPEAT_NUMS"/>
     <result property="isRepeat" column="IS_REPEAT"/>
     <result property="repeatRemark" column="REPEAT_REMARK"/>
+	<result property="orderId" column="ORDER_ID"/>
   </resultMap>
     <sql id="Base_Column_List">
                 a.ID,
@@ -122,7 +123,8 @@
                 a.REPEAT_NUMS,
                 a.IS_REPEAT,
                 a.REPEAT_REMARK,
-				a.INVOICE_TITLE
+				a.INVOICE_TITLE,
+				a.ORDER_ID
     </sql>
     <sql id="tSalaryStandard_where">
         <if test="tSalaryStandard != null">
@@ -132,6 +134,9 @@
                     <if test="tSalaryStandard.deptId != null and tSalaryStandard.deptId.trim() != ''">
                         AND a.DEPT_ID = #{tSalaryStandard.deptId}
                     </if>
+					<if test="tSalaryStandard.orderId != null and tSalaryStandard.orderId.trim() != ''">
+						AND a.ORDER_ID = #{tSalaryStandard.orderId}
+					</if>
                     <if test="tSalaryStandard.deptName != null and tSalaryStandard.deptName.trim() != ''">
                         AND a.DEPT_NAME = #{tSalaryStandard.deptName}
                     </if>

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsBonusMapper.xml

@@ -113,7 +113,7 @@
 				 left join t_salary_account_item annualbonus on annualbonus.SALARY_ACCOUNT_ID = a.id and annualbonus.CN_NAME='年终奖'
 				 left join t_salary_account_item tax on tax.SALARY_ACCOUNT_ID = a.id and tax.CN_NAME='年终奖单独扣税'
 				 left join t_salary_standard s ON s.id = a.SALARY_FORM_ID
-		where a.DELETE_FLAG = '1' and annualbonus.SALARY_MONEY > 0 and tax.SALARY_MONEY > 0 and	s.SEND_MONTH like '${lastYear}%'
+		where a.DELETE_FLAG = 0 and annualbonus.SALARY_MONEY > 0 and tax.SALARY_MONEY > 0 and	s.SEND_MONTH like '${lastYear}%'
 		GROUP BY a.EMP_IDCARD,a.EMP_NAME
 	</select>
 </mapper>

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsLaborMapper.xml

@@ -91,10 +91,10 @@
 	<!--统计-->
 	<select id="doStatisticsLabor" resultMap="tStatisticsLaborMap">
 		select
-			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX) PERSONAL_TAX,sum(a.ACTUAL_SALARY) INCOME,
+			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX + a.SALARY_TAX_UNIT) PERSONAL_TAX,sum(a.RELAY_SALARY_UNIT) INCOME,
 			a.INVOICE_TITLE DECLARE_UNIT,'一般劳务报酬所得' INCOME_ITEM,'居民身份证' CARD_TYPE
 		from t_salary_account a
-		where a.DELETE_FLAG = '1' and a.SETTLEMENT_MONTH like '${lastYear}%' and a.FORM_TYPE = '3'
-		GROUP BY a.EMP_IDCARD,a.EMP_NAME
+		where a.DELETE_FLAG = 0 and a.SETTLEMENT_MONTH = #{lastMonth} and a.FORM_TYPE = '3'
+		GROUP BY a.EMP_IDCARD,DECLARE_UNIT
 	</select>
 </mapper>

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsRemunerationMapper.xml

@@ -88,9 +88,9 @@
 	<select id="doStatisticsRemuneration" resultMap="tStatisticsRemunerationMap">
 		select
 			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX) PERSONAL_TAX,
-			sum(a.ACTUAL_SALARY) INCOME,a.INVOICE_TITLE DECLARE_UNIT,'居民身份证' CARD_TYPE
+			sum(a.SALARY_TAX_UNIT) INCOME,a.INVOICE_TITLE DECLARE_UNIT,'居民身份证' CARD_TYPE
 		from t_salary_account a
-		where a.DELETE_FLAG = '1' and a.SETTLEMENT_MONTH like '${lastYear}%' and a.FORM_TYPE = '4'
-		GROUP BY a.EMP_IDCARD,a.EMP_NAME
+		where a.DELETE_FLAG = 0 and a.SETTLEMENT_MONTH = #{lastMonth} and a.FORM_TYPE = '4'
+		GROUP BY a.EMP_IDCARD,DECLARE_UNIT
 	</select>
 </mapper>

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

@@ -582,5 +582,12 @@ public class TDispatchInfo extends BaseEntity {
 	@ExcelProperty("首次购买时间（第一派单月份）" )
 	private Date firstBuyMonthSocial;
 
+	/**
+	 * 订单ID
+	 */
+	@ExcelAttribute(name = "订单ID")
+	@Schema(description = "订单ID" )
+	@ExcelProperty("订单ID" )
+	private String orderId;
 
 }

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.social.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 收入明细表
+ *
+ * @author hgw
+ * @date 2022-08-30 17:34:58
+ */
+@Data
+@TableName("t_income")
+@Schema(description = "收入明细表")
+public class TIncome {
+
+	/**
+	 * 主键
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@ExcelProperty("主键")
+	private String id;
+	/**
+	 * 员工姓名
+	 */
+	@ExcelAttribute(name = "员工姓名", isNotEmpty = true, errorInfo = "员工姓名不能为空", maxLength = 32)
+	@NotBlank(message = "员工姓名不能为空")
+	@Length(max = 32, message = "员工姓名不能超过32个字符")
+	@ExcelProperty("员工姓名")
+	private String empName;
+	/**
+	 * 身份证号
+	 */
+	@ExcelAttribute(name = "身份证号", isNotEmpty = true, errorInfo = "身份证号不能为空", maxLength = 32)
+	@NotBlank(message = "身份证号不能为空")
+	@Length(max = 32, message = "身份证号不能超过32个字符")
+	@ExcelProperty("身份证号")
+	private String empIdcard;
+	/**
+	 * 客户id
+	 */
+	@ExcelAttribute(name = "客户id", maxLength = 32)
+	@Length(max = 32, message = "客户id不能超过32个字符")
+	@ExcelProperty("客户id")
+	private String unitId;
+	/**
+	 * 客户名称
+	 */
+	@ExcelAttribute(name = "客户名称", maxLength = 50)
+	@Length(max = 50, message = "客户名称不能超过50个字符")
+	@ExcelProperty("客户名称")
+	private String unitName;
+	/**
+	 * 客户编码
+	 */
+	@ExcelAttribute(name = "客户编码", maxLength = 32)
+	@Length(max = 32, message = "客户编码不能超过32个字符")
+	@ExcelProperty("客户编码")
+	private String unitNo;
+	/**
+	 * 项目id
+	 */
+	@ExcelAttribute(name = "项目id", maxLength = 32)
+	@Length(max = 32, message = "项目id不能超过32个字符")
+	@ExcelProperty("项目id")
+	private String deptId;
+	/**
+	 * 项目名称
+	 */
+	@ExcelAttribute(name = "项目名称", maxLength = 50)
+	@Length(max = 50, message = "项目名称不能超过50个字符")
+	@ExcelProperty("项目名称")
+	private String deptName;
+	/**
+	 * 项目编码
+	 */
+	@ExcelAttribute(name = "项目编码", maxLength = 30)
+	@Length(max = 30, message = "项目编码不能超过30个字符")
+	@ExcelProperty("项目编码")
+	private String deptNo;
+	/**
+	 * 费用类型：1管理费2风险金
+	 */
+	@ExcelAttribute(name = "费用类型：1管理费2风险金", maxLength = 1)
+	@Length(max = 1, message = "费用类型：1管理费2风险金不能超过1个字符")
+	@ExcelProperty("费用类型：1管理费2风险金")
+	private String feeType;
+	/**
+	 * 收费方式：1按比例2金额-人数3金额-人次
+	 */
+	@ExcelAttribute(name = "收费方式：1按比例2金额-人数3金额-人次", maxLength = 1)
+	@Length(max = 1, message = "收费方式：1按比例2金额-人数3金额-人次不能超过1个字符")
+	@ExcelProperty("收费方式：1按比例2金额-人数3金额-人次")
+	private String feeMode;
+	/**
+	 * 收费标准
+	 */
+	@ExcelAttribute(name = "收费标准", maxLength = 10)
+	@Length(max = 10, message = "收费标准不能超过10个字符")
+	@ExcelProperty("收费标准")
+	private String charges;
+	/**
+	 * 收入来源：1社保2公积金3商险4薪资
+	 */
+	@ExcelAttribute(name = "收入来源：1社保2公积金3商险4薪资", isNotEmpty = true, errorInfo = "收入来源：1社保2公积金3商险4薪资不能为空", maxLength = 1)
+	@NotBlank(message = "收入来源：1社保2公积金3商险4薪资不能为空")
+	@Length(max = 1, message = "收入来源：1社保2公积金3商险4薪资不能超过1个字符")
+	@ExcelProperty("收入来源：1社保2公积金3商险4薪资")
+	private String sourceType;
+	/**
+	 * 金额
+	 */
+	@ExcelAttribute(name = "金额", isNotEmpty = true, errorInfo = "金额不能为空")
+	@NotBlank(message = "金额不能为空")
+	@ExcelProperty("金额")
+	private BigDecimal money;
+	/**
+	 * 生成月份
+	 */
+	@ExcelAttribute(name = "生成月份", maxLength = 6)
+	@Length(max = 6, message = "生成月份不能超过6个字符")
+	@ExcelProperty("生成月份")
+	private String createMonth;
+	/**
+	 * 缴纳月份
+	 */
+	@ExcelAttribute(name = "缴纳月份", maxLength = 6)
+	@Length(max = 6, message = "缴纳月份不能超过6个字符")
+	@ExcelProperty("缴纳月份")
+	private String payMonth;
+	/**
+	 * 数据生成时间
+	 */
+	@ExcelAttribute(name = "数据生成时间", isNotEmpty = true, errorInfo = "数据生成时间不能为空", isDate = true)
+	@NotBlank(message = "数据生成时间不能为空")
+	@ExcelProperty("数据生成时间")
+	private Date createTime;
+	/**
+	 * 数据生成月份
+	 */
+	@ExcelAttribute(name = "数据生成月份", maxLength = 6)
+	@Length(max = 6, message = "数据生成月份不能超过6个字符")
+	@ExcelProperty("数据生成月份")
+	private String dataCreateMonth;
+	/**
+	 * 推送状态：0未推送1已推送
+	 */
+	@ExcelAttribute(name = "推送状态：0未推送1已推送", maxLength = 1)
+	@Length(max = 1, message = "推送状态：0未推送1已推送不能超过1个字符")
+	@ExcelProperty("推送状态：0未推送1已推送")
+	private String pushStatus;
+
+}

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.social.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 收入明细表-全部明细
+ *
+ * @author hgw
+ * @date 2022-08-30 17:34:58
+ */
+@Data
+@TableName("t_income_detail")
+@Schema(description = "收入明细表-全部明细")
+public class TIncomeDetail {
+
+	/**
+	 * 主键
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@ExcelProperty("主键")
+	private String id;
+	/**
+	 * 员工姓名
+	 */
+	@ExcelAttribute(name = "员工姓名", isNotEmpty = true, errorInfo = "员工姓名不能为空", maxLength = 32)
+	@NotBlank(message = "员工姓名不能为空")
+	@Length(max = 32, message = "员工姓名不能超过32个字符")
+	@ExcelProperty("员工姓名")
+	private String empName;
+	/**
+	 * 身份证号
+	 */
+	@ExcelAttribute(name = "身份证号", isNotEmpty = true, errorInfo = "身份证号不能为空", maxLength = 32)
+	@NotBlank(message = "身份证号不能为空")
+	@Length(max = 32, message = "身份证号不能超过32个字符")
+	@ExcelProperty("身份证号")
+	private String empIdcard;
+	/**
+	 * 客户id
+	 */
+	@ExcelAttribute(name = "客户id", maxLength = 32)
+	@Length(max = 32, message = "客户id不能超过32个字符")
+	@ExcelProperty("客户id")
+	private String unitId;
+	/**
+	 * 客户名称
+	 */
+	@ExcelAttribute(name = "客户名称", maxLength = 50)
+	@Length(max = 50, message = "客户名称不能超过50个字符")
+	@ExcelProperty("客户名称")
+	private String unitName;
+	/**
+	 * 客户编码
+	 */
+	@ExcelAttribute(name = "客户编码", maxLength = 32)
+	@Length(max = 32, message = "客户编码不能超过32个字符")
+	@ExcelProperty("客户编码")
+	private String unitNo;
+	/**
+	 * 项目id
+	 */
+	@ExcelAttribute(name = "项目id", maxLength = 32)
+	@Length(max = 32, message = "项目id不能超过32个字符")
+	@ExcelProperty("项目id")
+	private String deptId;
+	/**
+	 * 项目名称
+	 */
+	@ExcelAttribute(name = "项目名称", maxLength = 50)
+	@Length(max = 50, message = "项目名称不能超过50个字符")
+	@ExcelProperty("项目名称")
+	private String deptName;
+	/**
+	 * 项目编码
+	 */
+	@ExcelAttribute(name = "项目编码", maxLength = 30)
+	@Length(max = 30, message = "项目编码不能超过30个字符")
+	@ExcelProperty("项目编码")
+	private String deptNo;
+	/**
+	 * 费用类型：1管理费2风险金
+	 */
+	@ExcelAttribute(name = "费用类型：1管理费2风险金", maxLength = 1)
+	@Length(max = 1, message = "费用类型：1管理费2风险金不能超过1个字符")
+	@ExcelProperty("费用类型：1管理费2风险金")
+	private String feeType;
+	/**
+	 * 收费方式：1按比例2金额-人数3金额-人次
+	 */
+	@ExcelAttribute(name = "收费方式：1按比例2金额-人数3金额-人次", maxLength = 1)
+	@Length(max = 1, message = "收费方式：1按比例2金额-人数3金额-人次不能超过1个字符")
+	@ExcelProperty("收费方式：1按比例2金额-人数3金额-人次")
+	private String feeMode;
+	/**
+	 * 收费标准
+	 */
+	@ExcelAttribute(name = "收费标准", maxLength = 10)
+	@Length(max = 10, message = "收费标准不能超过10个字符")
+	@ExcelProperty("收费标准")
+	private String charges;
+	/**
+	 * 收入来源：1社保2公积金3商险4薪资
+	 */
+	@ExcelAttribute(name = "收入来源：1社保2公积金3商险4薪资", isNotEmpty = true, errorInfo = "收入来源：1社保2公积金3商险4薪资不能为空", maxLength = 1)
+	@NotBlank(message = "收入来源：1社保2公积金3商险4薪资不能为空")
+	@Length(max = 1, message = "收入来源：1社保2公积金3商险4薪资不能超过1个字符")
+	@ExcelProperty("收入来源：1社保2公积金3商险4薪资")
+	private String sourceType;
+	/**
+	 * 金额
+	 */
+	@ExcelAttribute(name = "金额", isNotEmpty = true, errorInfo = "金额不能为空")
+	@NotBlank(message = "金额不能为空")
+	@ExcelProperty("金额")
+	private BigDecimal money;
+	/**
+	 * 生成月份
+	 */
+	@ExcelAttribute(name = "生成月份", maxLength = 6)
+	@Length(max = 6, message = "生成月份不能超过6个字符")
+	@ExcelProperty("生成月份")
+	private String createMonth;
+	/**
+	 * 缴纳月份
+	 */
+	@ExcelAttribute(name = "缴纳月份", maxLength = 6)
+	@Length(max = 6, message = "缴纳月份不能超过6个字符")
+	@ExcelProperty("缴纳月份")
+	private String payMonth;
+	/**
+	 * 数据生成时间
+	 */
+	@ExcelAttribute(name = "数据生成时间", isNotEmpty = true, errorInfo = "数据生成时间不能为空", isDate = true)
+	@NotBlank(message = "数据生成时间不能为空")
+	@ExcelProperty("数据生成时间")
+	private Date createTime;
+	/**
+	 * 数据生成月份
+	 */
+	@ExcelAttribute(name = "数据生成月份", maxLength = 6)
+	@Length(max = 6, message = "数据生成月份不能超过6个字符")
+	@ExcelProperty("数据生成月份")
+	private String dataCreateMonth;
+	/**
+	 * 来源id，红冲使用
+	 */
+	@ExcelAttribute(name = "来源id，红冲使用", isNotEmpty = true, errorInfo = "来源id，红冲使用不能为空", maxLength = 32)
+	@NotBlank(message = "来源id，红冲使用不能为空")
+	@Length(max = 32, message = "来源id，红冲使用不能超过32个字符")
+	@ExcelProperty("来源id，红冲使用")
+	private String sourceId;
+
+}

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

@@ -445,4 +445,9 @@ public class TDispatchImportVo extends RowIndex implements Serializable {
 	@ExcelProperty("派单ID" )
 	private String dispatchId;
 
+	/**
+	 * 订单ID
+	 */
+	private String orderId;
+
 }

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.social.vo;
+
+import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 收入明细表-全部明细
+ *
+ * @author hgw
+ * @date 2022-08-30 17:34:58
+ */
+@Data
+public class TIncomeDetailSearchVo extends TIncomeDetail {
+
+	/**
+	 * 多选导出或删除等操作
+	 */
+	@Schema(description = "选中ID,多个逗号分割")
+	private String ids;
+
+	/**
+	 * 创建时间区间 [开始时间，结束时间]
+	 */
+	@Schema(description = "创建时间区间")
+	private LocalDateTime[] createTimes;
+	/**
+	 * @Author fxj
+	 * 查询数据起
+	 **/
+	@Schema(description = "查询limit  开始")
+	private int limitStart;
+	/**
+	 * @Author fxj
+	 * 查询数据止
+	 **/
+	@Schema(description = "查询limit  数据条数")
+	private int limitEnd;
+
+}

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.social.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 收入明细表-全部明细
+ *
+ * @author hgw
+ * @date 2022-08-30 17:34:58
+ */
+@Data
+public class TIncomeDetailVo extends RowIndex implements Serializable {
+
+	/**
+	 * 主键
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@NotBlank(message = "主键 不能为空")
+	@Length(max = 32, message = "主键 不能超过32 个字符")
+	@ExcelAttribute(name = "主键", isNotEmpty = true, errorInfo = "主键 不能为空", maxLength = 32)
+	@Schema(description = "主键")
+	@ExcelProperty("主键")
+	private String id;
+	/**
+	 * 员工姓名
+	 */
+	@NotBlank(message = "员工姓名 不能为空")
+	@Length(max = 32, message = "员工姓名 不能超过32 个字符")
+	@ExcelAttribute(name = "员工姓名", isNotEmpty = true, errorInfo = "员工姓名 不能为空", maxLength = 32)
+	@Schema(description = "员工姓名")
+	@ExcelProperty("员工姓名")
+	private String empName;
+	/**
+	 * 身份证号
+	 */
+	@NotBlank(message = "身份证号 不能为空")
+	@Length(max = 32, message = "身份证号 不能超过32 个字符")
+	@ExcelAttribute(name = "身份证号", isNotEmpty = true, errorInfo = "身份证号 不能为空", maxLength = 32)
+	@Schema(description = "身份证号")
+	@ExcelProperty("身份证号")
+	private String empIdcard;
+	/**
+	 * 客户id
+	 */
+	@Length(max = 32, message = "客户id 不能超过32 个字符")
+	@ExcelAttribute(name = "客户id", maxLength = 32)
+	@Schema(description = "客户id")
+	@ExcelProperty("客户id")
+	private String unitId;
+	/**
+	 * 客户名称
+	 */
+	@Length(max = 50, message = "客户名称 不能超过50 个字符")
+	@ExcelAttribute(name = "客户名称", maxLength = 50)
+	@Schema(description = "客户名称")
+	@ExcelProperty("客户名称")
+	private String unitName;
+	/**
+	 * 客户编码
+	 */
+	@Length(max = 32, message = "客户编码 不能超过32 个字符")
+	@ExcelAttribute(name = "客户编码", maxLength = 32)
+	@Schema(description = "客户编码")
+	@ExcelProperty("客户编码")
+	private String unitNo;
+	/**
+	 * 项目id
+	 */
+	@Length(max = 32, message = "项目id 不能超过32 个字符")
+	@ExcelAttribute(name = "项目id", maxLength = 32)
+	@Schema(description = "项目id")
+	@ExcelProperty("项目id")
+	private String deptId;
+	/**
+	 * 项目名称
+	 */
+	@Length(max = 50, message = "项目名称 不能超过50 个字符")
+	@ExcelAttribute(name = "项目名称", maxLength = 50)
+	@Schema(description = "项目名称")
+	@ExcelProperty("项目名称")
+	private String deptName;
+	/**
+	 * 项目编码
+	 */
+	@Length(max = 30, message = "项目编码 不能超过30 个字符")
+	@ExcelAttribute(name = "项目编码", maxLength = 30)
+	@Schema(description = "项目编码")
+	@ExcelProperty("项目编码")
+	private String deptNo;
+	/**
+	 * 费用类型：1管理费2风险金
+	 */
+	@Length(max = 1, message = "费用类型：1管理费2风险金 不能超过1 个字符")
+	@ExcelAttribute(name = "费用类型：1管理费2风险金", maxLength = 1)
+	@Schema(description = "费用类型：1管理费2风险金")
+	@ExcelProperty("费用类型：1管理费2风险金")
+	private String feeType;
+	/**
+	 * 收费方式：1按比例2金额-人数3金额-人次
+	 */
+	@Length(max = 1, message = "收费方式：1按比例2金额-人数3金额-人次 不能超过1 个字符")
+	@ExcelAttribute(name = "收费方式：1按比例2金额-人数3金额-人次", maxLength = 1)
+	@Schema(description = "收费方式：1按比例2金额-人数3金额-人次")
+	@ExcelProperty("收费方式：1按比例2金额-人数3金额-人次")
+	private String feeMode;
+	/**
+	 * 收费标准
+	 */
+	@Length(max = 10, message = "收费标准 不能超过10 个字符")
+	@ExcelAttribute(name = "收费标准", maxLength = 10)
+	@Schema(description = "收费标准")
+	@ExcelProperty("收费标准")
+	private String charges;
+	/**
+	 * 收入来源：1社保2公积金3商险4薪资
+	 */
+	@NotBlank(message = "收入来源：1社保2公积金3商险4薪资 不能为空")
+	@Length(max = 1, message = "收入来源：1社保2公积金3商险4薪资 不能超过1 个字符")
+	@ExcelAttribute(name = "收入来源：1社保2公积金3商险4薪资", isNotEmpty = true, errorInfo = "收入来源：1社保2公积金3商险4薪资 不能为空", maxLength = 1)
+	@Schema(description = "收入来源：1社保2公积金3商险4薪资")
+	@ExcelProperty("收入来源：1社保2公积金3商险4薪资")
+	private String sourceType;
+	/**
+	 * 金额
+	 */
+	@NotBlank(message = "金额 不能为空")
+	@ExcelAttribute(name = "金额", isNotEmpty = true, errorInfo = "金额 不能为空")
+	@Schema(description = "金额")
+	@ExcelProperty("金额")
+	private BigDecimal money;
+	/**
+	 * 生成月份
+	 */
+	@Length(max = 6, message = "生成月份 不能超过6 个字符")
+	@ExcelAttribute(name = "生成月份", maxLength = 6)
+	@Schema(description = "生成月份")
+	@ExcelProperty("生成月份")
+	private String createMonth;
+	/**
+	 * 缴纳月份
+	 */
+	@Length(max = 6, message = "缴纳月份 不能超过6 个字符")
+	@ExcelAttribute(name = "缴纳月份", maxLength = 6)
+	@Schema(description = "缴纳月份")
+	@ExcelProperty("缴纳月份")
+	private String payMonth;
+	/**
+	 * 数据生成时间
+	 */
+	@NotBlank(message = "数据生成时间 不能为空")
+	@ExcelAttribute(name = "数据生成时间", isNotEmpty = true, errorInfo = "数据生成时间 不能为空", isDate = true)
+	@Schema(description = "数据生成时间")
+	@ExcelProperty("数据生成时间")
+	private Date createTime;
+	/**
+	 * 数据生成月份
+	 */
+	@Length(max = 6, message = "数据生成月份 不能超过6 个字符")
+	@ExcelAttribute(name = "数据生成月份", maxLength = 6)
+	@Schema(description = "数据生成月份")
+	@ExcelProperty("数据生成月份")
+	private String dataCreateMonth;
+	/**
+	 * 来源id，红冲使用
+	 */
+	@NotBlank(message = "来源id，红冲使用 不能为空")
+	@Length(max = 32, message = "来源id，红冲使用 不能超过32 个字符")
+	@ExcelAttribute(name = "来源id，红冲使用", isNotEmpty = true, errorInfo = "来源id，红冲使用 不能为空", maxLength = 32)
+	@Schema(description = "来源id，红冲使用")
+	@ExcelProperty("来源id，红冲使用")
+	private String sourceId;
+
+}

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.social.vo;
+
+import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 收入明细表
+ *
+ * @author hgw
+ * @date 2022-08-30 17:34:58
+ */
+@Data
+public class TIncomeSearchVo extends TIncome {
+
+	/**
+	 * 多选导出或删除等操作
+	 */
+	@Schema(description = "选中ID,多个逗号分割")
+	private String ids;
+
+	/**
+	 * 创建时间区间 [开始时间，结束时间]
+	 */
+	@Schema(description = "创建时间区间")
+	private LocalDateTime[] createTimes;
+	/**
+	 * @Author fxj
+	 * 查询数据起
+	 **/
+	@Schema(description = "查询limit  开始")
+	private int limitStart;
+	/**
+	 * @Author fxj
+	 * 查询数据止
+	 **/
+	@Schema(description = "查询limit  数据条数")
+	private int limitEnd;
+
+}

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.social.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 收入明细表
+ *
+ * @author hgw
+ * @date 2022-08-30 17:34:58
+ */
+@Data
+public class TIncomeVo extends RowIndex implements Serializable {
+
+	/**
+	 * 主键
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@NotBlank(message = "主键 不能为空")
+	@Length(max = 32, message = "主键 不能超过32 个字符")
+	@ExcelAttribute(name = "主键", isNotEmpty = true, errorInfo = "主键 不能为空", maxLength = 32)
+	@Schema(description = "主键")
+	@ExcelProperty("主键")
+	private String id;
+	/**
+	 * 员工姓名
+	 */
+	@NotBlank(message = "员工姓名 不能为空")
+	@Length(max = 32, message = "员工姓名 不能超过32 个字符")
+	@ExcelAttribute(name = "员工姓名", isNotEmpty = true, errorInfo = "员工姓名 不能为空", maxLength = 32)
+	@Schema(description = "员工姓名")
+	@ExcelProperty("员工姓名")
+	private String empName;
+	/**
+	 * 身份证号
+	 */
+	@NotBlank(message = "身份证号 不能为空")
+	@Length(max = 32, message = "身份证号 不能超过32 个字符")
+	@ExcelAttribute(name = "身份证号", isNotEmpty = true, errorInfo = "身份证号 不能为空", maxLength = 32)
+	@Schema(description = "身份证号")
+	@ExcelProperty("身份证号")
+	private String empIdcard;
+	/**
+	 * 客户id
+	 */
+	@Length(max = 32, message = "客户id 不能超过32 个字符")
+	@ExcelAttribute(name = "客户id", maxLength = 32)
+	@Schema(description = "客户id")
+	@ExcelProperty("客户id")
+	private String unitId;
+	/**
+	 * 客户名称
+	 */
+	@Length(max = 50, message = "客户名称 不能超过50 个字符")
+	@ExcelAttribute(name = "客户名称", maxLength = 50)
+	@Schema(description = "客户名称")
+	@ExcelProperty("客户名称")
+	private String unitName;
+	/**
+	 * 客户编码
+	 */
+	@Length(max = 32, message = "客户编码 不能超过32 个字符")
+	@ExcelAttribute(name = "客户编码", maxLength = 32)
+	@Schema(description = "客户编码")
+	@ExcelProperty("客户编码")
+	private String unitNo;
+	/**
+	 * 项目id
+	 */
+	@Length(max = 32, message = "项目id 不能超过32 个字符")
+	@ExcelAttribute(name = "项目id", maxLength = 32)
+	@Schema(description = "项目id")
+	@ExcelProperty("项目id")
+	private String deptId;
+	/**
+	 * 项目名称
+	 */
+	@Length(max = 50, message = "项目名称 不能超过50 个字符")
+	@ExcelAttribute(name = "项目名称", maxLength = 50)
+	@Schema(description = "项目名称")
+	@ExcelProperty("项目名称")
+	private String deptName;
+	/**
+	 * 项目编码
+	 */
+	@Length(max = 30, message = "项目编码 不能超过30 个字符")
+	@ExcelAttribute(name = "项目编码", maxLength = 30)
+	@Schema(description = "项目编码")
+	@ExcelProperty("项目编码")
+	private String deptNo;
+	/**
+	 * 费用类型：1管理费2风险金
+	 */
+	@Length(max = 1, message = "费用类型：1管理费2风险金 不能超过1 个字符")
+	@ExcelAttribute(name = "费用类型：1管理费2风险金", maxLength = 1)
+	@Schema(description = "费用类型：1管理费2风险金")
+	@ExcelProperty("费用类型：1管理费2风险金")
+	private String feeType;
+	/**
+	 * 收费方式：1按比例2金额-人数3金额-人次
+	 */
+	@Length(max = 1, message = "收费方式：1按比例2金额-人数3金额-人次 不能超过1 个字符")
+	@ExcelAttribute(name = "收费方式：1按比例2金额-人数3金额-人次", maxLength = 1)
+	@Schema(description = "收费方式：1按比例2金额-人数3金额-人次")
+	@ExcelProperty("收费方式：1按比例2金额-人数3金额-人次")
+	private String feeMode;
+	/**
+	 * 收费标准
+	 */
+	@Length(max = 10, message = "收费标准 不能超过10 个字符")
+	@ExcelAttribute(name = "收费标准", maxLength = 10)
+	@Schema(description = "收费标准")
+	@ExcelProperty("收费标准")
+	private String charges;
+	/**
+	 * 收入来源：1社保2公积金3商险4薪资
+	 */
+	@NotBlank(message = "收入来源：1社保2公积金3商险4薪资 不能为空")
+	@Length(max = 1, message = "收入来源：1社保2公积金3商险4薪资 不能超过1 个字符")
+	@ExcelAttribute(name = "收入来源：1社保2公积金3商险4薪资", isNotEmpty = true, errorInfo = "收入来源：1社保2公积金3商险4薪资 不能为空", maxLength = 1)
+	@Schema(description = "收入来源：1社保2公积金3商险4薪资")
+	@ExcelProperty("收入来源：1社保2公积金3商险4薪资")
+	private String sourceType;
+	/**
+	 * 金额
+	 */
+	@NotBlank(message = "金额 不能为空")
+	@ExcelAttribute(name = "金额", isNotEmpty = true, errorInfo = "金额 不能为空")
+	@Schema(description = "金额")
+	@ExcelProperty("金额")
+	private BigDecimal money;
+	/**
+	 * 生成月份
+	 */
+	@Length(max = 6, message = "生成月份 不能超过6 个字符")
+	@ExcelAttribute(name = "生成月份", maxLength = 6)
+	@Schema(description = "生成月份")
+	@ExcelProperty("生成月份")
+	private String createMonth;
+	/**
+	 * 缴纳月份
+	 */
+	@Length(max = 6, message = "缴纳月份 不能超过6 个字符")
+	@ExcelAttribute(name = "缴纳月份", maxLength = 6)
+	@Schema(description = "缴纳月份")
+	@ExcelProperty("缴纳月份")
+	private String payMonth;
+	/**
+	 * 数据生成时间
+	 */
+	@NotBlank(message = "数据生成时间 不能为空")
+	@ExcelAttribute(name = "数据生成时间", isNotEmpty = true, errorInfo = "数据生成时间 不能为空", isDate = true)
+	@Schema(description = "数据生成时间")
+	@ExcelProperty("数据生成时间")
+	private Date createTime;
+	/**
+	 * 数据生成月份
+	 */
+	@Length(max = 6, message = "数据生成月份 不能超过6 个字符")
+	@ExcelAttribute(name = "数据生成月份", maxLength = 6)
+	@Schema(description = "数据生成月份")
+	@ExcelProperty("数据生成月份")
+	private String dataCreateMonth;
+	/**
+	 * 推送状态：0未推送1已推送
+	 */
+	@Length(max = 1, message = "推送状态：0未推送1已推送 不能超过1 个字符")
+	@ExcelAttribute(name = "推送状态：0未推送1已推送", maxLength = 1)
+	@Schema(description = "推送状态：0未推送1已推送")
+	@ExcelProperty("推送状态：0未推送1已推送")
+	private String pushStatus;
+
+}

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

@@ -224,8 +224,8 @@ public class TDispatchInfoController {
     @SysLog("批量新增派单信息记录表")
     @PostMapping("/importListAdd")
     //@PreAuthorize("@pms.hasPermission('demo_tdispatchinfo-batch-import')")
-    public R<List<ErrorMessage>> importListAdd(@RequestBody MultipartFile file){
-        return tDispatchInfoService.importDiy(file.getInputStream());
+    public R<List<ErrorMessage>> importListAdd(@RequestBody MultipartFile file, @RequestParam(required = false)String orderId){
+        return tDispatchInfoService.importDiy(file.getInputStream(),orderId);
     }
 
     /**

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.social.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
+import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * 收入明细表
+ *
+ * @author hgw
+ * @date 2022-08-30 17:34:58
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/tincome")
+@Tag(name = "收入明细表管理")
+public class TIncomeController {
+
+	private final TIncomeService tIncomeService;
+
+
+	/**
+	 * 简单分页查询
+	 *
+	 * @param page    分页对象
+	 * @param tIncome 收入明细表
+	 * @return
+	 */
+	@Operation(description = "简单分页查询")
+	@GetMapping("/page")
+	public R<IPage<TIncome>> getTIncomePage(Page<TIncome> page, TIncomeSearchVo tIncome) {
+		return new R<>(tIncomeService.getTIncomePage(page, tIncome));
+	}
+
+	/**
+	 * 不分页查询
+	 *
+	 * @param tIncome 收入明细表
+	 * @return
+	 */
+	@Operation(summary = "不分页查询", description = "不分页查询")
+	@PostMapping("/noPage")
+	//@PreAuthorize("@pms.hasPermission('social_tincome_get')" )
+	public R<List<TIncome>> getTIncomeNoPage(@RequestBody TIncomeSearchVo tIncome) {
+		return R.ok(tIncomeService.noPageDiy(tIncome));
+	}
+
+	/**
+	 * 通过id查询收入明细表
+	 *
+	 * @param id id
+	 * @return R
+	 */
+	@Operation(summary = "通过id查询", description = "通过id查询：hasPermission('social_tincome_get')")
+	@GetMapping("/{id}")
+	@PreAuthorize("@pms.hasPermission('social_tincome_get')")
+	public R<TIncome> getById(@PathVariable("id") String id) {
+		return R.ok(tIncomeService.getById(id));
+	}
+
+	/**
+	 * 新增收入明细表
+	 *
+	 * @param tIncome 收入明细表
+	 * @return R
+	 */
+	@Operation(summary = "新增收入明细表", description = "新增收入明细表：hasPermission('social_tincome_add')")
+	@SysLog("新增收入明细表")
+	@PostMapping
+	@PreAuthorize("@pms.hasPermission('social_tincome_add')")
+	public R<Boolean> save(@RequestBody TIncome tIncome) {
+		return R.ok(tIncomeService.save(tIncome));
+	}
+
+	/**
+	 * 修改收入明细表
+	 *
+	 * @param tIncome 收入明细表
+	 * @return R
+	 */
+	@Operation(summary = "修改收入明细表", description = "修改收入明细表：hasPermission('social_tincome_edit')")
+	@SysLog("修改收入明细表")
+	@PutMapping
+	@PreAuthorize("@pms.hasPermission('social_tincome_edit')")
+	public R<Boolean> updateById(@RequestBody TIncome tIncome) {
+		return R.ok(tIncomeService.updateById(tIncome));
+	}
+
+	/**
+	 * 通过id删除收入明细表
+	 *
+	 * @param id id
+	 * @return R
+	 */
+	@Operation(summary = "通过id删除收入明细表", description = "通过id删除收入明细表：hasPermission('social_tincome_del')")
+	@SysLog("通过id删除收入明细表")
+	@DeleteMapping("/{id}")
+	@PreAuthorize("@pms.hasPermission('social_tincome_del')")
+	public R<Boolean> removeById(@PathVariable String id) {
+		return R.ok(tIncomeService.removeById(id));
+	}
+
+	/**
+	 * 收入明细表 批量导入
+	 *
+	 * @author hgw
+	 * @date 2022-08-30 17:34:58
+	 **/
+	@SneakyThrows
+	@Operation(description = "批量新增收入明细表 hasPermission('social_tincome-batch-import')")
+	@SysLog("批量新增收入明细表")
+	@PostMapping("/importListAdd")
+	@PreAuthorize("@pms.hasPermission('social_tincome-batch-import')")
+	public R<List<ErrorMessage>> importListAdd(@RequestBody MultipartFile file) {
+		return tIncomeService.importDiy(file.getInputStream());
+	}
+
+	/**
+	 * 收入明细表 批量导出
+	 *
+	 * @author hgw
+	 * @date 2022-08-30 17:34:58
+	 **/
+	@Operation(description = "导出收入明细表 hasPermission('social_tincome-export')")
+	@PostMapping("/export")
+	@PreAuthorize("@pms.hasPermission('social_tincome-export')")
+	public void export(HttpServletResponse response, @RequestBody TIncomeSearchVo searchVo) {
+		tIncomeService.listExport(response, searchVo);
+	}
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TIncomeDetailMapper.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.social.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 收入明细表-全部明细
+ *
+ * @author hgw
+ * @date 2022-08-30 17:34:58
+ */
+@Mapper
+public interface TIncomeDetailMapper extends BaseMapper<TIncomeDetail> {
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TIncomeMapper.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.social.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 收入明细表
+ *
+ * @author hgw
+ * @date 2022-08-30 17:34:58
+ */
+@Mapper
+public interface TIncomeMapper extends BaseMapper<TIncome> {
+    /**
+     * 收入明细表简单分页查询
+     * @param tIncome 收入明细表
+     * @return
+     */
+    IPage<TIncome> getTIncomePage(Page<TIncome> page, @Param("tIncome") TIncome tIncome);
+}

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

@@ -46,7 +46,7 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
      */
     IPage<TDispatchInfoPageVo> getTDispatchInfoPage(Page<TDispatchInfo> page, TDispatchInfoSearchVo tDispatchInfo);
 
-    R<List<ErrorMessage>> importDiy(InputStream inputStream);
+    R<List<ErrorMessage>> importDiy(InputStream inputStream, String orderId);
 
     void listExport(HttpServletResponse response, TDispatchInfoSearchVo searchVo);
 
@@ -56,7 +56,7 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
 	@ShardingTransactionType(TransactionType.BASE)
 	void importTDispatchInfo(List<TDispatchImportVo> excelVOList,
 							 List<ErrorMessage> errorMessageList,
-							 YifuUser user);
+							 YifuUser user, String orderId);
 
 	R<List<ErrorMessage>> importReduceDiy(InputStream inputStream);
 

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.social.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
+
+/**
+ * 收入明细表-全部明细
+ *
+ * @author hgw
+ * @date 2022-08-30 17:34:58
+ */
+public interface TIncomeDetailService extends IService<TIncomeDetail> {
+
+}

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.social.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.util.List;
+
+/**
+ * 收入明细表
+ *
+ * @author hgw
+ * @date 2022-08-30 17:34:58
+ */
+public interface TIncomeService extends IService<TIncome> {
+	/**
+	 * 收入明细表简单分页查询
+	 *
+	 * @param tIncome 收入明细表
+	 * @return
+	 */
+	IPage<TIncome> getTIncomePage(Page<TIncome> page, TIncomeSearchVo tIncome);
+
+	R<List<ErrorMessage>> importDiy(InputStream inputStream);
+
+	void listExport(HttpServletResponse response, TIncomeSearchVo searchVo);
+
+	List<TIncome> noPageDiy(TIncomeSearchVo searchVo);
+}

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

@@ -236,7 +236,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	}
 
 	@Override
-	public R<List<ErrorMessage>> importDiy(InputStream inputStream) {
+	public R<List<ErrorMessage>> importDiy(InputStream inputStream, String orderId) {
 		YifuUser user = SecurityUtils.getUser();
 		if (Common.isEmpty(user)){
 			R.failed(CommonConstants.USER_FAIL);
@@ -284,7 +284,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				 */
 				private void saveData() {
 					log.info("{}条数据，开始存储数据库！", cachedDataList.size());
-					importTDispatchInfo(cachedDataList, errorMessageList,user);
+					importTDispatchInfo(cachedDataList, errorMessageList,user,orderId);
 					log.info("存储数据库成功！");
 				}
 			}).sheet().doRead();
@@ -299,7 +299,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	@ShardingTransactionType(TransactionType.BASE)
 	public void importTDispatchInfo(List<TDispatchImportVo> excelVOList,
 									List<ErrorMessage> errorMessageList,
-									YifuUser user) {
+									YifuUser user, String orderId) {
 		if (!Common.isNotNull(excelVOList)){
 			return;
 		}
@@ -432,6 +432,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				continue;
 			}
 			// 新增派单信息
+			excel.setOrderId(orderId);
 			initDispatchAddInfo(user, dispatchMap, empVo, socialSet, fundSet, excel,socialFund,injury);
 			// 变更社保公积金查询
 			initSocialFundAddInfo(socialFundAddMap, empVo, socialSet, fundSet, setInfoVo, socialFund, excel);
@@ -1002,6 +1003,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 										 TSocialFundInfo socialFund, boolean injury) {
 		TDispatchInfo dispatch = new TDispatchInfo();
 		// 初始化派单项
+		dispatch.setOrderId(excel.getOrderId());
 		initAddHandleItem(excel, socialFund,dispatch,socialSet,injury);
 		dispatch.setOrganName(user.getDeptName());
 		dispatch.setCreateBy(user.getId());

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

@@ -2380,6 +2380,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			socialParam.setFd_3af9ee3d0ba3b6(CommonConstants.EMPTY_STRING);
 			//我司到款单位
 			socialParam.setFd_3b01953871b8be(CommonConstants.EMPTY_STRING);
+			//社保id
+			socialParam.setFd_3b0afbe1f94a08(library.getId());
 
 			String body = ekpSocialUtil.sendToEKP(socialParam);
 			if (Common.isNotNull(body)) {
@@ -2484,6 +2486,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
 			fundParam.setFd_3adfeb84175f28(CommonConstants.EMPTY_STRING);
 			//我司到款单位
 			fundParam.setFd_3b019a2e9bfdd6(CommonConstants.EMPTY_STRING);
+			//公积金id
+			fundParam.setFd_3b0afbaf10df2c(library.getId());
 
 			String body = ekpFundUtil.sendToEKP(fundParam);
 			if (Common.isNotNull(body)) {

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.social.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TIncomeDetailMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeDetailService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+/**
+ * 收入明细表-全部明细
+ *
+ * @author hgw
+ * @date 2022-08-30 17:34:58
+ */
+@Log4j2
+@Service
+public class TIncomeDetailServiceImpl extends ServiceImpl<TIncomeDetailMapper, TIncomeDetail> implements TIncomeDetailService {
+
+}

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.social.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.read.listener.ReadListener;
+import com.alibaba.excel.read.metadata.holder.ReadRowHolder;
+import com.alibaba.excel.util.ListUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TIncomeMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeVo;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 收入明细表
+ *
+ * @author hgw
+ * @date 2022-08-30 17:34:58
+ */
+@Log4j2
+@Service
+public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> implements TIncomeService {
+	/**
+	 * 收入明细表简单分页查询
+	 *
+	 * @param tIncome 收入明细表
+	 * @return
+	 */
+	@Override
+	public IPage<TIncome> getTIncomePage(Page<TIncome> page, TIncomeSearchVo tIncome) {
+		return baseMapper.getTIncomePage(page, tIncome);
+	}
+
+	/**
+	 * 收入明细表批量导出
+	 *
+	 * @return
+	 */
+	@Override
+	public void listExport(HttpServletResponse response, TIncomeSearchVo searchVo) {
+		String fileName = "不良记录批量导出" + DateUtil.getThisTime() + ".xlsx";
+		//获取要导出的列表
+		List<TIncome> list = new ArrayList<>();
+		long count = noPageCountDiy(searchVo);
+		ServletOutputStream out = null;
+		try {
+			out = response.getOutputStream();
+			response.setContentType("multipart/form-data");
+			response.setCharacterEncoding("utf-8");
+			response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
+			// 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
+			//EasyExcel.write(out, TEmpBadRecord.class).sheet("不良记录").doWrite(list);
+			ExcelWriter excelWriter = EasyExcel.write(out, TIncome.class).build();
+			int index = 0;
+			if (count > CommonConstants.ZERO_INT) {
+				for (int i = 0; i <= count; ) {
+					// 获取实际记录
+					searchVo.setLimitStart(i);
+					searchVo.setLimitEnd(CommonConstants.EXCEL_EXPORT_LIMIT);
+					list = noPageDiy(searchVo);
+					if (Common.isNotNull(list)) {
+						ExcelUtil<TIncome> util = new ExcelUtil<>(TIncome.class);
+						for (TIncome vo : list) {
+							util.convertEntity(vo, null, null, null);
+						}
+					}
+					if (Common.isNotNull(list)) {
+						WriteSheet writeSheet = EasyExcel.writerSheet("收入明细表" + index).build();
+						excelWriter.write(list, writeSheet);
+						index++;
+					}
+					i = i + CommonConstants.EXCEL_EXPORT_LIMIT;
+					if (Common.isNotNull(list)) {
+						list.clear();
+					}
+				}
+			} else {
+				WriteSheet writeSheet = EasyExcel.writerSheet("收入明细表" + index).build();
+				excelWriter.write(list, writeSheet);
+			}
+			if (Common.isNotNull(list)) {
+				list.clear();
+			}
+			out.flush();
+			excelWriter.finish();
+		} catch (Exception e) {
+			log.error("执行异常", e);
+		} finally {
+			try {
+				if (null != out) {
+					out.close();
+				}
+			} catch (IOException e) {
+				log.error("执行异常", e);
+			}
+		}
+	}
+
+	@Override
+	public List<TIncome> noPageDiy(TIncomeSearchVo searchVo) {
+		LambdaQueryWrapper<TIncome> wrapper = buildQueryWrapper(searchVo);
+		List<String> idList = Common.getList(searchVo.getIds());
+		if (Common.isNotNull(idList)) {
+			wrapper.in(TIncome::getId, idList);
+		}
+		if (searchVo.getLimitStart() >= 0 && searchVo.getLimitEnd() > 0) {
+			wrapper.last(" limit " + searchVo.getLimitStart() + "," + searchVo.getLimitEnd());
+		}
+		return baseMapper.selectList(wrapper);
+	}
+
+	private Long noPageCountDiy(TIncomeSearchVo searchVo) {
+		LambdaQueryWrapper<TIncome> wrapper = buildQueryWrapper(searchVo);
+		List<String> idList = Common.getList(searchVo.getIds());
+		if (Common.isNotNull(idList)) {
+			wrapper.in(TIncome::getId, idList);
+		}
+		return baseMapper.selectCount(wrapper);
+	}
+
+	private LambdaQueryWrapper buildQueryWrapper(TIncomeSearchVo entity) {
+		LambdaQueryWrapper<TIncome> wrapper = Wrappers.lambdaQuery();
+		if (ArrayUtil.isNotEmpty(entity.getCreateTimes())) {
+			wrapper.ge(TIncome::getCreateTime, entity.getCreateTimes()[0])
+					.le(TIncome::getCreateTime,
+							entity.getCreateTimes()[1]);
+		}
+		return wrapper;
+	}
+
+	@Override
+	public R<List<ErrorMessage>> importDiy(InputStream inputStream) {
+		List<ErrorMessage> errorMessageList = new ArrayList<>();
+		ExcelUtil<TIncomeVo> util1 = new ExcelUtil<>(TIncomeVo.class);
+		// 写法2：
+		// 匿名内部类 不用额外写一个DemoDataListener
+		// 这里 需要指定读用哪个class去读，然后读取第一个sheet 文件流会自动关闭
+		try {
+			EasyExcel.read(inputStream, TIncomeVo.class, new ReadListener<TIncomeVo>() {
+				/**
+				 * 单次缓存的数据量
+				 */
+				public static final int BATCH_COUNT = CommonConstants.BATCH_COUNT;
+				/**
+				 *临时存储
+				 */
+				private List<TIncomeVo> cachedDataList = ListUtils.newArrayListWithExpectedSize(BATCH_COUNT);
+
+				@Override
+				public void invoke(TIncomeVo data, AnalysisContext context) {
+					ReadRowHolder readRowHolder = context.readRowHolder();
+					Integer rowIndex = readRowHolder.getRowIndex();
+					data.setRowIndex(rowIndex + 1);
+					ErrorMessage errorMessage = util1.checkEntity(data, data.getRowIndex());
+					if (Common.isNotNull(errorMessage)) {
+						errorMessageList.add(errorMessage);
+					} else {
+						cachedDataList.add(data);
+					}
+					if (cachedDataList.size() >= BATCH_COUNT) {
+						saveData();
+						// 存储完成清理 list
+						cachedDataList = ListUtils.newArrayListWithExpectedSize(BATCH_COUNT);
+					}
+				}
+
+				@Override
+				public void doAfterAllAnalysed(AnalysisContext context) {
+					saveData();
+				}
+
+				/**
+				 * 加上存储数据库
+				 */
+				private void saveData() {
+					log.info("{}条数据，开始存储数据库！", cachedDataList.size());
+					importTIncome(cachedDataList, errorMessageList);
+					log.info("存储数据库成功！");
+				}
+			}).sheet().doRead();
+		} catch (Exception e) {
+			log.error(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR, e);
+			return R.failed(CommonConstants.IMPORT_DATA_ANALYSIS_ERROR);
+		}
+		return R.ok(errorMessageList);
+	}
+
+	private void importTIncome(List<TIncomeVo> excelVOList, List<ErrorMessage> errorMessageList) {
+		// 个性化校验逻辑
+		ErrorMessage errorMsg;
+		// 执行数据插入操作 组装
+		for (int i = 0; i < excelVOList.size(); i++) {
+			TIncomeVo excel = excelVOList.get(i);
+			// 数据合法情况 TODO
+
+			// 插入
+			insertExcel(excel);
+			errorMessageList.add(new ErrorMessage(excel.getRowIndex(), CommonConstants.SAVE_SUCCESS));
+		}
+	}
+
+	/**
+	 * 插入excel bad record
+	 */
+	private void insertExcel(TIncomeVo excel) {
+		TIncome insert = new TIncome();
+		BeanUtil.copyProperties(excel, insert);
+		this.save(insert);
+	}
+}

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

@@ -2447,6 +2447,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			}
 			//我司到款单位
 			socialParam.setFd_3b01953871b8be(CommonConstants.EMPTY_STRING);
+			//社保id
+			socialParam.setFd_3b0afbe1f94a08(library.getId());
 
 			String body = ekpSocialUtil.sendToEKP(socialParam);
 			if (Common.isNotNull(body)) {
@@ -2551,6 +2553,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			fundParam.setFd_3adfeb84175f28(CommonConstants.EMPTY_STRING);
 			//我司到款单位
 			fundParam.setFd_3b019a2e9bfdd6(CommonConstants.EMPTY_STRING);
+			//公积金id
+			fundParam.setFd_3b0afbaf10df2c(library.getId());
 
 			String body = ekpFundUtil.sendToEKP(fundParam);
 			if (Common.isNotNull(body)) {

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

@@ -24,7 +24,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysArea;
 import com.yifu.cloud.plus.v1.yifu.admin.api.vo.AreaVo;
-import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.*;
@@ -41,7 +40,6 @@ import com.yifu.cloud.plus.v1.yifu.social.service.TPreDispatchInfoService;
 import com.yifu.cloud.plus.v1.yifu.social.util.ServiceUtil;
 import com.yifu.cloud.plus.v1.yifu.social.vo.*;
 import lombok.RequiredArgsConstructor;
-import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -383,7 +381,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			}
 			//  档案地市没问题 开始派单处理
 			if (errorMessageList.size() == CommonConstants.ZERO_INT) {
-				dispatchInfoService.importTDispatchInfo(importVoList, errorMessageList, user);
+				dispatchInfoService.importTDispatchInfo(importVoList, errorMessageList, user, null);
 			}
 			//  处理派增结果
 			errorMessage = handleDispatchAddRes(preInfo, errorMessageList);
@@ -2453,7 +2451,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			}
 			//  档案地市没问题 开始派单处理
 			if (!Common.isNotNull(errorMessageList)){
-				dispatchInfoService.importTDispatchInfo(importVoList, errorMessageList, user);
+				dispatchInfoService.importTDispatchInfo(importVoList, errorMessageList, user, null);
 			}
 			//  处理派增结果
 			handleDispatchAddRes(pre, errorMessageList);

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

@@ -95,6 +95,8 @@
 	<result property="idCardAddress" column="ID_CARD_ADDRESS"/>
 	<result property="applyNo" column="APPLY_NO"/>
 	<result property="createTime" column="CREATE_TIME"/>
+	<result property="orderId" column="ORDER_ID"/>
+
   </resultMap>
 	<resultMap id="dispatchPageMap" type="com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoPageVo" extends="tDispatchInfoMap">
 		<result property="providentHouseholdName" column="PROVIDENT_HOUSEHOLD_NAME"/>
@@ -213,7 +215,8 @@
 		a.ID_CARD_CITY,
 		a.ID_CARD_TOWN,
 		a.ID_CARD_ADDRESS,
-		a.APPLY_NO
+		a.APPLY_NO,
+		a.ORDER_ID
     </sql>
     <sql id="tDispatchInfo_where">
         <if test="tDispatchInfo != null">
@@ -226,6 +229,9 @@
                     <if test="tDispatchInfo.id != null and tDispatchInfo.id.trim() != ''">
                         AND a.ID = #{tDispatchInfo.id}
                     </if>
+					<if test="tDispatchInfo.orderId != null and tDispatchInfo.orderId.trim() != ''">
+						AND a.ORDER_ID = #{tDispatchInfo.orderId}
+					</if>
                     <if test="tDispatchInfo.empId != null and tDispatchInfo.empId.trim() != ''">
                         AND a.EMP_ID = #{tDispatchInfo.empId}
                     </if>

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

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~
+  ~      Copyright (c) 2018-2025, lengleng All rights reserved.
+  ~
+  ~  Redistribution and use in source and binary forms, with or without
+  ~  modification, are permitted provided that the following conditions are met:
+  ~
+  ~ Redistributions of source code must retain the above copyright notice,
+  ~  this list of conditions and the following disclaimer.
+  ~  Redistributions in binary form must reproduce the above copyright
+  ~  notice, this list of conditions and the following disclaimer in the
+  ~  documentation and/or other materials provided with the distribution.
+  ~  Neither the name of the yifu4cloud.com developer nor the names of its
+  ~  contributors may be used to endorse or promote products derived from
+  ~  this software without specific prior written permission.
+  ~  Author: lengleng (wangiegie@gmail.com)
+  ~
+  -->
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.social.mapper.TIncomeDetailMapper">
+
+	<resultMap id="tIncomeDetailMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail">
+		<id property="id" column="ID"/>
+		<result property="empName" column="EMP_NAME"/>
+		<result property="empIdcard" column="EMP_IDCARD"/>
+		<result property="unitId" column="UNIT_ID"/>
+		<result property="unitName" column="UNIT_NAME"/>
+		<result property="unitNo" column="UNIT_NO"/>
+		<result property="deptId" column="DEPT_ID"/>
+		<result property="deptName" column="DEPT_NAME"/>
+		<result property="deptNo" column="DEPT_NO"/>
+		<result property="feeType" column="FEE_TYPE"/>
+		<result property="feeMode" column="FEE_MODE"/>
+		<result property="charges" column="CHARGES"/>
+		<result property="sourceType" column="SOURCE_TYPE"/>
+		<result property="money" column="MONEY"/>
+		<result property="createMonth" column="CREATE_MONTH"/>
+		<result property="payMonth" column="PAY_MONTH"/>
+		<result property="createTime" column="CREATE_TIME"/>
+		<result property="dataCreateMonth" column="DATA_CREATE_MONTH"/>
+		<result property="sourceId" column="SOURCE_ID"/>
+	</resultMap>
+	<sql id="Base_Column_List">
+		a.ID,
+		a.EMP_NAME,
+		a.EMP_IDCARD,
+		a.UNIT_ID,
+		a.UNIT_NAME,
+		a.UNIT_NO,
+		a.DEPT_ID,
+		a.DEPT_NAME,
+		a.DEPT_NO,
+		a.FEE_TYPE,
+		a.FEE_MODE,
+		a.CHARGES,
+		a.SOURCE_TYPE,
+		a.MONEY,
+		a.CREATE_MONTH,
+		a.PAY_MONTH,
+		a.CREATE_TIME,
+		a.DATA_CREATE_MONTH,
+		a.SOURCE_ID
+	</sql>
+	<sql id="tIncomeDetail_where">
+		<if test="tIncomeDetail != null">
+			<if test="tIncomeDetail.id != null and tIncomeDetail.id.trim() != ''">
+				AND a.ID = #{tIncomeDetail.id}
+			</if>
+			<if test="tIncomeDetail.empName != null and tIncomeDetail.empName.trim() != ''">
+				AND a.EMP_NAME = #{tIncomeDetail.empName}
+			</if>
+			<if test="tIncomeDetail.empIdcard != null and tIncomeDetail.empIdcard.trim() != ''">
+				AND a.EMP_IDCARD = #{tIncomeDetail.empIdcard}
+			</if>
+			<if test="tIncomeDetail.unitId != null and tIncomeDetail.unitId.trim() != ''">
+				AND a.UNIT_ID = #{tIncomeDetail.unitId}
+			</if>
+			<if test="tIncomeDetail.unitName != null and tIncomeDetail.unitName.trim() != ''">
+				AND a.UNIT_NAME = #{tIncomeDetail.unitName}
+			</if>
+			<if test="tIncomeDetail.unitNo != null and tIncomeDetail.unitNo.trim() != ''">
+				AND a.UNIT_NO = #{tIncomeDetail.unitNo}
+			</if>
+			<if test="tIncomeDetail.deptId != null and tIncomeDetail.deptId.trim() != ''">
+				AND a.DEPT_ID = #{tIncomeDetail.deptId}
+			</if>
+			<if test="tIncomeDetail.deptName != null and tIncomeDetail.deptName.trim() != ''">
+				AND a.DEPT_NAME = #{tIncomeDetail.deptName}
+			</if>
+			<if test="tIncomeDetail.deptNo != null and tIncomeDetail.deptNo.trim() != ''">
+				AND a.DEPT_NO = #{tIncomeDetail.deptNo}
+			</if>
+			<if test="tIncomeDetail.feeType != null and tIncomeDetail.feeType.trim() != ''">
+				AND a.FEE_TYPE = #{tIncomeDetail.feeType}
+			</if>
+			<if test="tIncomeDetail.feeMode != null and tIncomeDetail.feeMode.trim() != ''">
+				AND a.FEE_MODE = #{tIncomeDetail.feeMode}
+			</if>
+			<if test="tIncomeDetail.charges != null and tIncomeDetail.charges.trim() != ''">
+				AND a.CHARGES = #{tIncomeDetail.charges}
+			</if>
+			<if test="tIncomeDetail.sourceType != null and tIncomeDetail.sourceType.trim() != ''">
+				AND a.SOURCE_TYPE = #{tIncomeDetail.sourceType}
+			</if>
+			<if test="tIncomeDetail.money != null">
+				AND a.MONEY = #{tIncomeDetail.money}
+			</if>
+			<if test="tIncomeDetail.createMonth != null and tIncomeDetail.createMonth.trim() != ''">
+				AND a.CREATE_MONTH = #{tIncomeDetail.createMonth}
+			</if>
+			<if test="tIncomeDetail.payMonth != null and tIncomeDetail.payMonth.trim() != ''">
+				AND a.PAY_MONTH = #{tIncomeDetail.payMonth}
+			</if>
+			<if test="tIncomeDetail.createTime != null">
+				AND a.CREATE_TIME = #{tIncomeDetail.createTime}
+			</if>
+			<if test="tIncomeDetail.dataCreateMonth != null and tIncomeDetail.dataCreateMonth.trim() != ''">
+				AND a.DATA_CREATE_MONTH = #{tIncomeDetail.dataCreateMonth}
+			</if>
+			<if test="tIncomeDetail.sourceId != null and tIncomeDetail.sourceId.trim() != ''">
+				AND a.SOURCE_ID = #{tIncomeDetail.sourceId}
+			</if>
+		</if>
+	</sql>
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~
+  ~      Copyright (c) 2018-2025, lengleng All rights reserved.
+  ~
+  ~  Redistribution and use in source and binary forms, with or without
+  ~  modification, are permitted provided that the following conditions are met:
+  ~
+  ~ Redistributions of source code must retain the above copyright notice,
+  ~  this list of conditions and the following disclaimer.
+  ~  Redistributions in binary form must reproduce the above copyright
+  ~  notice, this list of conditions and the following disclaimer in the
+  ~  documentation and/or other materials provided with the distribution.
+  ~  Neither the name of the yifu4cloud.com developer nor the names of its
+  ~  contributors may be used to endorse or promote products derived from
+  ~  this software without specific prior written permission.
+  ~  Author: lengleng (wangiegie@gmail.com)
+  ~
+  -->
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.social.mapper.TIncomeMapper">
+
+	<resultMap id="tIncomeMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.TIncome">
+		<id property="id" column="ID"/>
+		<result property="empName" column="EMP_NAME"/>
+		<result property="empIdcard" column="EMP_IDCARD"/>
+		<result property="unitId" column="UNIT_ID"/>
+		<result property="unitName" column="UNIT_NAME"/>
+		<result property="unitNo" column="UNIT_NO"/>
+		<result property="deptId" column="DEPT_ID"/>
+		<result property="deptName" column="DEPT_NAME"/>
+		<result property="deptNo" column="DEPT_NO"/>
+		<result property="feeType" column="FEE_TYPE"/>
+		<result property="feeMode" column="FEE_MODE"/>
+		<result property="charges" column="CHARGES"/>
+		<result property="sourceType" column="SOURCE_TYPE"/>
+		<result property="money" column="MONEY"/>
+		<result property="createMonth" column="CREATE_MONTH"/>
+		<result property="payMonth" column="PAY_MONTH"/>
+		<result property="createTime" column="CREATE_TIME"/>
+		<result property="dataCreateMonth" column="DATA_CREATE_MONTH"/>
+		<result property="pushStatus" column="PUSH_STATUS"/>
+	</resultMap>
+	<sql id="Base_Column_List">
+		a.ID,
+		a.EMP_NAME,
+		a.EMP_IDCARD,
+		a.UNIT_ID,
+		a.UNIT_NAME,
+		a.UNIT_NO,
+		a.DEPT_ID,
+		a.DEPT_NAME,
+		a.DEPT_NO,
+		a.FEE_TYPE,
+		a.FEE_MODE,
+		a.CHARGES,
+		a.SOURCE_TYPE,
+		a.MONEY,
+		a.CREATE_MONTH,
+		a.PAY_MONTH,
+		a.CREATE_TIME,
+		a.DATA_CREATE_MONTH,
+		a.PUSH_STATUS
+	</sql>
+	<sql id="tIncome_where">
+		<if test="tIncome != null">
+			<if test="tIncome.id != null and tIncome.id.trim() != ''">
+				AND a.ID = #{tIncome.id}
+			</if>
+			<if test="tIncome.empName != null and tIncome.empName.trim() != ''">
+				AND a.EMP_NAME = #{tIncome.empName}
+			</if>
+			<if test="tIncome.empIdcard != null and tIncome.empIdcard.trim() != ''">
+				AND a.EMP_IDCARD = #{tIncome.empIdcard}
+			</if>
+			<if test="tIncome.unitId != null and tIncome.unitId.trim() != ''">
+				AND a.UNIT_ID = #{tIncome.unitId}
+			</if>
+			<if test="tIncome.unitName != null and tIncome.unitName.trim() != ''">
+				AND a.UNIT_NAME = #{tIncome.unitName}
+			</if>
+			<if test="tIncome.unitNo != null and tIncome.unitNo.trim() != ''">
+				AND a.UNIT_NO = #{tIncome.unitNo}
+			</if>
+			<if test="tIncome.deptId != null and tIncome.deptId.trim() != ''">
+				AND a.DEPT_ID = #{tIncome.deptId}
+			</if>
+			<if test="tIncome.deptName != null and tIncome.deptName.trim() != ''">
+				AND a.DEPT_NAME = #{tIncome.deptName}
+			</if>
+			<if test="tIncome.deptNo != null and tIncome.deptNo.trim() != ''">
+				AND a.DEPT_NO = #{tIncome.deptNo}
+			</if>
+			<if test="tIncome.feeType != null and tIncome.feeType.trim() != ''">
+				AND a.FEE_TYPE = #{tIncome.feeType}
+			</if>
+			<if test="tIncome.feeMode != null and tIncome.feeMode.trim() != ''">
+				AND a.FEE_MODE = #{tIncome.feeMode}
+			</if>
+			<if test="tIncome.charges != null and tIncome.charges.trim() != ''">
+				AND a.CHARGES = #{tIncome.charges}
+			</if>
+			<if test="tIncome.sourceType != null and tIncome.sourceType.trim() != ''">
+				AND a.SOURCE_TYPE = #{tIncome.sourceType}
+			</if>
+			<if test="tIncome.money != null">
+				AND a.MONEY = #{tIncome.money}
+			</if>
+			<if test="tIncome.createMonth != null and tIncome.createMonth.trim() != ''">
+				AND a.CREATE_MONTH = #{tIncome.createMonth}
+			</if>
+			<if test="tIncome.payMonth != null and tIncome.payMonth.trim() != ''">
+				AND a.PAY_MONTH = #{tIncome.payMonth}
+			</if>
+			<if test="tIncome.createTime != null">
+				AND a.CREATE_TIME = #{tIncome.createTime}
+			</if>
+			<if test="tIncome.dataCreateMonth != null and tIncome.dataCreateMonth.trim() != ''">
+				AND a.DATA_CREATE_MONTH = #{tIncome.dataCreateMonth}
+			</if>
+			<if test="tIncome.pushStatus != null and tIncome.pushStatus.trim() != ''">
+				AND a.PUSH_STATUS = #{tIncome.pushStatus}
+			</if>
+		</if>
+	</sql>
+	<!--tIncome简单分页查询-->
+	<select id="getTIncomePage" resultMap="tIncomeMap">
+		SELECT
+		<include refid="Base_Column_List"/>
+		FROM t_income a
+		<where>
+			1=1
+			<include refid="tIncome_where"/>
+		</where>
+	</select>
+</mapper>

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

@@ -156,9 +156,6 @@
                 a.UNIT_UNEMPLOYMENT_SET,
                 a.UNIT_INJURY_SET,
                 a.UNIT_BIRTH_SET,
-                a.PERSONAL_PENSION_SET,
-                a.PERSONAL_MEDICAL_SET,
-                a.PERSONAL_UNEMPLOYMENT_SET,
                 a.UNIT_PENSION_PER,
                 a.UNIT_MEDICAL_PER,
                 a.UNIT_UNEMPLOYMENT_PER,
@@ -240,9 +237,6 @@
         a.UNIT_UNEMPLOYMENT_SET,
         a.UNIT_INJURY_SET,
         a.UNIT_BIRTH_SET,
-        a.PERSONAL_PENSION_SET,
-        a.PERSONAL_MEDICAL_SET,
-        a.PERSONAL_UNEMPLOYMENT_SET,
         a.UNIT_PENSION_PER,
         a.UNIT_MEDICAL_PER,
         a.UNIT_UNEMPLOYMENT_PER,

yifu-upms/yifu-upms-biz/src/main/java/com/yifu.cloud.plus.v1/yifu/admin/controller/UserController.java

@@ -282,7 +282,7 @@ public class UserController {
 	 * @return
 	**/
 	@Inner
-	@GetMapping(value = {"/inner/getAllUserName"})
+	@PostMapping(value = {"/inner/getAllUserName"})
 	public AllUserNaVo getAllUserDTO() {
 		AllUserNaVo naVo = new AllUserNaVo();
 		List<SysUser> sysUsers = userService.list(Wrappers.<SysUser>query().lambda());