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

@@ -591,6 +591,36 @@ public class InsurancesConstants {
 	public static final String DELETE_INSURANCE_TYPE_STANDARD = "删除购买标准";
 
 
+	/**
+	 * 导入减员数据
+	 */
+	public static final String INSURANCE_REFUND_IMPORT = "导入减员数据";
+
+	/**
+	 * 导出待减员数据
+	 */
+	public static final String INSURANCE_REFUND_EXPORT = "导出待减员数据";
+
+	/**
+	 * 减员成功
+	 */
+	public static final String INSURANCE_REFUND_SUCCESS = "减员成功";
+
+
+	/**
+	 * 减员退回
+	 */
+	public static final String INSURANCE_REFUND_FAILED = "减员退回";
+
+	/**
+	 * 变更所属项目
+	 */
+	public static final String DEPT_CHANGE = "变更所属项目";
+
+	/**
+	 * 变更结算月
+	 */
+	public static final String MONTH_CHANGE = "变更结算月";
 
 
 }

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

@@ -26,4 +26,9 @@ public class Dept implements Serializable {
 	 */
 	@Schema(description = "项目名称")
 	private String projectName;
+
+	public Dept(String departNo, String departName) {
+		this.deptNo =departNo;
+		this.projectName =departName;
+	}
 }

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

@@ -41,7 +41,8 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 	public IPage<TInsuranceCompany> pageDiy(Page page, TInsuranceCompany insuranceCompany) {
 		LambdaQueryWrapper<TInsuranceCompany> wrapper = new LambdaQueryWrapper<>();
 		wrapper.orderByDesc(TInsuranceCompany::getCreateTime);
-		return this.baseMapper.selectPage(page,wrapper);
+		IPage<TInsuranceCompany> list = this.baseMapper.selectPage(page, wrapper);
+		return list;
 	}
 
 	@Override

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

@@ -51,6 +51,7 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 	 */
 	@Override
 	public IPage<InsuranceTypeVo> pageDiy(Page<TInsuranceType> page, TInsuranceType insuranceType) {
+
 		return this.baseMapper.selectInsuranceTypePage(page,insuranceType);
 	}
 

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

@@ -107,7 +107,7 @@
 				 #{item}
 			</foreach>
 		</if>
-		ORDER BY detail.CREATE_TIME DESC
+		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>
 
 	<select id="getInsuranceList" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
@@ -152,7 +152,7 @@
 				#{item}
 			</foreach>
 		</if>
-		ORDER BY detail.CREATE_TIME DESC
+		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>
 
 	<select id="getInsuranceDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceDetailVO">
@@ -284,7 +284,8 @@
 			detail.POLICY_END as policyEnd,
 			detail.POLICY_EFFECT as policyEffect,
 			detail.IS_USE as isUse,
-			detail.INVOICE_NO as isOverdue,
+			detail.IS_EFFECT as isEffect,
+			detail.IS_OVERDUE as isOverdue,
 			detail.INSURANCE_COMPANY_NAME as insuranceCompanyName,
 			detail.INSURANCE_TYPE_NAME as insuranceTypeName,
 			detail.BUY_STANDARD as buyStandard

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

@@ -69,7 +69,7 @@
 			a.INSURANCE_COMPANY_ID = b.ID
 		  and
 			a.DELETE_FLAG = 0
-
+		ORDER BY a.create_time DESC
 	</select>
     <select id="getInsuranceTypeDetailById" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo">
 		select

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPaymentInfoImportLogVo.java

@@ -40,7 +40,7 @@ public class TPaymentInfoImportLogVo extends RowIndex implements Serializable {
 	 */
 	@TableId(type = IdType.ASSIGN_ID)
 	@NotBlank(message = "主键 不能为空")
-	@ExcelAttribute(name = "主键", isNotEmpty = true, errorInfo = "主键 不能为空")
+	@ExcelAttribute(name = "id", isNotEmpty = true, errorInfo = "主键 不能为空")
 	@Schema(description = "主键")
 	@ExcelProperty("主键")
 	private Integer id;
@@ -48,7 +48,7 @@ public class TPaymentInfoImportLogVo extends RowIndex implements Serializable {
 	 * 姓名
 	 */
 	@Length(max = 50, message = "姓名 不能超过50 个字符")
-	@ExcelAttribute(name = "姓名", maxLength = 50)
+	@ExcelAttribute(name = "empName", maxLength = 50)
 	@Schema(description = "姓名")
 	@ExcelProperty("姓名")
 	private String empName;
@@ -56,7 +56,7 @@ public class TPaymentInfoImportLogVo extends RowIndex implements Serializable {
 	 * 身份证号
 	 */
 	@Length(max = 32, message = "身份证号 不能超过32 个字符")
-	@ExcelAttribute(name = "身份证号", maxLength = 32)
+	@ExcelAttribute(name = "idCard", maxLength = 32)
 	@Schema(description = "身份证号")
 	@ExcelProperty("身份证号")
 	private String idCard;
@@ -64,14 +64,14 @@ public class TPaymentInfoImportLogVo extends RowIndex implements Serializable {
 	 * 错误信息
 	 */
 	@Length(max = 500, message = "错误信息 不能超过500 个字符")
-	@ExcelAttribute(name = "错误信息", maxLength = 500)
+	@ExcelAttribute(name = "errMsg", maxLength = 500)
 	@Schema(description = "错误信息")
 	@ExcelProperty("错误信息")
 	private String errMsg;
 	/**
 	 * 问题行数
 	 */
-	@ExcelAttribute(name = "问题行数")
+	@ExcelAttribute(name = "line")
 	@Schema(description = "问题行数")
 	@ExcelProperty("问题行数")
 	private Integer line;
@@ -79,7 +79,7 @@ public class TPaymentInfoImportLogVo extends RowIndex implements Serializable {
 	 * 导入标识key
 	 */
 	@Length(max = 64, message = "导入标识key 不能超过64 个字符")
-	@ExcelAttribute(name = "导入标识key", maxLength = 64)
+	@ExcelAttribute(name = "randomKey", maxLength = 64)
 	@Schema(description = "导入标识key")
 	@ExcelProperty("导入标识key")
 	private String randomKey;

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoImportLogServiceImpl.java

@@ -86,7 +86,7 @@ public class TPaymentInfoImportLogServiceImpl extends ServiceImpl<TPaymentInfoIm
 			response.setCharacterEncoding("utf-8");
 			response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
 			// 这里 需要指定写用哪个class去写，然后写到第一个sheet，然后文件流会自动关闭
-			EasyExcel.write(out, EmployeeProjectExportVO.class).includeColumnFiledNames(getExportFieldNameDetailByClass(TPaymentInfoImportLogVo.class)).sheet("社保导入日志")
+			EasyExcel.write(out, TPaymentInfoImportLogVo.class).includeColumnFiledNames(getExportFieldNameDetailByClass(TPaymentInfoImportLogVo.class)).sheet("社保导入日志")
 					.doWrite(list);
 			out.flush();
 		} catch (IOException e) {