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

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

@@ -2,13 +2,13 @@ package com.yifu.cloud.plus.v1.yifu.insurances.util;
 
 import cn.hutool.json.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.EKPInteractiveParam;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.TInsuranceSettlePushParam;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
 import org.springframework.util.LinkedMultiValueMap;
@@ -94,14 +94,16 @@ public class EKPUtil {
 			loginName.append("LoginName",LoginName);
 			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("docSubject", new String(docSubject.getBytes("UTF-8"),"ISO-8859-1") );
+			wholeForm.add("docSubject",docSubject);
+			wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}");
+			//wholeForm.add("docCreator", loginData);
 			wholeForm.add("docStatus", docStatus);
 			wholeForm.add("fdModelId", fdModelId);
 			wholeForm.add("fdFlowId", fdFlowId);
 			//wholeForm.add("formValues", new String(formValues.getBytes("UTF-8"),"ISO-8859-1"));
-			wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".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);
 			HttpHeaders headers = new HttpHeaders();
 			//如果EKP对该接口启用了Basic认证，那么客户端需要加入
@@ -128,53 +130,152 @@ public class EKPUtil {
 		}
 	}
 
+	/**
+	 * 将类转换成EKP要求的格式
+	 *
+	 * @author zhaji
+	 * @param param 转换类
+	 * @return {@link TInsuranceSettlePushParam}
+	 */
 	public static TInsuranceSettlePushParam InsuranceDetail2PushParam(EKPInteractiveParam param){
 			String format = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
 			TInsuranceSettlePushParam pushParam = new TInsuranceSettlePushParam();
+			//ekpId
+			if(null != param.getId() && null != param.getDefaultSettleId()){
+				pushParam.setFd_3afa8a70006bea(param.getId()+CommonConstants.DOWN_LINE_STRING+param.getDefaultSettleId());
+			}else{
+				pushParam.setFd_3afa8a70006bea(CommonConstants.EMPTY_STRING);
+			}
 			//单据类型
+			if(null != param.getSettleType()){
 				pushParam.setFd_3adfe6af71a1cc(param.getSettleType());
+			}else{
+				pushParam.setFd_3adfe6af71a1cc(CommonConstants.ZERO_INT);
+			}
 			//项目编码
 			pushParam.setFd_3adfe658c6229e(param.getDeptNo());
+			if(null != param.getDeptNo()){
+				pushParam.setFd_3adfe658c6229e(param.getDeptNo());
+			}else{
+				pushParam.setFd_3adfe658c6229e(CommonConstants.EMPTY_STRING);
+			}
 			//项目名称
 			pushParam.setFd_3adfe6592b4158(param.getDeptName());
+			if(null != param.getDeptName()){
+				pushParam.setFd_3adfe6592b4158(param.getDeptName());
+			}else{
+				pushParam.setFd_3adfe6592b4158(CommonConstants.EMPTY_STRING);
+			}
 			//客户编码
 			pushParam.setFd_3adfe6598281e8(param.getCustomerCode());
+			if(null != param.getCustomerCode()){
+				pushParam.setFd_3adfe6598281e8(param.getCustomerCode());
+			}else{
+				pushParam.setFd_3adfe6598281e8(CommonConstants.EMPTY_STRING);
+			}
 			//客户名称
 			pushParam.setFd_3adfe7a2688902(param.getCustomerName());
+			if(null != param.getCustomerName()){
+				pushParam.setFd_3adfe7a2688902(param.getCustomerName());
+			}else{
+				pushParam.setFd_3adfe7a2688902(CommonConstants.EMPTY_STRING);
+			}
 			//发生日期
 			pushParam.setFd_3adfe67c24dace(format);
 			//姓名
 			pushParam.setFd_3adfe65d759650(param.getEmpName());
+			if(null != param.getEmpName()){
+				pushParam.setFd_3adfe65d759650(param.getEmpName());
+			}else{
+				pushParam.setFd_3adfe65d759650(CommonConstants.EMPTY_STRING);
+			}
 			//身份证号
 			pushParam.setFd_3adfe65dbd9f68(param.getEmpIdcardNo());
+			if(null != param.getEmpIdcardNo()){
+				pushParam.setFd_3adfe65dbd9f68(param.getEmpIdcardNo());
+			}else{
+				pushParam.setFd_3adfe65dbd9f68(CommonConstants.EMPTY_STRING);
+			}
 			//发票号
+			if(null != param.getInvoiceNo()){
 				pushParam.setFd_3adfe65e0cd094(param.getInvoiceNo());
+			}else{
+				pushParam.setFd_3adfe65e0cd094(CommonConstants.EMPTY_STRING);
+			}
 			//险种
+			if(null != param.getInsuranceTypeName()){
 				pushParam.setFd_3adfe65f6599e4(param.getInsuranceTypeName());
+			}else{
+				pushParam.setFd_3adfe65f6599e4(CommonConstants.EMPTY_STRING);
+			}
 			//保险公司
+			if(null != param.getInsuranceCompanyName()){
 				pushParam.setFd_3adfe65ea04728(param.getInsuranceCompanyName());
+			}else{
+				pushParam.setFd_3adfe65ea04728(CommonConstants.EMPTY_STRING);
+			}
 			//保单号
+			if(null != param.getPolicyNo()){
 				pushParam.setFd_3adfe65e60e110(param.getPolicyNo());
+			}else{
+				pushParam.setFd_3adfe65e60e110(CommonConstants.EMPTY_STRING);
+			}
 			//保险开始日期
+			if(null != param.getPolicyStart()){
 				pushParam.setFd_3adfe6b7e0ede8(param.getPolicyStart().toString());
+			}else{
+				pushParam.setFd_3adfe6b7e0ede8(CommonConstants.EMPTY_STRING);
+			}
 			//保险结束日期
+			if(null != param.getPolicyEnd()){
 				pushParam.setFd_3adfe6b847bfe6(param.getPolicyEnd().toString());
+			}else{
+				pushParam.setFd_3adfe6b847bfe6(CommonConstants.EMPTY_STRING);
+			}
 			//购买标准
 			pushParam.setFd_3adfe6d55384c6(param.getBuyStandard());
+			if(null != param.getBuyStandard()){
+				pushParam.setFd_3adfe6d55384c6(param.getBuyStandard());
+			}else{
+				pushParam.setFd_3adfe6d55384c6(CommonConstants.EMPTY_STRING);
+			}
 			//实际保费
-			pushParam.setFd_3adfe6610c0d2c(param.getActualPremium());
-
+			if(null != param.getActualPremium()){
+				pushParam.setFd_3adfe6610c0d2c(param.getActualPremium().toString());
+			}else{
+				pushParam.setFd_3adfe6610c0d2c(CommonConstants.EMPTY_STRING);
+			}
 			//医保
+			if(null != param.getMedicalQuota()){
 				pushParam.setFd_3adfe66041a996(param.getMedicalQuota());
-
+			}else{
+				pushParam.setFd_3adfe66041a996(CommonConstants.EMPTY_STRING);
+			}
 			//事故或残疾
+			if(null != param.getDieDisableQuota()){
 				pushParam.setFd_3adfe6609aa810(param.getDieDisableQuota());
-
+			}else{
+				pushParam.setFd_3adfe6609aa810(CommonConstants.EMPTY_STRING);
+			}
 			//预估保费
-			pushParam.setFd_3adfe6e30f2a3c(param.getEstimatePremium());
-
+			if(null != param.getEstimatePremium()){
+				pushParam.setFd_3adfe6e30f2a3c(param.getEstimatePremium().toString());
+			}else{
+				pushParam.setFd_3adfe6e30f2a3c(CommonConstants.EMPTY_STRING);
+			}
 			//结算月
+			if(null != param.getSettleMonth()){
 				pushParam.setFd_3aea2f0180eccc(param.getSettleMonth());
+			}else{
+				pushParam.setFd_3aea2f0180eccc(CommonConstants.EMPTY_STRING);
+			}
+
+			//交易类型
+			if(null != param.getInteractiveType()){
+				pushParam.setFd_3af9197b31071c(param.getInteractiveType());
+			}else{
+				pushParam.setFd_3af9197b31071c(CommonConstants.ZERO_INT);
+			}
 
 		return pushParam;
 	}

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

