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

k8s-bash-test/yifu-order-deployment.yaml

+apiVersion: apps/v1   # 指定api版本，此值必须在kubectl api-versions中
+kind: Deployment      # 指定创建资源的角色/类型
+metadata:             # 资源的元数据/属性
+  name: yifu-order     # 资源的名字，在同一个namespace中必须唯一
+  namespace: qas-mvp  # 部署在哪个namespace中
+spec:                 # 资源规范字段
+  selector:           # 选择器
+    matchLabels:      # 匹配标签
+      app: yifu-order
+  replicas: 1         # 声明副本数目
+  #revisionHistoryLimit: 3 # 保留历史版本
+  #strategy: # 策略
+  #  rollingUpdate: # 滚动更新
+  #    maxSurge: 30% # 最大额外可以存在的副本数，可以为百分比，也可以为整数
+  #    maxUnavailable: 30% # 示在更新过程中能够进入不可用状态的 Pod 的最大值，可以为百分比，也可以为整数
+  #  type: RollingUpdate # 滚动更新策略
+  template:           # 模版
+    metadata:         # 模版
+      labels:         # 设定资源的标签
+        app: yifu-order
+      annotations:
+        dapr.io/enabled: "true"                #设定此参数为 true 注入Dapr sidecar到pod
+        dapr.io/app-id: "yifu-order"            #应用程序唯一 ID。 用于服务发现、状态封装 和 发布/订阅 消费者ID
+        dapr.io/app-port: "5006"               #这个参数告诉Dapr你的应用程序正在监听哪个端口。
+        #dapr.io/log-level: "debug"             #为 Dapr sidecar设置日志级别。 允许的值是debug，info，warn，error。 默认是 info
+        #dapr.io/log-as-json: "false"           #将此参数设置为true以JSON格式输出日志。 默认值为 false.
+        #dapr.io/config: file   	           #告诉 Dapr 要使用哪个配置 CRD
+        dapr.io/app-protocol: "http"    	   #告诉 Dapr 你的应用程序正在使用哪种协议。 有效选项是 http and grpc。 Default is http
+        #dapr.io/app-max-concurrency: "20"	   #限制应用程序的并发量。 有效的数值是大于 0
+        #dapr.io/app-ssl: "false"	           #告诉Dapr通过不安全的SSL连接调用应用程序。 同时适用于HTTP和gRPC。 Traffic between your app and the Dapr sidecar is encrypted with a certificate issued by a non-trusted certificate authority, which is considered insecure. 默认值为 false.
+        dapr.io/metrics-port: "9090"	       #设置 sidecar 度量服务器的端口。 默认值为 9090
+        #dapr.io/sidecar-cpu-limit: 2	     #Dapr sidecar可以使用的最大CPU数量。  默认情况下未设置
+        #dapr.io/sidecar-memory-limit: "800Mi"	     #Dapr sidecar可以使用的最大内存量。默认情况下未设置 请参阅 https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/ 的有效值。
+        #dapr.io/sidecar-cpu-request: 1	     #Dapr sidecar要求的 CPU 数量
+        #dapr.io/sidecar-memory-request	     #Dapr sidecar 请求的内存数量
+        dapr.io/http-max-request-size: "100"	     #增加http和grpc服务器请求正文参数的最大大小，单位为MB，以处理大文件的上传。 默认值为 4 MB
+        dapr.io/http-read-buffer-size: "16"   #Dapr has a default limit of 4KB for the http header read buffer size. When sending http headers that are bigger than the default 4KB, you can increase this value. Otherwise, you may encounter a Too big request header
+        dapr.io/sidecar-listen-addresses: "0.0.0.0"
+        # 更多dapr配置请参考 https://www.bookstack.cn/read/dapr-1.5-zh/cc77b74e2cc2f4d4.md
+
+    spec:             # 资源规范字段
+      nodeSelector:   # node 选择器
+        node-type: worker  # node标签
+        kubernetes.io/hostname: yfmaster1
+      containers:     # 容器
+        - name: yifu-order  # 容器的名字
+          image: hub.worfu.com/qas-mvp/yifu-order-biz:1.0.0 #临时地址
+          # image: 192.168.1.110:5500/qas-mvp/yifu-order-biz:1.0.0  # 容器镜像地址
+          imagePullPolicy: Always  # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent
+                                   # Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时，
+                                   # 已经打好镜像存在docker容器中时，使用存在不检查级别，
+                                   # 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败）
+          ports:
+            - containerPort: 5006  # 容器端口
+          env:                     # 启动环境配置信息  active and timeZone set
+            - name: SPRING_PROFILES_ACTIVE
+              value: test
+            - name: TZ
+              value: Asia/Shanghai
+          resources:               #资源配置限制
+            limits:                # 最大使用
+              memory: "2048Mi"
+              #cpu: 300m # CPU，1核心 = 1000m
+            requests:             # 容器运行时，最低资源需求，也就是说最少需要多少资源容器才能正常运行
+              #cpu: 100m
+              memory: "500Mi"
+          #livenessProbe: # pod 内部健康检查的设置
+          #  httpGet: # 通过httpget检查健康，返回200-399之间，则认为容器正常
+          #    path: /healthCheck # URI地址
+          #    port: 8080 # 端口
+          #    scheme: HTTP # 协议
+          #    # host: 127.0.0.1 # 主机地址
+          #  initialDelaySeconds: 30 # 表明第一次检测在容器启动后多长时间后开始
+          #  timeoutSeconds: 5 # 检测的超时时间
+          #  periodSeconds: 30 # 检查间隔时间
+          #  successThreshold: 1 # 成功门槛
+          #  failureThreshold: 5 # 失败门槛，连接失败5次，pod杀掉，重启一个新的pod
+          #  readinessProbe: # Pod 准备服务健康检查设置
+           #   httpGet:
+           #     path: /healthCheck
+           #     port: 8080
+           #     scheme: HTTP
+           #   initialDelaySeconds: 30
+           #   timeoutSeconds: 5
+           #   periodSeconds: 10
+           #   successThreshold: 1
+           #   failureThreshold: 5
+            #也可以用这种方法
+            #exec: 执行命令的方法进行监测，如果其退出码不为0，则认为容器正常
+            #  command:
+            #    - cat
+            #    - /tmp/health
+            #也可以用这种方法
+            #tcpSocket: # 通过tcpSocket检查健康
+            #  port: number
+            #ports:
+            #  - name: http # 名称
+            #    containerPort: 8080 # 容器开发对外的端口
+            #    protocol: TCP # 协议
+      imagePullSecrets:        # 镜像仓库拉取密钥
+        - name: login
+      #affinity: # 亲和性调试
+      #  nodeAffinity: # 节点亲和力
+      #    requiredDuringSchedulingIgnoredDuringExecution: # pod 必须部署到满足条件的节点上
+      #      nodeSelectorTerms: # 节点满足任何一个条件就可以
+      #        - matchExpressions: # 有多个选项，则只有同时满足这些逻辑选项的节点才能运行 pod
+      #            - key: beta.kubernetes.io/arch
+      #              operator: In
+      #              values:
+      #                - amd64
\ No newline at end of file

k8s-bash-test/yifu-order-service.yaml

+apiVersion: v1                 # 指定api版本，此值必须在kubectl api-versions中
+kind: Service                  # 指定创建资源的角色/类型
+metadata:                      # 资源的元数据/属性
+  labels:                      # 设定资源的标签
+    app: yifu-order             # 资源的名字，在同一个namespace中必须唯一
+  name: yifu-order              # 资源的名字，在同一个namespace中必须唯一
+  namespace: qas-mvp           # 部署在哪个namespace中
+spec:                          # 资源规范字段
+  ports:
+    - port: 5006               # service 端口
+      protocol: TCP            # 协议
+      targetPort: 5006         # 容器暴露的端口
+      name: http-order              # 端口名称
+    - port: 3500               # service 端口
+      protocol: TCP            # 协议
+      targetPort: 3500         # 容器暴露的端口
+      name: http-order-dapr
+  selector:                    # 选择器
+    app: yifu-order             # 资源名称
+  type: ClusterIP              # ClusterIP 类型
\ No newline at end of file

pom.xml

@@ -101,6 +101,7 @@
 		<module>yifu-social</module>
         <module>yifu-insurances</module>
 		<module>yifu-salary</module>
+        <module>yifu-order</module>
 	</modules>
 
 	<dependencyManagement>

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

@@ -472,4 +472,5 @@ public interface CommonConstants {
 	 **/
 	public static final String PARAM_INFO_ERROR = "传参有误！";
 
+
 }

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

