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

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FddContractAttachInfoServiceImpl.java

@@ -258,7 +258,7 @@ public class FddContractAttachInfoServiceImpl extends ServiceImpl<FddContractAtt
 					tEmployeeProject.setContractStatus(CommonConstants.ONE_INT);
 					employeeProjectMapper.updateById(tEmployeeProject);
 					//保存操作记录
-					tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", tEmployeeProject.getId(), tEmployeeProjectCompare, tEmployeeProject);
+					tEmployeeLogService.saveModificationRecord(CommonConstants.dingleDigitIntArray[1], "", tEmployeeProject.getId(), tEmployeeProjectCompare, tEmployeeProject,fddContractAttachInfo);
 
 					//更新人员档案
 					tEmployeeInfo.setEmpPhone(fddContractAttachInfo.getEmpPhone());

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

@@ -192,7 +192,7 @@ public class TInsuranceDetail extends BaseEntity {
     private String insuranceHandleCityName;
 
     /**
-     * 结算类型 (0、预估 1、实缴)
+     * 结算类型 (0、与薪资合并结算 1、单独结算)
      */
 	@Schema(description = "结算类型 (0、预估 1、实缴)")
     private Integer settleType;

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

+package com.yifu.cloud.plus.v1.yifu.insurances.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 商险结算表
+ * @TableName t_insurance_settle
+ */
+@Data
+@TableName("t_insurance_settle")
+@Schema(description = "商险结算表")
+public class TInsuranceSettle implements Serializable {
+    /**
+     * 主键
+     */
+	@Schema(description = "主键")
+	@TableId(type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 商险明细id
+     */
+	@Schema(description = "商险明细id")
+    private String insDetailId;
+
+    /**
+     * 结算状态
+     */
+	@Schema(description = "结算状态")
+    private String settleHandleStatus;
+
+    /**
+     * 结算类型 (0、与薪资合并结算 1、单独结算)
+     */
+	@Schema(description = "结算类型 (0、与薪资合并结算 1、单独结算)")
+    private Integer settleType;
+
+    /**
+     * 实际保费
+     */
+	@Schema(description = "实际保费")
+    private BigDecimal actualPremium;
+
+    /**
+     * 预估保费
+     */
+	@Schema(description = "预估保费")
+    private BigDecimal estimatePremium;
+
+    /**
+     * 创建时间
+     */
+	@Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+	@Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+    /**
+     * 实际费用推送标识 1是 0否
+     */
+	@Schema(description = "实际费用推送标识 1是 0否")
+    private Integer isActualPush;
+
+    /**
+     * 预估费用推送标识 1是 0否
+     */
+	@Schema(description = "预估费用推送标识 1是 0否")
+    private Integer isEstimatePush;
+
+    /**
+     * 实际保费推送时间
+     */
+	@Schema(description = "实际保费推送时间")
+    private LocalDateTime actualPushTime;
+
+    /**
+     * 预估保费推送时间
+     */
+	@Schema(description = "预估保费推送时间")
+    private LocalDateTime estimatePushTime;
+
+    /**
+     * 结算完成时间
+     */
+	@Schema(description = "结算完成时间")
+    private LocalDateTime settleDoneTime;
+
+    private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file

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

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_settle(商险结算表)】的数据库操作Mapper
+* @createDate 2022-07-21 16:21:22
+* @Entity generator.domain.TInsuranceSettle
+*/
+@Mapper
+public interface TInsuranceSettleMapper extends BaseMapper<TInsuranceSettle> {
+
+
+}

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

+package com.yifu.cloud.plus.v1.yifu.insurances.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle;
+import org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_settle(商险结算表)】的数据库操作Service
+* @createDate 2022-07-21 16:21:22
+*/
+@Service
+public interface TInsuranceSettleService extends IService<TInsuranceSettle> {
+
+}

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

+package com.yifu.cloud.plus.v1.yifu.insurances.service.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 org.springframework.stereotype.Service;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_settle(商险结算表)】的数据库操作Service实现
+* @createDate 2022-07-21 16:21:22
+*/
+@Service
+public class TInsuranceSettleServiceImpl extends ServiceImpl<TInsuranceSettleMapper, TInsuranceSettle>
+implements TInsuranceSettleService {
+
+}

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceSettleMapper.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.TInsuranceSettleMapper">
+
+    <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle">
+            <id property="id" column="ID" jdbcType="VARCHAR"/>
+            <result property="insDetailId" column="INS_DETAIL_ID" jdbcType="VARCHAR"/>
+            <result property="settleHandleStatus" column="SETTLE_HANDLE_STATUS" jdbcType="VARCHAR"/>
+            <result property="settleType" column="SETTLE_TYPE" jdbcType="TINYINT"/>
+            <result property="actualPremium" column="ACTUAL_PREMIUM" jdbcType="DECIMAL"/>
+            <result property="estimatePremium" column="ESTIMATE_PREMIUM" jdbcType="DECIMAL"/>
+            <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
+            <result property="isActualPush" column="IS_ACTUAL_PUSH" jdbcType="TINYINT"/>
+            <result property="isEstimatePush" column="IS_ESTIMATE_PUSH" jdbcType="TINYINT"/>
+            <result property="actualPushTime" column="ACTUAL_PUSH_TIME" jdbcType="TIMESTAMP"/>
+            <result property="estimatePushTime" column="ESTIMATE_PUSH_TIME" jdbcType="TIMESTAMP"/>
+            <result property="settleDoneTime" column="SETTLE_DONE_TIME" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        ID,INS_DETAIL_ID,SETTLE_HANDLE_STATUS,
+        SETTLE_TYPE,ACTUAL_PREMIUM,ESTIMATE_PREMIUM,
+        CREATE_TIME,UPDATE_TIME,IS_ACTUAL_PUSH,
+        IS_ESTIMATE_PUSH,ACTUAL_PUSH_TIME,ESTIMATE_PUSH_TIME,
+        SETTLE_DONE_TIME
+    </sql>
+</mapper>