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

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

@@ -31,6 +31,10 @@ public class InsurancesConstants {
 	 * 编辑
 	 */
 	public static final String EDIT = "编辑";
+	/**
+	 * 数据发生变动，请刷新数据后重新办理
+	 */
+	public static final String CHANGE_ERROR = "数据发生变动，请刷新数据后重新办理";
 	/**
 	 * 导出办理
 	 */

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

 package com.yifu.cloud.plus.v1.yifu.insurances.util;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.TInsuranceSettlePushParam;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.*;
 import org.springframework.util.LinkedMultiValueMap;
@@ -22,6 +24,8 @@ public class EKPUtil {
 	 */
 	public static void testAddNewsInRestTemplate() throws Exception{
 		RestTemplate yourRestTemplate = new RestTemplate();
+		TInsuranceSettlePushParam formValues = new TInsuranceSettlePushParam();
+		String jsonObject = new ObjectMapper().writeValueAsString(formValues);
 		//指向EKP的接口url
 		String url = "http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel";
 		//把ModelingAppModelParameterAddForm转换成MultiValueMap
@@ -32,6 +36,7 @@ public class EKPUtil {
 		wholeForm.add("fdModelId", "181d73279372e5a55438a47d7436ab7e");
 		wholeForm.add("fdFlowId", "18267f206233f29cbd3c5ee425c9408a");
 		wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".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") );
 
 		HttpHeaders headers = new HttpHeaders();
 		//如果EKP对该接口启用了Basic认证，那么客户端需要加入

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

 package com.yifu.cloud.plus.v1.yifu.insurances.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -52,6 +53,12 @@ public class InsuranceExportListVO implements Serializable {
 	@Schema(description = " 投保类型， 1新增、3批增、4替换")
 	private Integer buyType;
 
+	/**
+	 * 投保办理状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
+	 */
+	@JsonIgnore
+	private Integer buyHandleStatus;
+
 	/**
 	 * 购买月数
 	 */
@@ -150,6 +157,12 @@ public class InsuranceExportListVO implements Serializable {
 	@Schema(description = "结算类型 (0、预估 1、实缴)")
 	private Integer settleType;
 
+	/**
+	 * 保单编号
+	 */
+	@Schema(description = "保单编号")
+	private String policyNo;
+
 	/**
 	 * 创建人姓名
 	 */

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 lombok.Data;
+import org.springframework.cglib.core.Local;
+
+import java.time.LocalDate;
 
 /**
  * @author zhaji
@@ -9,6 +12,159 @@ import lombok.Data;
  */
 @Data
 public class TInsuranceSettlePushParam {
+	/**
+	 * ID主键 36位
+	 */
+	private String	fd_id ;
+
+	/**
+	 * 单据类型 200 单选（预估单，实缴单，差异单）
+	 */
+	private String	fd_3adfe6af71a1cc;
+
+	/**
+	 * 项目编码 200
+	 */
+	private String	fd_3adfe658c6229e;
+
+	/**
+	 * 项目名称 200
+	 */
+	private String	fd_3adfe6592b4158;
+
+	/**
+	 * 单号 200
+	 */
+	private String	fd_3adfe67a9f6364;
+
+	/**
+	 * 客户编码 200
+	 */
+	private String	fd_3adfe6598281e8;
+
+	/**
+	 * 客户名称 200
+	 */
+	private String	fd_3adfe7a2688902;
+
+	/**
+	 * 发生日期 	"xxxx--xx--xx"
+	 */
+	private LocalDate fd_3adfe67c24dace;
+
+	/**
+	 * 姓名 200
+	 */
+	private String	fd_3adfe65d759650;
+
+	/**
+	 * 身份证号 200
+	 */
+	private String	fd_3adfe65dbd9f68;
+
+	/**
+	 * 发票号 200
+	 */
+	private String	fd_3adfe65e0cd094;
+
+	/**
+	 * 险种 200
+	 */
+	private String	fd_3adfe65f6599e4;
+
+	/**
+	 * 保险公司 200
+	 */
+	private String	fd_3adfe65ea04728;
+
+	/**
+	 * 保单号 200
+	 */
+	private String	fd_3adfe65e60e110;
+
+	/**
+	 * 保险开始日期 "xxxx--xx--xx"
+	 */
+	private LocalDate	fd_3adfe6b7e0ede8;
+
+	/**
+	 * 保险结束日期 "xxxx--xx--xx"
+	 */
+	private LocalDate	fd_3adfe6b847bfe6;
+
+	/**
+	 * 购买标准 精确到小数点后两位
+	 */
+	private Double	fd_3adfe6d55384c6;
+
+	/**
+	 * 实际保费 精确到小数点后两位
+	 */
+	private Double	fd_3adfe6610c0d2c;
+
+	/**
+	 * 医保 精确到小数点后两位
+	 */
+	private Double	fd_3adfe66041a996;
+
+	/**
+	 * 事故或残疾 200
+	 */
+	private String	fd_3adfe6609aa810;
+
+	/**
+	 * 应收 精确到小数点后两位
+	 */
+	private Double	fd_3adfe6e30f2a3c;
+
+	/**
+	 * 应收 200 单选（已结算，结算中，未结算）
+	 */
+	private String	fd_3adfe6ec6a8cbe;
+
+	/**
+	 * 收款状态 200 单选（已收，未收）
+	 */
+	private String	fd_3adfe6ef5dfaac;
+
+	/**
+	 * 收入结算单号 200
+	 */
+	private String	fd_3adfe79fd04606;
+
+	/**
+	 * 收款认领单号 200
+	 */
+	private String	fd_3adfe7a117f086;
+
+	/**
+	 * 应支出 精确到小数点后两位
+	 */
+	private Double	fd_3adfe6e3911ffe;
+
+	/**
+	 * 支出结算状态 200 单选（已结算，结算中，未结算）
+	 */
+	private String	fd_3adfe6eda67236;
+
+	/**
+	 * 付款状态 200 单选（已收，未收）
+	 */
+	private String	fd_3adfe6f05531ec;
+
+	/**
+	 * 支出结算单号 200
+	 */
+	private String	fd_3adfe7a035849c;
+
+	/**
+	 * 付款单号 200
+	 */
+	private String	fd_3adfe7a08eba96;
 
+	/**
+	 * 结算月份 200
+	 */
+	private String	fd_3aea2f0180eccc;
 
 }

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

@@ -208,7 +208,7 @@ public class TInsuranceDetailController {
 	@Operation(summary = "导出办理", description = "导出办理")
 	@PostMapping("/getInsuranceExportList")
 	public R<List<InsuranceExportListVO>> getInsuranceExportList(@RequestBody InsuranceExportListParam param) {
-		return R.ok(tInsuranceDetailService.getInsuranceExportList(param));
+		return tInsuranceDetailService.getInsuranceExportList(param);
 	}
 
 	/**

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

@@ -134,9 +134,9 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 *
 	 * @author licancan
 	 * @param param
-	 * @return {@link List<InsuranceExportListVO>}
+	 * @return {@link R<List<InsuranceExportListVO>>}
 	 */
-	List<InsuranceExportListVO> getInsuranceExportList(InsuranceExportListParam param);
+	R<List<InsuranceExportListVO>> getInsuranceExportList(InsuranceExportListParam param);
 
 	/**
 	 * 投保退回

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

@@ -781,18 +781,26 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	 * @author licancan
 	 */
 	@Override
-	public List<InsuranceExportListVO> getInsuranceExportList(InsuranceExportListParam param) {
+	public R<List<InsuranceExportListVO>> getInsuranceExportList(InsuranceExportListParam param) {
 		YifuUser user = SecurityUtils.getUser();
 		List<InsuranceExportListVO> insuranceExportList = new ArrayList<>();
 		//todo 根据登录人获取数据权限
 		String regionSQL = getRegionSQL(user);
 		param.setRegionSql(regionSQL);
 		if(StringUtils.isBlank(regionSQL)){
-			return insuranceExportList;
+			return R.ok(insuranceExportList);
 		}
 		//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待投保」的结果集
 		if (CollectionUtils.isNotEmpty(param.getIdList())){
 			insuranceExportList =  baseMapper.getInsuranceExportListBySelect(param.getIdList());
+
+			if (CollectionUtils.isNotEmpty(insuranceExportList)){
+				for (InsuranceExportListVO exportListVO : insuranceExportList) {
+					if (exportListVO.getBuyHandleStatus() != CommonConstants.ONE_INT){
+						return R.failed(InsurancesConstants.CHANGE_ERROR);
+					}
+				}
+			}
 		}else {
 			insuranceExportList = baseMapper.getInsuranceExportList(param);
 		}
@@ -875,7 +883,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 
 		}
-		return insuranceExportList;
+		return R.ok(insuranceExportList);
 	}
 
 	/**

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

@@ -141,12 +141,6 @@
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
 			and detail.DEPT_NO = #{param.deptNo}
 		</if>
-		<if test="param.deptNo == null or param.deptNo.trim() == ''">
-			and detail.DEPT_NO in
-			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-		</if>
 		<if test="param.buyHandleStatus != null">
 			and detail.BUY_HANDLE_STATUS = #{param.buyHandleStatus}
 		</if>
@@ -332,6 +326,7 @@
 		detail.EMP_NAME as empName,
 		detail.EMP_IDCARD_NO as empIdcardNo,
 		detail.BUY_TYPE as buyType,
+		detail.BUY_HANDLE_STATUS as buyHandleStatus,
 		detail.POST as post,
 		detail.INSURANCE_PROVINCE_NAME as insuranceProvinceName,
 		detail.INSURANCE_CITY_NAME as insuranceCityName,
@@ -347,9 +342,10 @@
 		detail.SETTLE_MONTH as settleMonth,
 		detail.SETTLE_TYPE as settleType,
 		detail.CREATE_NAME as createName,
+		detail.POLICY_NO as policyNo,
 		detail.REMARK as remark
 		from t_insurance_detail detail
-		where detail.DELETE_FLAG = 0 and detail.BUY_HANDLE_STATUS = 1 and detail.id in
+		where detail.DELETE_FLAG = 0 and detail.id in
 		<foreach collection="idList" index="index" item="item" open="(" separator="," close=")">
 			#{item}
 		</foreach>
@@ -377,6 +373,7 @@
 			detail.SETTLE_MONTH as settleMonth,
 			detail.SETTLE_TYPE as settleType,
 			detail.CREATE_NAME as createName,
+			detail.POLICY_NO as policyNo,
 			detail.REMARK as remark
 		from t_insurance_detail detail
 		where detail.DELETE_FLAG = 0 and detail.BUY_HANDLE_STATUS = 1