@@ -11,6 +11,10 @@ public class InsurancesConstants {
 	 * 新增
 	 */
 	public static final String ADD = "“新增”提交申请";
+	/**
+	 * 替换导出新增
+	 */
+	public static final String ADD_ = "新增";
 	/**
 	 * 离职
 	 */
@@ -985,8 +989,25 @@ public class InsurancesConstants {
 	 */
 	public static final String INSURANCE_ENCLOSURE_DELETE_ABNORMAL = "电子保单删除异常";
 
+	/**
+	 * 未结算
+	 */
+	public static final String SETTLE_ZERO = "未结算";
 
+	/**
+	 * 已结算
+	 */
+	public static final String SETTLE_ONE = "已结算";
 
+	/**
+	 * 结算中
+	 */
+	public static final String SETTLE_TWO = "结算中";
+
+	/**
+	 * 无需结算
+	 */
+	public static final String SETTLE_THREE = "无需结算";
 
 
 

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

@@ -5,6 +5,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -30,6 +32,11 @@ public class TInsuranceEkp implements Serializable {
      */
     private String defaultSettleId;
 
+	/**
+	 * 单据类型 (0、与薪资合并结算 1、单独结算)
+	 */
+	private Integer settleType;
+
     /**
      * 项目编码
      */
@@ -88,12 +95,12 @@ public class TInsuranceEkp implements Serializable {
     /**
      * 保单开始时间
      */
-    private Date policyStart;
+    private LocalDate policyStart;
 
     /**
      * 保单结束时间
      */
-    private Date policyEnd;
+    private LocalDate policyEnd;
 
     /**
      * 购买标准
@@ -113,12 +120,12 @@ public class TInsuranceEkp implements Serializable {
     /**
      * 实际保费
      */
-    private String actualPremium;
+    private BigDecimal actualPremium;
 
     /**
      * 预估保费
      */
-    private String estimatePremium;
+    private BigDecimal estimatePremium;
 
     /**
      * 结算月
@@ -128,12 +135,12 @@ public class TInsuranceEkp implements Serializable {
     /**
      * 单据状态
      */
-    private String interactiveType;
+    private Integer interactiveType;
 
     /**
      * 重发标识
      */
-    private String resendFlag;
+    private Integer resendFlag;
 
     /**
      * 创建时间

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/EKPUtil.java

@@ -88,6 +88,7 @@ public class EKPUtil {
 		TInsuranceSettlePushParam pushParam = insuranceDetail2PushParam(param);
 		try{
 			String formValues = new ObjectMapper().writeValueAsString(pushParam);
+			log.info("formValues:"+formValues);
 			//指向EKP的接口url
 			//把ModelingAppModelParameterAddForm转换成MultiValueMap
 			JSONObject loginName = new JSONObject();
@@ -104,7 +105,7 @@ public class EKPUtil {
 			//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") );
-			System.out.println("wholeForm:"+wholeForm);
+			//System.out.println("wholeForm:"+wholeForm);
 			HttpHeaders headers = new HttpHeaders();
 			//如果EKP对该接口启用了Basic认证，那么客户端需要加入
 			//addAuth(headers,"yourAccount"+":"+"yourPassword");是VO，则使用APPLICATION_JSON

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

@@ -15,23 +15,28 @@ import java.io.Serializable;
 @Tag(name = "EKP结算信息表")
 public class SettleVo implements Serializable {
 
+	/**
+	 * 主键id
+	 */
+	private String id;
+
 	/**
 	 * 结算id
 	 */
 	@Schema(description = "结算id")
-	private String fd_3b05ba46bb042e;
+	private String detailId;
 
 	/**
 	 * 预估单结算状态
 	 */
 	@Schema(description = "预估单结算状态:未结算、已结算、结算中、无需结算")
-	private String fd_3b05ba4808a3ca;
+	private String estimateStatus;
 
 	/**
 	 * 实缴单结算状态
 	 */
 	@Schema(description = "实缴单结算状态:未结算、已结算、结算中、无需结算")
-	private String fd_3b05bd5ed0b976;
+	private String actualStatus;
 
 
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/config/EkpDataSourceConfig.java

+package com.yifu.cloud.plus.v1.yifu.insurances.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.config.MybatisPlusMetaObjectHandler;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.plugins.YifuPaginationInnerInterceptor;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.sql.DataSource;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-25 17:03:43
+ */
+@Configuration
+@MapperScan(basePackages = "com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp", sqlSessionTemplateRef = "ekpSqlSessionTemplate", sqlSessionFactoryRef = "ekpSqlSessionFactory")
+public class EkpDataSourceConfig {
+	/**
+	 * 配置ekp的数据源
+	 * @return
+	 */
+	@Bean(name="ekpDataSource")
+	@ConfigurationProperties(prefix = "spring.datasource.ekp")
+	public DataSource ekpDataSource() {
+			return DataSourceBuilder.create().build();
+		}
+
+	/**
+	 * 配置该数据源的sql会话工厂
+	 * @param dataSource
+	 * @return
+	 * @throws Exception
+	 */
+	@Bean
+	public SqlSessionFactory ekpSqlSessionFactory(@Qualifier("ekpDataSource") DataSource dataSource) throws Exception {
+		MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+		bean.setDataSource(dataSource);
+		//添加XML目录
+		ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+		try {
+			bean.setMapperLocations(resolver.getResources("classpath:mapper/ekp/*.xml"));
+			//分页插件配置,不配置分页插件无效,否则会出现total为0的情况
+			bean.setPlugins(ekpPlusInterceptor());
+			return bean.getObject();
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e);
+		}
+/*		MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+		bean.setDataSource(dataSource);
+		MybatisConfiguration configuration = new MybatisConfiguration();
+		configuration.setMapUnderscoreToCamelCase(true);
+		bean.setConfiguration(configuration);
+		bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/ekp/*.xml"));
+		return bean.getObject();*/
+	}
+
+	/**
+	 * 配置该数据源的事务管理器
+	 * @param dataSource
+	 * @return
+	 */
+	@Bean
+	public DataSourceTransactionManager ekpTransactionManager(@Qualifier("ekpDataSource") DataSource dataSource) {
+		return new DataSourceTransactionManager(dataSource);
+	}
+
+	/**
+	 * 配置ekp数据源的sql会话模板
+	 * @param sqlSessionFactory
+	 * @return
+	 */
+	@Bean
+	public SqlSessionTemplate ekpSqlSessionTemplate(@Qualifier("ekpSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
+		return new SqlSessionTemplate(sqlSessionFactory);
+	}
+	/**
+	 * 配置ekp数据源的事务模板
+	 * @param dataSourceTransactionManager
+	 * @return
+	 */
+	@Bean
+	public TransactionTemplate ekpTransactionTemplate(@Qualifier("ekpTransactionManager") DataSourceTransactionManager dataSourceTransactionManager) {
+		return new TransactionTemplate(dataSourceTransactionManager);
+	}
+
+	@Bean
+	public MybatisPlusInterceptor ekpPlusInterceptor() {
+		MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+		interceptor.addInnerInterceptor(new YifuPaginationInnerInterceptor());
+		return interceptor;
+	}
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/config/InsurancesDataSourceConfig.java

+package com.yifu.cloud.plus.v1.yifu.insurances.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.config.MybatisPlusMetaObjectHandler;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.plugins.YifuPaginationInnerInterceptor;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.sql.DataSource;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-25 16:57:06
+ */
+@Configuration
+@MapperScan(basePackages = "com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances", sqlSessionTemplateRef = "insurancesSqlSessionTemplate", sqlSessionFactoryRef = "insurancesSqlSessionFactory")
+public class InsurancesDataSourceConfig {
+
+	@Bean(name = "insurancesDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.insurances")
+	@Primary
+    public DataSource insurancesDataSource() {
+		         return DataSourceBuilder.create().build();
+	}
+	@Bean
+     public SqlSessionFactory insurancesSqlSessionFactory(@Qualifier("insurancesDataSource") DataSource dataSource) throws Exception {
+
+		MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+		bean.setDataSource(dataSource);
+		//多数据源 myMetaObjectHandler不起作用问题解决
+		GlobalConfig globalConfig = new GlobalConfig();
+		globalConfig.setMetaObjectHandler(new MybatisPlusMetaObjectHandler());
+		globalConfig.setDbConfig(new GlobalConfig.DbConfig());
+		bean.setGlobalConfig(globalConfig);
+		//添加XML目录
+		ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+		try {
+			bean.setMapperLocations(resolver.getResources("classpath:mapper/insurances/*.xml"));
+			//分页插件配置,不配置分页插件无效,否则会出现total为0的情况
+			bean.setPlugins(insurancesPlusInterceptor());
+			SqlSessionFactory sqlSessionFactory = bean.getObject();
+			assert sqlSessionFactory != null;
+			sqlSessionFactory.getConfiguration().setMapUnderscoreToCamelCase(true);
+			return bean.getObject();
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e);
+		}
+
+/*		MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+		bean.setDataSource(dataSource);
+		MybatisConfiguration configuration = new MybatisConfiguration();
+		configuration.setMapUnderscoreToCamelCase(true);
+		bean.setConfiguration(configuration);
+		bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/insurances/*.xml"));
+		return bean.getObject();*/
+	}
+
+
+	@Bean
+     public DataSourceTransactionManager insurancesTransactionManager(@Qualifier("insurancesDataSource") DataSource dataSource) {
+		         return new DataSourceTransactionManager(dataSource);
+	}
+	@Bean
+     public SqlSessionTemplate insurancesSqlSessionTemplate(@Qualifier("insurancesSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
+		        return new SqlSessionTemplate(sqlSessionFactory);
+	}
+	@Bean
+	public TransactionTemplate insurancesTransactionTemplate(@Qualifier("insurancesTransactionManager") DataSourceTransactionManager dataSourceTransactionManager) {
+	         return new TransactionTemplate(dataSourceTransactionManager);
+   }
+
+	@Bean
+	public MybatisPlusInterceptor insurancesPlusInterceptor() {
+		MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+		interceptor.addInnerInterceptor(new YifuPaginationInnerInterceptor());
+		return interceptor;
+	}
+}

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.insurances.entity.TInsuranceCompany;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceCompanyService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceCompanyService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;

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

@@ -11,7 +11,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.Dept;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

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

 package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceEkpService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;

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

 package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
 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.insurances.entity.TInsuranceEnclosure;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceEnclosureService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEnclosureService;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceEnclosureParam;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListParam;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO;
-import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAtta;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,7 +16,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.net.URL;
 
 /**
  * @author zhaji

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

@@ -4,21 +4,17 @@ 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.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
-import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceRefundHandlingParam;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeService;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * @author zhaji

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

@@ -2,19 +2,16 @@ package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 
 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.insurances.entity.TInsuranceCompany;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeRateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeRateService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * @author zhaji

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

@@ -2,15 +2,13 @@ package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 
 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.insurances.entity.TInsuranceTypeRate;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeStandardService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeStandardService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp;
+
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-26 09:12:46
+ */
+@Mapper
+public interface EkpSettleMapper {
+	/**
+	 * 获取结算信息
+	 *
+	 * @author zhaji
+	 * @param id
+	 * @return {@link SettleVo}
+	 */
+	SettleVo getSettle(String id);
+}

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

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettleCancel;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/ekp/EkpSettleService.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.ekp;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-26 09:25:36
+ */
+public interface EkpSettleService extends IService<TInsuranceTypeRate> {
+
+	/**
+	 * 新增保险公司
+	 *
+	 * @author zhaji
+	 * @param id 新增类
+	 * @return {@link R}
+	 */
+	SettleVo getSettle(String id);
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/ekp/impl/EkpSettleServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp.EkpSettleMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpSettleService;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-26 09:25:51
+ */
+@Service
+public class EkpSettleServiceImpl implements EkpSettleService {
+
+	@Resource
+	EkpSettleMapper ekpSettleMapper;
+	@Override
+	public SettleVo getSettle(String id) {
+		return ekpSettleMapper.getSettle(id);
+	}
+
+	@Override
+	public boolean saveBatch(Collection<TInsuranceTypeRate> entityList, int batchSize) {
+		return false;
+	}
+
+	@Override
+	public boolean saveOrUpdateBatch(Collection<TInsuranceTypeRate> entityList, int batchSize) {
+		return false;
+	}
+
+	@Override
+	public boolean updateBatchById(Collection<TInsuranceTypeRate> entityList, int batchSize) {
+		return false;
+	}
+
+	@Override
+	public boolean saveOrUpdate(TInsuranceTypeRate entity) {
+		return false;
+	}
+
+	@Override
+	public TInsuranceTypeRate getOne(Wrapper<TInsuranceTypeRate> queryWrapper, boolean throwEx) {
+		return null;
+	}
+
+	@Override
+	public Map<String, Object> getMap(Wrapper<TInsuranceTypeRate> queryWrapper) {
+		return null;
+	}
+
+	@Override
+	public <V> V getObj(Wrapper<TInsuranceTypeRate> queryWrapper, Function<? super Object, V> mapper) {
+		return null;
+	}
+
+	@Override
+	public BaseMapper<TInsuranceTypeRate> getBaseMapper() {
+		return null;
+	}
+
+	@Override
+	public Class<TInsuranceTypeRate> getEntityClass() {
+		return null;
+	}
+}

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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.insurances.entity.TInsuranceEkp;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceEkpMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceEkpService;
-import com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.EKPInteractiveParam;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
-* @author Administrator
-* @description 针对表【t_insurance_ekp(ekp交互失败存储表)】的数据库操作Service实现
-* @createDate 2022-08-23 17:02:49
-*/
-@Service
-public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, TInsuranceEkp> implements TInsuranceEkpService {
-
-	@Override
-	public R resend() {
-		List<TInsuranceEkp> ekpRefundList = this.baseMapper.getEkpRefundList();
-		if (CollectionUtils.isNotEmpty(ekpRefundList)){
-			for (TInsuranceEkp tInsuranceEkp : ekpRefundList) {
-				EKPInteractiveParam ekpParam = new EKPInteractiveParam();
-				BeanCopyUtils.copyProperties(tInsuranceEkp,ekpParam);
-				String detailId = ekpParam.getDetailId();
-				String defaultSettleId = ekpParam.getDefaultSettleId();
-				//查询当前结算状态
-				String status = CommonConstants.ONE_STRING;
-				if(status.equals(CommonConstants.ONE_STRING)){
-
-				}
-			}
-			return R.ok("发送成功");
-		}else{
-			return R.failed("无需要发送的信息");
-		}
-	}
-}

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettleCancel;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -14,13 +14,14 @@ import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceCompanyMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceCompanyService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceCompanyMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceCompanyService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceOperateService;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
@@ -102,6 +103,7 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 	 * @return {@link R}
 	 */
 	@Override
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R updateInsuranceCompany(TInsuranceCompany insuranceCompany) {
 		YifuUser user = SecurityUtils.getUser();
 		String id = insuranceCompany.getId();
@@ -164,6 +166,7 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 	 * @return {@link R}
 	 */
 	@Override
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R deleteById(String id) {
 		YifuUser user = SecurityUtils.getUser();
 		LambdaQueryWrapper<TInsuranceCompany> queryWrapper = new LambdaQueryWrapper<>();

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -19,12 +19,12 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 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.dapr.util.CheckDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.*;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceDetailMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.*;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceDetailMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpSettleService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.*;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.*;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
 import lombok.extern.slf4j.Slf4j;
@@ -80,7 +80,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	private TInsuranceRefundService tInsuranceRefundService;
 	@Resource
 	private TInsuranceEkpService tInsuranceEkpService;
-
+	@Resource
+	private EkpSettleService ekpSettleService;
 
 
 	@Resource
@@ -265,7 +266,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @author licancan
 	 */
 	@Override
-	@Transactional(rollbackFor = {Exception.class})
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R<List<InsuranceAddParam>> addInsurance(List<InsuranceAddParam> paramList) {
 		if (CollectionUtils.isEmpty(paramList)){
 			return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
@@ -312,7 +313,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @author licancan
 	 */
 	@Override
-	@Transactional(rollbackFor = {Exception.class})
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R<List<InsuranceBatchParam>> batchInsurance(List<InsuranceBatchParam> paramList) {
 		if (CollectionUtils.isEmpty(paramList)){
 			return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
@@ -357,7 +358,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @author licancan
 	 */
 	@Override
-	@Transactional(rollbackFor = {Exception.class})
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R<List<InsuranceReplaceParam>> replaceInsurance(List<InsuranceReplaceParam> paramList) {
 		if (CollectionUtils.isEmpty(paramList)){
 			return R.failed(CommonConstants.DATA_CAN_NOT_EMPTY);
@@ -776,6 +777,20 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				}
 			}
 
+			//减员类型 处理创建人、创建时间、备注
+			if(CommonConstants.FIVE_INT == insuranceDetailVO.getDistributeType()){
+				TInsuranceRefund refund = tInsuranceRefundService.getOne(Wrappers.<TInsuranceRefund>query().lambda()
+						.eq(TInsuranceRefund::getInsDetailId, insuranceDetailVO.getId())
+						.orderByDesc(TInsuranceRefund::getUpdateTime)
+						.last(CommonConstants.LAST_ONE_SQL)
+				);
+				if (Optional.ofNullable(refund).isPresent()){
+					insuranceDetailVO.setCreateName(refund.getCreateName());
+					insuranceDetailVO.setCreateTime(refund.getCreateTime());
+					insuranceDetailVO.setRemark(refund.getRemark());
+				}
+			}
+
 			R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(Arrays.asList(insuranceDetailVO.getDeptNo()));
 			if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
 				Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
@@ -880,7 +895,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			List<InsuranceExportListVO> list = new ArrayList<>();
 			if(CollectionUtils.isNotEmpty(listVOS)){
 				for (InsuranceExportListVO listVO : listVOS) {
-					listVO.setRemark(InsurancesConstants.ADD);
+					listVO.setRemark(InsurancesConstants.ADD_);
 					TInsuranceReplace one = tInsuranceReplaceService.getOne(Wrappers.<TInsuranceReplace>query().lambda()
 							.eq(TInsuranceReplace::getToInsuranceDetailId, listVO.getId())
 							.last(CommonConstants.LAST_ONE_SQL));
@@ -3087,7 +3102,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @return {@link List<  RefundExportListVo >}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R<List<RefundExportListVo>> getInsuranceRefundHandlingList(RefundExportListParam param){
 		YifuUser user = SecurityUtils.getUser();
 		List<RefundExportListVo> refundExportList;
@@ -3160,7 +3175,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R updateInsuranceRefund(InsuranceRefundListParam insuranceDetail) {
 		Integer refundType = insuranceDetail.getRefundType();
 		if(CommonConstants.THREE_INT != refundType && CommonConstants.FOUR_INT != refundType){
@@ -3237,7 +3252,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @param
 	 * @return void
 	 */
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	@Override
 	public R insuranceRefundImport(List<InsuranceHandleImportParam> insuranceRefundImportList) {
 		YifuUser user = SecurityUtils.getUser();
@@ -3294,7 +3309,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @param
 	 * @return void
 	 */
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	@Override
 	public R settleMonthChange(List<SettleMonthChangeCheckParam> settleMonthCheckList) {
 		//初始化线程池
@@ -3373,7 +3388,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R deptChange(List<DeptChangeCheckParam> deptChangeCheckList) {
 		//初始化线程池
 		ThreadPoolExecutor threadPool = new ThreadPoolExecutor(50, 50, 100, TimeUnit.SECONDS, new LinkedBlockingQueue<>(10));
@@ -3950,7 +3965,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R updateIsUse(String id) {
 		YifuUser user = SecurityUtils.getUser();
 		TInsuranceDetail insuranceDetail = getById(id);
@@ -5280,12 +5295,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	public SettleVo getInsuranceDetailSettleStatus(String detailId,String settleId){
 		String id = detailId+CommonConstants.DOWN_LINE_STRING+settleId;
 		//获取ekp结算信息
-		SettleVo settleVo = new SettleVo();
-		//id
-		settleVo.setFd_3b05ba46bb042e(id);
-		settleVo.setFd_3b05ba4808a3ca("预估单结算状态");
-		settleVo.setFd_3b05bd5ed0b976("实缴单结算状态");
-		return settleVo;
+		SettleVo settle = ekpSettleService.getSettle(id);
+		return settle;
 	}
 
 	/**

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

+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.insurances.constants.InsurancesConstants;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceEkpMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpSettleService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpService;
+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.SettleVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_ekp(ekp交互失败存储表)】的数据库操作Service实现
+* @createDate 2022-08-23 17:02:49
+*/
+@Service
+@Slf4j
+public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, TInsuranceEkp> implements TInsuranceEkpService {
+
+	@Resource
+	TInsuranceSettleService tInsuranceSettleService;
+	@Resource
+	@Lazy
+	TInsuranceDetailService tInsuranceDetailService;
+
+	@Resource
+	@Lazy
+	EkpSettleService ekpSettleService;
+
+
+	@Override
+	public R resend() {
+		List<TInsuranceEkp> ekpRefundList = this.baseMapper.getEkpRefundList();
+		List<TInsuranceEkp> failList = new ArrayList<>();
+		List<TInsuranceEkp> successLit = new ArrayList<>();
+		SettleVo settle = ekpSettleService.getSettle("12345");
+		String actualStatus = settle.getActualStatus();
+		log.info("settle:"+settle.toString());
+		log.info("actualStatus:"+actualStatus);
+		if (CollectionUtils.isNotEmpty(ekpRefundList)){
+			for (TInsuranceEkp tInsuranceEkp : ekpRefundList) {
+				Integer pushType = tInsuranceEkp.getPushType();
+				LambdaQueryWrapper<TInsuranceSettle> queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.eq(TInsuranceSettle :: getId,tInsuranceEkp.getDefaultSettleId());
+				TInsuranceSettle insuranceSettle = tInsuranceSettleService.getOne(queryWrapper);
+				//如果当前需要重发预估保费的数据已发送，则过滤掉执行下一条数据
+				if(CommonConstants.ONE_INT == pushType && CommonConstants.ONE_INT == insuranceSettle.getIsEstimatePush()){
+					tInsuranceEkp.setResendFlag(CommonConstants.THREE_INT);
+					failList.add(tInsuranceEkp);
+					continue;
+				}
+				//如果当前需要重发实际保费的数据已发送，则过滤掉执行下一条数据
+				if(CommonConstants.TWO_INT == pushType && CommonConstants.ONE_INT == insuranceSettle.getIsActualPush()){
+					tInsuranceEkp.setResendFlag(CommonConstants.THREE_INT);
+					failList.add(tInsuranceEkp);
+					continue;
+				}
+				EKPInteractiveParam ekpParam = new EKPInteractiveParam();
+				BeanCopyUtils.copyProperties(tInsuranceEkp,ekpParam);
+				String detailId = ekpParam.getDetailId();
+				String defaultSettleId = ekpParam.getDefaultSettleId();
+				//查询当前结算状态
+				String status = CommonConstants.ONE_STRING;
+				if(actualStatus.equals(InsurancesConstants.SETTLE_ZERO)){
+					String s = EKPUtil.sendToEKP(ekpParam);
+					//如果发送成功
+					if (StringUtils.isNotBlank(s)){
+						//预估则更新预估保费
+						if(CommonConstants.ONE_INT == pushType){
+							LambdaUpdateWrapper<TInsuranceSettle> updateWrapper = new LambdaUpdateWrapper<>();
+							updateWrapper.eq(TInsuranceSettle :: getId,tInsuranceEkp.getDefaultSettleId())
+									.set(TInsuranceSettle :: getIsEstimatePush,CommonConstants.ONE_INT)
+									.set(TInsuranceSettle :: getEstimatePushTime, LocalDateTime.now());
+							tInsuranceSettleService.update(updateWrapper);
+						}
+						//预估则更新预估保费
+						if(CommonConstants.TWO_INT == pushType){
+							LambdaUpdateWrapper<TInsuranceSettle> updateWrapper = new LambdaUpdateWrapper<>();
+							updateWrapper.eq(TInsuranceSettle :: getId,tInsuranceEkp.getDefaultSettleId())
+									.set(TInsuranceSettle :: getIsActualPush,CommonConstants.ONE_INT)
+									.set(TInsuranceSettle :: getActualPushTime, LocalDateTime.now());
+							tInsuranceSettleService.update(updateWrapper);
+						}
+						//结算月则变更结算月
+						if(CommonConstants.THREE_INT == pushType){
+							LambdaUpdateWrapper<TInsuranceDetail> updateWrapper = new LambdaUpdateWrapper<>();
+							updateWrapper.eq(TInsuranceDetail :: getId,tInsuranceEkp.getDetailId())
+									.set(TInsuranceDetail :: getSettleMonth,tInsuranceEkp.getSettleMonth())
+									.set(TInsuranceDetail :: getUpdateTime, LocalDateTime.now());
+							tInsuranceDetailService.update(updateWrapper);
+						}
+						tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
+						successLit.add(tInsuranceEkp);
+					}else{
+						break;
+					}
+
+				}else{
+					//如果为作废信息，已结算和结算中发送红冲数据
+					if(CommonConstants.FOUR_INT == pushType){
+						//预估保费
+						BigDecimal estimatePremium = ekpParam.getEstimatePremium();
+						//实际保费
+						BigDecimal actualPremium = ekpParam.getActualPremium();
+						if(!BigDecimalUtils.isNullOrZero(estimatePremium)){
+							ekpParam.setEstimatePremium(estimatePremium.negate());
+						}
+						if(!BigDecimalUtils.isNullOrZero(actualPremium)){
+							ekpParam.setActualPremium(actualPremium.negate());
+						}
+						ekpParam.setInteractiveType(CommonConstants.ONE_INT);
+						String s = EKPUtil.sendToEKP(ekpParam);
+						if(StringUtils.isNotBlank(s)){
+							tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
+							successLit.add(tInsuranceEkp);
+						}else{
+							break;
+						}
+					//如果为红冲数据则正常发送
+					}else if(CommonConstants.FIVE_INT == pushType || CommonConstants.SIX_INT == pushType){
+						String s = EKPUtil.sendToEKP(ekpParam);
+						if(StringUtils.isNotBlank(s)){
+							tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
+							successLit.add(tInsuranceEkp);
+						}else{
+							break;
+						}
+					}else{
+						tInsuranceEkp.setResendFlag(CommonConstants.TWO_INT);
+						failList.add(tInsuranceEkp);
+					}
+				}
+			}
+			updateBatchById(successLit);
+			updateBatchById(failList);
+			return R.ok("发送成功");
+		}else{
+			return R.failed("无需要发送的信息");
+		}
+	}
+}

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,13 +7,12 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
-import com.yifu.cloud.plus.v1.yifu.common.core.vo.FileVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEnclosure;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceEnclosureMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceEnclosureService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceEnclosureMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEnclosureService;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceEnclosureParam;
 import lombok.extern.slf4j.Slf4j;
@@ -54,6 +53,7 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
 	 */
 	@Override
 	public R uploadInsuranceEnclosure(MultipartFile file, String filePath, String remark) throws IOException {
+		YifuUser user = SecurityUtils.getUser();
 		if(Common.isEmpty(file)){
 			return R.failed(InsurancesConstants.INSURANCE_ENCLOSURE_IS_EMPTY);
 		}
@@ -85,8 +85,10 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
 					insuranceEnclosure.setRemark(remark);
 				}
 			}
-			insuranceEnclosure.setEnclosureName(enclosureName);
+			insuranceEnclosure.setEnclosureName(file.getOriginalFilename());
 			insuranceEnclosure.setEnclosureAddress(key);
+			insuranceEnclosure.setCreateName(user.getNickname());
+			insuranceEnclosure.setCreateTime(LocalDateTime.now());
 			try {
 				this.save(insuranceEnclosure);
 			} catch (Exception e) {

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceOperateMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceOperateMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceOperateService;
 import org.springframework.stereotype.Service;
 
 

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceRefundMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceRefundService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceRefundMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceRefundService;
 import org.springframework.stereotype.Service;
 
 /**

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceReplace;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceReplaceMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceReplaceService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceReplaceMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceReplaceService;
 import org.springframework.stereotype.Service;
 
 /**

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettleCancel;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceSettleCancelMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceSettleCancelService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceSettleCancelMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleCancelService;
 import org.springframework.stereotype.Service;
 
 /**

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceSettleMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceSettleService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceSettleMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleService;
 import org.springframework.stereotype.Service;
 
 /**

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;
 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.Common;
@@ -11,10 +10,10 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.*;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeRateMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeRateService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceTypeRateMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceOperateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeRateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeService;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -67,7 +66,7 @@ public class TInsuranceTypeRateServiceImpl extends ServiceImpl<TInsuranceTypeRat
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R deleteInsuranceTypeRate(String id) {
 		YifuUser user = SecurityUtils.getUser();
 		if(Common.isEmpty(id)){
@@ -95,7 +94,7 @@ public class TInsuranceTypeRateServiceImpl extends ServiceImpl<TInsuranceTypeRat
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R saveInsuranceTypeRate(TInsuranceTypeRate insuranceTypeRate) {
 		YifuUser user = SecurityUtils.getUser();
 		if (Common.isEmpty(insuranceTypeRate)){

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,10 +12,10 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.*;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceCompanyService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceTypeMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceCompanyService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceOperateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeService;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo;
 import org.apache.commons.lang3.StringUtils;
@@ -61,7 +61,7 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R saveInsuranceType(TInsuranceType insuranceType) {
 		if(Common.isEmpty(insuranceType)){
 			return R.failed("新增的险种信息为空");
@@ -136,7 +136,7 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R updateInsuranceType(TInsuranceType insuranceType) {
 		YifuUser user = SecurityUtils.getUser();
 		if (Common.isEmpty(insuranceType.getId())){

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

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -9,15 +9,13 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
-import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeStandardMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeStandardService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceTypeStandardMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceOperateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeStandardService;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -71,7 +69,7 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R deleteInsuranceTypeStandard(String id) {
 		YifuUser user = SecurityUtils.getUser();
 		if(Common.isEmpty(id)){
@@ -98,7 +96,7 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R saveInsuranceTypeStandard(TInsuranceTypeStandard insuranceTypeStandard) {
 		YifuUser user = SecurityUtils.getUser();
 		if (Common.isEmpty(insuranceTypeStandard)){

yifu-insurances/yifu-insurances-biz/src/main/resources/application-test.yml

@@ -10,17 +10,19 @@ spring:
     port: 22379
     password: '@yf_2017'
   datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: yf_zsk
-    url: jdbc:mysql://192.168.1.65:22306/mvp_insurances?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    insurances:
+      type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      username: root
+      password: yf_zsk
+      jdbc-url: jdbc:mysql://192.168.1.65:22306/mvp_insurances?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    ekp:
+      type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      username: hroread
+      password: 123456
+      jdbc-url: jdbc:mysql://119.96.192.73:3306/ekp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     hikari:
-      driver-class-name: ${spring.datasource.driver-class-name}
-      jdbc-url: ${spring.datasource.url}
-      username: ${spring.datasource.username}
-      password: ${spring.datasource.password}
-      pool-name: AmytangHikariCP
       minimum-idle: 10 # 最小空闲连接数量
       idle-timeout: 60000 # 空闲连接存活最大时间，默认600000（10分钟）
       maximum-pool-size: 12 # 连接池最大连接数，默认是10

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!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.insurances.mapper.ekp.EkpSettleMapper">
+
+	<resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo">
+		<id property="id" column="fd_id" jdbcType="VARCHAR"/>
+		<result property="detailId" column="fd_3b05ba46bb042e" jdbcType="VARCHAR"/>
+		<result property="estimateStatus" column="fd_3b05ba4808a3ca" jdbcType="VARCHAR"/>
+		<result property="actualStatus" column="fd_3b05bd5ed0b976" jdbcType="VARCHAR"/>
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		fd_id,fd_3b05ba46bb042e,fd_3b05ba4808a3ca,fd_3b05bd5ed0b976
+	</sql>
+
+	<select id="getSettle" resultMap="BaseResultMap">
+		select
+			<include refid="Base_Column_List"></include>
+		from
+			ekp_f80727b647a403b975ae
+		where
+			fd_3b05ba46bb042e = #{id}
+	</select>
+</mapper>
+
+
+
+

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceCompanyMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceCompanyMapper.xml

@@ -2,7 +2,7 @@
 <!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.insurances.mapper.TInsuranceCompanyMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceCompanyMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

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

@@ -2,7 +2,7 @@
 <!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.insurances.mapper.TInsuranceDetailMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceDetailMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

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

@@ -2,7 +2,7 @@
 <!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.insurances.mapper.TInsuranceEkpMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceEkpMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp">
             <id property="id" column="id" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceEnclosureMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceEnclosureMapper.xml

@@ -2,7 +2,7 @@
 <!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.insurances.mapper.TInsuranceEnclosureMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceEnclosureMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEnclosure">
             <id property="id" column="ID" jdbcType="INTEGER"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceOperateMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceOperateMapper.xml

@@ -2,7 +2,7 @@
 <!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.insurances.mapper.TInsuranceOperateMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceOperateMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceRefundMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceRefundMapper.xml

@@ -2,7 +2,7 @@
 <!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.insurances.mapper.TInsuranceRefundMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceRefundMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund">
             <id property="id" column="ID" jdbcType="BIGINT"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceReplaceMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceReplaceMapper.xml

@@ -2,7 +2,7 @@
 <!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.insurances.mapper.TInsuranceReplaceMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceReplaceMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceReplace">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceSettleCancelMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceSettleCancelMapper.xml

@@ -2,7 +2,7 @@
 <!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.insurances.mapper.TInsuranceSettleCancelMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceSettleCancelMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettleCancel">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceSettleMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceSettleMapper.xml

@@ -2,7 +2,7 @@
 <!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.insurances.mapper.TInsuranceSettleMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceSettleMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceTypeMapper.xml

@@ -2,7 +2,7 @@
 <!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.insurances.mapper.TInsuranceTypeMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceTypeMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeRateMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceTypeRateMapper.xml

@@ -2,7 +2,7 @@
 <!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.insurances.mapper.TInsuranceTypeRateMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceTypeRateMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeStandardMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceTypeStandardMapper.xml

@@ -2,7 +2,7 @@
 <!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.insurances.mapper.TInsuranceTypeStandardMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceTypeStandardMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-order/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>yifu</artifactId>
+		<groupId>com.yifu.cloud.plus.v1</groupId>
+		<version>1.0.0</version>
+	</parent>
+	<artifactId>yifu-order</artifactId>
+	<packaging>pom</packaging>
+
+	<!--项目子模块-->
+	<modules>
+		<module>yifu-order-api</module>
+		<module>yifu-order-biz</module>
+	</modules>
+
+</project>
\ No newline at end of file

yifu-order/yifu-order-api/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>yifu</artifactId>
+		<groupId>com.yifu.cloud.plus.v1</groupId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>yifu-order-api</artifactId>
+	<packaging>jar</packaging>
+	<description>yifu-order 接口模块</description>
+
+	<dependencies>
+		<!-- core 工具类 -->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-core</artifactId>
+		</dependency>
+		<!--swagger 注解-->
+		<dependency>
+			<groupId>io.swagger.core.v3</groupId>
+			<artifactId>swagger-annotations</artifactId>
+		</dependency>
+		<!--mybatis 依赖-->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-mybatis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+		</dependency>
+	</dependencies>
+
+</project>
\ No newline at end of file

yifu-order/yifu-order-biz/Dockerfile

+FROM moxm/java:1.8-full
+
+RUN mkdir -p /yifu-order-biz
+
+WORKDIR yifu-order-biz
+
+ARG JAR_FILE=target/yifu-order-biz.jar
+
+COPY ${JAR_FILE} app.jar
+
+EXPOSE 5002
+
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+CMD sleep 60; java -jar app.jar $JAVA_OPTS

yifu-order/yifu-order-biz/build-prd.sh

+#!/usr/bin/env bash
+mvn clean package -Pprd -Dmaven.test.skip=true docker:build -DpushImage
\ No newline at end of file

yifu-order/yifu-order-biz/build-test.sh

+#!/usr/bin/env bash
+mvn clean package -Ptest -Dmaven.test.skip=true docker:build -DpushImage
\ No newline at end of file

yifu-order/yifu-order-biz/build.sh

+#!/usr/bin/env bash
+mvn clean package -Dmaven.test.skip=true docker:build -DpushImage
\ No newline at end of file

yifu-order/yifu-order-biz/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>yifu</artifactId>
+		<groupId>com.yifu.cloud.plus.v1</groupId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>yifu-order-biz</artifactId>
+	<packaging>jar</packaging>
+	<description>yifu-order 业务模块</description>
+
+	<dependencies>
+		<!-- seata 依赖 -->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-seata</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-order</artifactId>
+			<version>1.0.0</version>
+			<scope>compile</scope>
+		</dependency>
+		<!--选配: orm 模块-->
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+		<!--必备：安全模块-->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-security</artifactId>
+		</dependency>
+		<!--必备：日志处理-->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-log</artifactId>
+		</dependency>
+		<!--必备：swagger-->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-swagger</artifactId>
+		</dependency>
+		<!--必备：undertow容器-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-undertow</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<version>5.8.0</version>
+			<artifactId>hutool-all</artifactId>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/commons-collections/commons-collections -->
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.2</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<configuration>
+					<serverId>docker-hub</serverId>
+					<!--指定生成的镜像名-->
+					<imageName>${my.hub.host}/${map.group.name}/${project.artifactId}:${project.version}</imageName>
+					<dockerDirectory>${project.basedir}/</dockerDirectory>
+					<!--指定远程 docker api地址-->
+					<!--<dockerHost>http://172.16.66.232:2375</dockerHost>-->
+					<!--  这里是复制 jar 包到 docker 容器指定目录配置-->
+					<resources>
+						<resource>
+							<targetPath>/</targetPath>
+							<!--jar 包所在的路径  此处配置的 即对应 target 目录-->
+							<directory>${project.build.directory}</directory>
+							<!-- 需要包含的 jar包 ，这里对应的是 Dockerfile中添加的文件名　-->
+							<include>${project.build.finalName}.jar</include>
+						</resource>
+					</resources>
+					<forceTags>true</forceTags>
+				</configuration>
+			</plugin>
+		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<excludes>
+					<exclude>**/*.xlsx</exclude>
+					<exclude>**/*.xls</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+				<includes>
+					<include>**/*.xlsx</include>
+					<include>**/*.xls</include>
+				</includes>
+			</resource>
+		</resources>
+	</build>
+
+</project>
\ No newline at end of file

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

+package com.yifu.cloud.plus.v1.yifu.order;
+
+import com.yifu.cloud.plus.v1.yifu.common.security.annotation.EnableYifuResourceServer;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author licancan
+ * @description 项目启动类
+ * @date 2022-08-26 14:39:44
+ */
+@EnableYifuResourceServer
+@SpringBootApplication
+public class YifuOrderApplication {
+	public static void main(String[] args) {
+		SpringApplication.run(YifuOrderApplication.class, args);
+	}
+}

yifu-order/yifu-order-biz/src/main/resources/application-dev.yml

+spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  config:
+    activate:
+      on-profile: dev
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    password:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: yf_zsk
+    url: jdbc:mysql://192.168.1.65:22306/mvp_order?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+
+
+
+
+

yifu-order/yifu-order-biz/src/main/resources/application-test.yml

+spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  config:
+    activate:
+      on-profile: test
+  redis:
+    host: 192.168.1.65
+    port: 22379
+    password: '@yf_2017'
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: yf_zsk
+    url: jdbc:mysql://192.168.1.65:22306/mvp_order?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    hikari:
+      driver-class-name: ${spring.datasource.driver-class-name}
+      jdbc-url: ${spring.datasource.url}
+      username: ${spring.datasource.username}
+      password: ${spring.datasource.password}
+      pool-name: AmytangHikariCP
+      minimum-idle: 10 # 最小空闲连接数量
+      idle-timeout: 60000 # 空闲连接存活最大时间，默认600000（10分钟）
+      maximum-pool-size: 12 # 连接池最大连接数，默认是10
+      auto-commit: true  #此属性控制从池返回的连接的默认自动提交行为,默认值：true
+      max-lifetime: 0 #此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟

yifu-order/yifu-order-biz/src/main/resources/application.yml

+server:
+  port: 5006
+# 加解密根密码
+jasypt:
+  encryptor:
+    password: yifu #根密码
+# 暴露监控端点
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: ALWAYS
+
+# mybaits-plus配置
+mybatis-plus:
+  mapper-locations: classpath:/mapper/*Mapper.xml
+  global-config:
+    banner: false
+    db-config:
+      id-type: auto
+      table-underline: true
+      logic-delete-value: 1
+      logic-not-delete-value: 0
+  configuration:
+    map-underscore-to-camel-case: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+# spring security 配置
+security:
+  oauth2:
+    resource:
+      loadBalanced: true
+      token-info-uri: http://yifu-auth/oauth/check_token
+    ignore: # 通用放行URL，服务个性化，请在对应配置文件覆盖
+      urls:
+        - /v3/api-docs
+        - /actuator/**
+        - /swagger-ui/**
+
+
+
+# 文件上传相关 支持阿里云、华为云、腾讯、minio
+oss:
+  endpoint: http://oss-cn-beijing.aliyuncs.com
+  accessKey: LTAIDh9goA3jgpun
+  secretKey: eN8EHPAZxglNfcUCMhAT02cy93omLa
+  bucket-name: yf-hr-static-source
+# swagger 配置
+#swagger:
+#  enabled: true
+#  title: Yifu Swagger API
+#  gateway: http://${GATEWAY_HOST:yifu-gateway}:${GATEWAY-PORT:9999}
+#  token-url: ${swagger.gateway}/auth/oauth/token
+#  services:
+#    yifu-upms-biz: admin
+#    yifu-codegen: gen
+# Spring 相关
+spring:
+  application:
+    name: @artifactId@
+  #mvc:
+  #  pathmatch:
+  #    matching-strategy: ANT_PATH_MATCHER
+  servlet:
+    multipart:
+      #所有上传文件最大大小
+      max-request-size: 100MB
+      #单个文件最大大小
+      max-file-size: 50MB
+#swagger 文档 https://springdoc.org/
+### OpenAPI3 注解
+#  OpenAPI 3	                            注解位置
+#  @Tag(name = “接口类描述”)	                Controller 类上
+#  @Operation(summary =“接口方法描述”)	    Controller 方法上
+#  @Parameters	                            Controller 方法上
+#  @Parameter(description=“参数描述”)	    Controller 方法上 @Parameters 里
+#  @Parameter(description=“参数描述”)	    Controller 方法的参数上
+#  @Parameter(hidden = true) 或 @Hidden	--
+#  @Schema	                                DTO类上
+#  @Schema	                                DTO属性上
+
+springdoc:
+  api-docs:
+    #是否开启文档功能
+    enabled: true
+    #swagger后端请求地址
+    path: /api-docs
+  swagger-ui:
+    #自定义swagger前端请求路径，输入http：127.0.0.1:8080/test会自动重定向到swagger页面
+    path: /api
+  #包扫描路径
+  packages-to-scan: com.yifu.cloud.plus.v1.yifu.order.controller
+  #这里定义了两个分组，可定义多个，也可以不定义
+  group-configs:
+    #分组名
+    #- group: admin
+    #按路径匹配
+    #  pathsToMatch: /admin/**
+    #分组名
+    - group: order
+      #按包路径匹配
+      packagesToScan: com.yifu.cloud.plus.v1.yifu.order.controller

yifu-order/yifu-order-biz/src/main/resources/logback-spring.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration debug="false" scan="false">
+  <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
+  <property name="log.path" value="logs/${spring.application.name}"/>
+  <!-- 彩色日志格式 -->
+  <property name="CONSOLE_LOG_PATTERN"
+            value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+  <!-- 彩色日志依赖的渲染类 -->
+  <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+  <conversionRule conversionWord="wex"
+                  converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+  <conversionRule conversionWord="wEx"
+                  converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+  <!-- Console log output -->
+  <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+    </encoder>
+  </appender>
+
+  <!-- Log file debug output -->
+  <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${log.path}/debug.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+      <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+      <maxFileSize>50MB</maxFileSize>
+      <maxHistory>30</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <!-- Log file error output -->
+  <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${log.path}/error.log</file>
+    <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+      <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+      <maxFileSize>50MB</maxFileSize>
+      <maxHistory>30</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+    </encoder>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>ERROR</level>
+    </filter>
+  </appender>
+
+
+  <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+  <root level="INFO">
+    <appender-ref ref="console"/>
+    <appender-ref ref="debug"/>
+    <appender-ref ref="error"/>
+  </root>
+</configuration>
+

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsDeclarer.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;
@@ -46,6 +47,7 @@ public class TStatisticsDeclarer {
 	 * ID
 	 */
 	@TableId(type = IdType.ASSIGN_ID)
+	@ExcelIgnore
 	private String id;
 	/**
 	 * 申报单位
@@ -86,9 +88,8 @@ public class TStatisticsDeclarer {
 	/**
 	 * 任职受雇从业类型
 	 */
-	@ExcelAttribute(name = "任职受雇从业类型", maxLength = 2,readConverterExp = "0=雇员,1=其他")
 	@Length(max = 2, message = "任职受雇从业类型不能超过2个字符")
-	@ExcelProperty("任职受雇从业类型")
+	@ExcelIgnore
 	private String occupationType;
 	/**
 	 * 任职受雇从业日期

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

@@ -963,7 +963,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		List<TSalaryAccountItem> backList = new ArrayList<>();
 		if (itemList != null && !itemList.isEmpty()) {
 			for (TSalaryAccountItem item : itemList) {
-				if (("3".equals(item.getFormType()) || "4".equals(item.getFormType()))
+				if (("3".equals(item.getFormType()))
 						&& settleMonth.equals(item.getSettlementMonth())) {
 					backList.add(item);
 				}
@@ -1651,7 +1651,15 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		}
 		//保存工资表
 		tSalaryStandardService.save(salary);
-
+		TApprovalRecord tApprovalRecord = new TApprovalRecord();
+		tApprovalRecord.setApprovalResult(CommonConstants.TWO_STRING);
+		tApprovalRecord.setApprovalOpinion("新建表单");
+		tApprovalRecord.setSalaryId(salary.getId());
+		tApprovalRecord.setNodeId("待提交");
+		tApprovalRecord.setApprovalMan(user.getId());
+		tApprovalRecord.setApprovalManName(user.getNickname());
+		tApprovalRecord.setApprovalTime(DateUtil.getCurrentDateTime());
+		auditLogService.save(tApprovalRecord);
 
 		for (TSalaryAccount account : aList) {
 			saiList = account.getSaiList();
@@ -1820,7 +1828,6 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		List<TSalaryAccount> aList = new ArrayList<>();
 		TSalaryAccount a;//定库：
 		BigDecimal relaySalarySum = BigDecimal.ZERO;  //工资应发
-		List<TSalaryAccountItem> asList;  //累计扣税
 		int size = savList.size();
 		// 自有员工人数
 		int ownNum = 0;
@@ -1870,14 +1877,10 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 					}
 				}
 
-				//累计扣税list
-				asList = this.getLaborAsList(itemMap.get(a.getEmpIdcard()), a.getSettlementMonth());
-
-				// 实发劳务费，按月累计扣税
+				// 实发稿酬，按月累计扣税
 				this.saveNewItems(sai, saiList, SalaryConstants.SALARY_TAX,
 						SalaryConstants.SALARY_TAX_JAVA,
-						calculationRemu(saiList, asList
-								, saiList, a), CommonConstants.ZERO_INT);
+						calculationRemu(saiList, saiList, a), CommonConstants.ZERO_INT);
 
 				// 自有员工以及自有员工应发金额
 				if (Common.isNotNull(a.getOwnFlag()) && a.getOwnFlag() == 1) {
@@ -1914,6 +1917,15 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		}
 		//保存工资表
 		tSalaryStandardService.save(salary);
+		TApprovalRecord tApprovalRecord = new TApprovalRecord();
+		tApprovalRecord.setApprovalResult(CommonConstants.TWO_STRING);
+		tApprovalRecord.setApprovalOpinion("新建表单");
+		tApprovalRecord.setSalaryId(salary.getId());
+		tApprovalRecord.setNodeId("待提交");
+		tApprovalRecord.setApprovalMan(user.getId());
+		tApprovalRecord.setApprovalManName(user.getNickname());
+		tApprovalRecord.setApprovalTime(DateUtil.getCurrentDateTime());
+		auditLogService.save(tApprovalRecord);
 
 		for (TSalaryAccount account : aList) {
 			saiList = account.getSaiList();
@@ -1936,15 +1948,14 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 
 	/**
 	 * @param itemList
-	 * @param itemHistoryList
 	 * @param saiList
 	 * @Description: 计算劳务费个税、应发
 	 * @Author: hgw
 	 * @Date: 2022/3/3 11:30
 	 * @return: java.math.BigDecimal
 	 **/
-	private static BigDecimal calculationRemu(List<TSalaryAccountItem> itemList, List<TSalaryAccountItem> itemHistoryList,
-											   List<TSalaryAccountItem> saiList, TSalaryAccount a) {
+	private static BigDecimal calculationRemu(List<TSalaryAccountItem> itemList, List<TSalaryAccountItem> saiList,
+											  TSalaryAccount a) {
 		// 本次实发
 		BigDecimal actualSalarySumNow = BigDecimal.ZERO;
 		// 历史个税合计
@@ -1955,25 +1966,16 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 				actualSalarySumNow = actualSalarySumNow.add(item.getSalaryMoney());
 			}
 		}
-		// 历史实发、个税
-		for (TSalaryAccountItem item : itemHistoryList) {
-			if (SalaryConstants.SALARY_TAX_JAVA.equals(item.getJavaFiedName())) {
-				sumTax = sumTax.add(item.getSalaryMoney());
-			}
-		}
 		//个人税费
 		BigDecimal nowTaxT = BigDecimal.ZERO;
 		BigDecimal relaySalary;
 
 		nowTaxT = getNowTaxRemu(actualSalarySumNow);
-		relaySalary = BigDecimalUtils.safeAdd(actualSalarySumNow, nowTaxT).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
+		relaySalary = BigDecimalUtils.safeSubtract(actualSalarySumNow, nowTaxT).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
 		a.setSalaryTax(nowTaxT);
 		a.setActualSalary(relaySalary);
 		a.setRelaySalaryUnit(actualSalarySumNow);
 		a.setRelaySalary(actualSalarySumNow);
-		if (sumTax.compareTo(BigDecimal.ZERO) != 0) {
-			nowTaxT = BigDecimalUtils.safeSubtract(nowTaxT, sumTax).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
-		}
 		// 本次个人应发合计
 		TSalaryAccountItem sai = new TSalaryAccountItem();
 		sai.setCnName(SalaryConstants.RELAY_SALARY);

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

@@ -29,20 +29,14 @@ 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.archives.vo.TSettleDomainSelectVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
-import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties;
-import com.yifu.cloud.plus.v1.yifu.common.dapr.util.HttpDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsDeclarer;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsDeclarerMapper;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsDeclarerService;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsDeclarerSearchVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsDeclarerVo;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.ServletOutputStream;
@@ -60,12 +54,8 @@ import java.util.List;
  */
 @Log4j2
 @Service
-@EnableConfigurationProperties(DaprArchivesProperties.class)
 public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDeclarerMapper, TStatisticsDeclarer> implements TStatisticsDeclarerService {
 
-	@Autowired
-	private DaprArchivesProperties archivesProperties;
-
     /**
      * 申报对象表简单分页查询
      * @param tStatisticsDeclarer 申报对象表
@@ -83,7 +73,7 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla
      */
     @Override
     public void listExport(HttpServletResponse response, TStatisticsDeclarerSearchVo searchVo){
-        String fileName = "个税申报对象" + DateUtil.getThisTime() + ".xlsx";
+        String fileName = "申报对象批量导出" + DateUtil.getThisTime() + ".xlsx";
         //获取要导出的列表
         List<TStatisticsDeclarer> list = new ArrayList<>();
         long count = noPageCountDiy(searchVo);
@@ -186,18 +176,6 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla
 			String lastYear = lastMonth.substring(0,4);
 			List<TStatisticsDeclarer> stdvoList = baseMapper.doStatisticsTaxDeclarer(nowMonth,lastYear);
 			for (TStatisticsDeclarer declarer : stdvoList) {
-				if (Common.isNotNull(declarer.getDeclareUnit())) {
-					R<TSettleDomainSelectVo> sdr = HttpDaprUtil.invokeMethodPost(archivesProperties.getAppUrl(), archivesProperties.getAppId()
-							, "/tsettledomain/inner/getSettleDomainVoById", declarer.getDeclareUnit(), TSettleDomainSelectVo.class, SecurityConstants.FROM_IN);
-					// 结算主体
-					TSettleDomainSelectVo dept = null;
-					if (sdr != null && sdr.getData() != null) {
-						dept = sdr.getData();
-					}
-					if (Common.isNotNull(dept)) {
-						declarer.setDeclareUnit(dept.getBusinessSubjectName());
-					}
-				}
 				this.save(declarer);
 			}
 			return R.ok();
@@ -287,16 +265,12 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla
     }
     private void importTStatisticsDeclarer(List<TStatisticsDeclarerVo> excelVOList, List<ErrorMessage> errorMessageList) {
 
-		int successInt = 0;
-		int failuerInt = 0;
-		List<TStatisticsDeclarerVo> updateList = new ArrayList<>();
         // 执行数据插入操作 组装
         for (int i = 0; i < excelVOList.size(); i++) {
             TStatisticsDeclarerVo excel = excelVOList.get(i);
 
 			if (CommonConstants.ONE_STRING.equals(excel.getIsDeclare()) && Common.isEmpty(excel.getUndeclareReason())) {
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "本期是否申报为否时，不申报原因不可为空"));
-				failuerInt++;
 				continue;
 			}
 
@@ -311,14 +285,10 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla
 					tStatisticsDeclarer.setUndeclareReason(excel.getUndeclareReason());
 				}
 				baseMapper.updateById(tStatisticsDeclarer);
-				successInt++;
 			}else {
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "未找到身份证和申报月份对应的申报人员信息"));
-				failuerInt++;
 				continue;
 			}
 		}
-		errorMessageList.add(new ErrorMessage(-1, "成功操作" + successInt +"条数据," + "失败"
-				+ failuerInt + "条数据"));
 	}
 }

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

@@ -287,7 +287,7 @@
 			AND a.DELETE_FLAG = 0
 			<if test="tSalaryStandard != null">
 				<if test="tSalaryStandard.deptName != null and tSalaryStandard.deptName.trim() != ''">
-					AND a.DEPT_NAME like concat(#{'%',#{tSalaryStandard.deptName},'%')
+					AND a.DEPT_NAME = #{tSalaryStandard.deptName}
 				</if>
 				<if test="tSalaryStandard.deptNo != null and tSalaryStandard.deptNo.trim() != ''">
 					AND a.DEPT_NO = #{tSalaryStandard.deptNo}
@@ -296,7 +296,7 @@
 					AND a.SALARY_MONTH = #{tSalaryStandard.salaryMonth}
 				</if>
 				<if test="tSalaryStandard.status == null">
-					AND a.STATUS = 1 OR a.STATUS = 2 or a.STATUS = 5
+					AND (a.STATUS = 1 OR a.STATUS = 2 or a.STATUS = 5)
 				</if>
 				<if test="tSalaryStandard.status != null">
 					AND a.STATUS = #{tSalaryStandard.status}

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

@@ -106,7 +106,7 @@
 	<!--统计-->
 	<select id="doStatisticsBonus" resultMap="tStatisticsBonusMap">
 		select
-			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,b.UNIT_NAME DECLARE_UNIT,
+			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,a.INVOICE_TITLE DECLARE_UNIT,
 			sum(annualbonus.SALARY_MONEY) ANNUAL_BONUS,sum(tax.SALARY_MONEY) BONUS_TAX
 		from t_salary_account a
 				 left join t_salary_employee b on b.id = a.EMP_ID

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

@@ -96,11 +96,11 @@
 	<!--统计-->
 	<select id="doStatisticsTaxDeclarer" resultMap="tStatisticsDeclarerMap">
 		select
-			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,a.EMP_PHONE,b.UNIT_ID DECLARE_UNIT,
-			if(a.FORM_TYPE=0,'雇员',if(a.FORM_TYPE=3 or a.FORM_TYPE=4,'其他','-')) OCCUPATION_TYPE
+			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,a.EMP_PHONE,a.INVOICE_TITLE DECLARE_UNIT,
+			if(a.FORM_TYPE=0,'0',if(a.FORM_TYPE=3 or a.FORM_TYPE=4,'1','-')) OCCUPATION_TYPE
 		from t_salary_account a
 	    left join t_salary_employee b on b.id = a.EMP_ID
 		where a.DELETE_FLAG = '0' and a.SETTLEMENT_MONTH like '${lastYear}%'
-		GROUP BY a.EMP_IDCARD,OCCUPATION_TYPE,b.UNIT_ID,a.SETTLEMENT_MONTH
+		GROUP BY a.EMP_IDCARD,OCCUPATION_TYPE,DECLARE_UNIT,a.SETTLEMENT_MONTH
 	</select>
 </mapper>

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

@@ -92,7 +92,7 @@
 	<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,
-			b.UNIT_NAME DECLARE_UNIT,'一般劳务报酬所得' INCOME_ITEM,'居民身份证' CARD_TYPE
+			a.INVOICE_TITLE DECLARE_UNIT,'一般劳务报酬所得' INCOME_ITEM,'居民身份证' CARD_TYPE
 		from t_salary_account a
 				 left join t_salary_employee b on b.id = a.EMP_ID
 		where a.DELETE_FLAG = '1' and a.SETTLEMENT_MONTH like '${lastYear}%' and a.FORM_TYPE = '3'

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

@@ -88,7 +88,7 @@
 	<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,b.UNIT_NAME DECLARE_UNIT,'居民身份证' CARD_TYPE
+			sum(a.ACTUAL_SALARY) INCOME,a.INVOICE_TITLE DECLARE_UNIT,'居民身份证' CARD_TYPE
 		from t_salary_account a
 				 left join t_salary_employee b on b.id = a.EMP_ID
 		where a.DELETE_FLAG = '1' and a.SETTLEMENT_MONTH like '${lastYear}%' and a.FORM_TYPE = '4'