"feature-zhaJi:新增变更项目与EKP交互流程(调试中)"

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

 package com.yifu.cloud.plus.v1.yifu.insurances.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.*;
 import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -271,5 +273,17 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description = "是否删除 0否/1是")
     private Integer deleteFlag;
 
+	/**
+	 * 商险办理人
+	 */
+	@Schema(description = "商险办理人")
+	private String handledBy;
+
+	/**
+	 * 商险办理时间
+	 */
+	@Schema(description = "商险办理时间")
+	private LocalDateTime handledTime;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

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

@@ -95,8 +95,8 @@ public class EKPUtil {
 			String loginData = new ObjectMapper().writeValueAsString(loginName);
 			MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
 			wholeForm.add("docSubject", new String(docSubject.getBytes("UTF-8"),"ISO-8859-1") );
-			//wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}");
-			wholeForm.add("docCreator", loginData);
+			wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}");
+			//wholeForm.add("docCreator", loginData);
 			wholeForm.add("docStatus", docStatus);
 			wholeForm.add("fdModelId", fdModelId);
 			wholeForm.add("fdFlowId", fdFlowId);

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

@@ -122,5 +122,29 @@ public class DeptChangeCheckParam implements Serializable {
 	@Schema(description = "实际保费")
 	private BigDecimal actualPremium;
 
+	/**
+	 * 客户名称
+	 */
+	@Schema(description = "客户名称")
+	private String newCustomerName;
+
+	/**
+	 * 客户编码
+	 */
+	@Schema(description = "客户编码")
+	private String newCustomerCode;
+
+	/**
+	 * 客户名称
+	 */
+	@Schema(description = "客户名称")
+	private String oldCustomerName;
+
+	/**
+	 * 客户编码
+	 */
+	@Schema(description = "客户编码")
+	private String oldCustomerCode;
+
 
 }

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

@@ -149,7 +149,7 @@ public class EKPInteractiveParam implements Serializable {
 	/**
 	 * 	单据状态
 	 */
-	@Schema(description = "状态:1新增结算单,2作废结算信息,3更新保单信息")
+	@Schema(description = "状态:1新增结算单,2更新保单信息,3作废结算信息")
 	private Integer interactiveType;
 
 }

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

@@ -51,7 +51,9 @@
             <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
             <result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
             <result property="deleteFlag" column="DELETE_FLAG" jdbcType="TINYINT"/>
-    </resultMap>
+			<result property="handledBy" column="HANDLED_BY" jdbcType="VARCHAR"/>
+			<result property="handledTime" column="HANDLED_TIME" jdbcType="TIMESTAMP"/>
+	</resultMap>
 
     <sql id="Base_Column_List">
         ID,EMP_NAME,
@@ -65,8 +67,8 @@
         BUY_HANDLE_STATUS,DEFAULT_SETTLE_ID,REDUCE_HANDLE_STATUS,
         IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
         CREATE_BY,CREATE_NAME,CREATE_TIME,
-        UPDATE_BY,UPDATE_TIME,DELETE_FLAG,DEFAULT_SETTLE_ID
-    </sql>
+        UPDATE_BY,UPDATE_TIME,DELETE_FLAG,DEFAULT_SETTLE_ID,HANDLED_BY,HANDLED_TIME
+	</sql>
 	<!--投保办理分页查询-->
 	<select id="getInsuranceListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
 		select detail.id as id,
@@ -167,7 +169,7 @@
 			and  ${param.regionSql}
 		</if>
 		<if test="param.updateBy != null and param.updateBy.trim() != ''">
-			and detail.UPDATE_BY = #{param.updateBy}
+			and detail.HANDLED_BY = #{param.updateBy}
 		</if>
 		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>