Merge branch 'feature-zhaji' into 'develop'

"feature-zhaJi:修改变更项目逻辑，增加险种排序"

See merge request fangxinjiang/yifu!74

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

@@ -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