@@ -26,6 +26,13 @@ public class EKPInteractiveParam implements Serializable {
 	@Schema(description = "主键")
 	private String id;
 
+	/**
+	 * 结算id
+	 */
+	@Schema(description = "结算id")
+	private String defaultSettleId;
+
+
 	/**
 	 * 单据类型 (0、与薪资合并结算 1、单独结算)
 	 */
@@ -149,7 +156,7 @@ public class EKPInteractiveParam implements Serializable {
 	/**
 	 * 	单据状态
 	 */
-	@Schema(description = "状态:1新增结算单,2作废结算信息,3更新保单信息")
+	@Schema(description = "状态:1新增结算单,2更新保单信息,3作废结算信息")
 	private Integer interactiveType;
 
 }

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

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
 import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.Date;
 
 /**
  * @author zhaji
@@ -19,10 +16,6 @@ import java.util.Date;
  */
 @Data
 public class TInsuranceSettlePushParam{
-	/**
-	 * ID主键 36位
-	 */
-	private String	fd_id ;
 
 	/**
 	 * 单据类型 200 单选（1,预估单，2,实缴单，3,差异单）
@@ -42,12 +35,6 @@ public class TInsuranceSettlePushParam{
 	@Schema(description = "项目名称")
 	private String	fd_3adfe6592b4158;
 
-	/**
-	 * 单号 200
-	 */
-	@Schema(description = "单号")
-	private String	fd_3adfe67a9f6364;
-
 	/**
 	 * 客户编码 200
 	 */
@@ -127,7 +114,7 @@ public class TInsuranceSettlePushParam{
 	 * 实际保费 精确到小数点后两位
 	 */
 	@Schema(description = "实际保费")
-	private BigDecimal fd_3adfe6610c0d2c;
+	private String fd_3adfe6610c0d2c;
 
 	/**
 	 * 医保 精确到小数点后两位
@@ -145,61 +132,8 @@ public class TInsuranceSettlePushParam{
 	 * 预估保费（应收） 精确到小数点后两位
 	 */
 	@Schema(description = "预估保费")
-	private BigDecimal	fd_3adfe6e30f2a3c;
-
-	/**
-	 * 结算状态 200 单选（1未结算，2结算中，3已结算）
-	 */
-	@Schema(description = "结算状态")
-	private String	fd_3adfe6ec6a8cbe;
-
-	/**
-	 * 收款状态 200 单选（1未收，2已收）
-	 */
-	@Schema(description = "收款状态")
-	private String	fd_3adfe6ef5dfaac;
-
-	/**
-	 * 收入结算单号 200
-	 */
-	@Schema(description = "收入结算单号")
-	private String	fd_3adfe79fd04606;
-
-	/**
-	 * 收款认领单号 200
-	 */
-	@Schema(description = "收款认领单号")
-	private String	fd_3adfe7a117f086;
+	private String	fd_3adfe6e30f2a3c;
 
-	/**
-	 * 应支出 精确到小数点后两位
-	 */
-	@Schema(description = "应支出")
-	private Double	fd_3adfe6e3911ffe;
-
-	/**
-	 * 支出结算状态 200 单选（已结算，结算中，未结算）
-	 */
-	@Schema(description = "支出结算状态")
-	private String	fd_3adfe6eda67236;
-
-	/**
-	 * 付款状态 200 单选（已收，未收）
-	 */
-	@Schema(description = "付款状态")
-	private String	fd_3adfe6f05531ec;
-
-	/**
-	 * 支出结算单号 200
-	 */
-	@Schema(description = "支出结算单号")
-	private String	fd_3adfe7a035849c;
-
-	/**
-	 * 付款单号 200
-	 */
-	@Schema(description = "付款单号")
-	private String	fd_3adfe7a08eba96;
 
 	/**
 	 * 结算月份 200
@@ -208,10 +142,16 @@ public class TInsuranceSettlePushParam{
 	private String	fd_3aea2f0180eccc;
 
 	/**
-	 * 状态 200
+	 * 交易类型 200
+	 */
+	@Schema(description = "交易类型 1新增结算单,2作废结算信息,3更新保单信息")
+	private Integer	fd_3af9197b31071c;
+
+	/**
+	 * 商险ID 200
 	 */
-	@Schema(description = "状态1新增结算单,2作废结算信息,3更新保单信息")
-	private String	fd_3af9197b31071c;
+	@Schema(description = "商险ID（商险id_结算id）")
+	private String	fd_3afa8a70006bea;
 
 
 }

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

@@ -51,6 +51,8 @@
             <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
             <result property="updateTime" column="UPDATE_TIME" jdbcType="TIMESTAMP"/>
             <result property="deleteFlag" column="DELETE_FLAG" jdbcType="TINYINT"/>
+			<result property="handledBy" column="HANDLED_BY" jdbcType="VARCHAR"/>
+			<result property="handledTime" column="HANDLED_TIME" jdbcType="TIMESTAMP"/>
 	</resultMap>
 
     <sql id="Base_Column_List">
@@ -65,7 +67,7 @@
         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
+        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">
@@ -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>
@@ -886,7 +888,6 @@
 		<where>
 			1=1
 			AND EMP_IDCARD_NO = #{idCard}
-			AND IS_EFFECT = 0
 		</where>
 		ORDER BY CREATE_TIME desc
 	</select>