Merge branch 'develop' into feature-licancan

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

@@ -995,14 +995,14 @@ public class InsurancesConstants {
 	public static final String SETTLE_ZERO = "未结算";
 
 	/**
-	 * 已结算
+	 * 结算中
 	 */
-	public static final String SETTLE_ONE = "已结算";
+	public static final String SETTLE_ONE = "结算中";
 
 	/**
-	 * 结算中
+	 * 已结算
 	 */
-	public static final String SETTLE_TWO = "结算中";
+	public static final String SETTLE_TWO = "已结算";
 
 	/**
 	 * 无需结算

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

@@ -325,6 +325,12 @@ public class InsuranceDetailVO implements Serializable {
 	@Schema(description = "被替换人项目名称（替换类型专用字段）")
 	private String coverProjectName;
 
+	/**
+	 * 被替换人封面抬头
+	 */
+	@Schema(description = "被替换人封面抬头")
+	private String coveInvoiceTitle;
+
 	/**
 	 * 退保金额 todo 数据库暂时没有
 	 */

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

@@ -78,6 +78,12 @@ public class InsuredOrderListVo implements Serializable {
 	@Schema(description = "创建人(派单人)")
 	private String createName;
 
+	/**
+	 * 创建人id
+	 */
+	@Schema(description = "创建人id(派单人id)")
+	private String createBy;
+
 	/**
 	 * 创建人部门名称
 	 */

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

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -37,13 +38,13 @@ public class InsuredOrderParam implements Serializable {
 	 * 开始日期
 	 */
 	@Schema(description = "开始日期")
-	private String startDate;
+	private LocalDate startDate;
 
 	/**
 	 * 结束日期
 	 */
 	@Schema(description = "结束日期")
-	private String endDate;
+	private LocalDate endDate;
 
 	/**
 	 * 项目编码列表

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

@@ -1030,7 +1030,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 		}
 		if (CollectionUtils.isNotEmpty(successList)){
-			//todo 判断是否推送过保费到ekp，如果推送过就新增一条负的，将结算表中的数据求和放到明细表中
 			for (TInsuranceDetail detail : successList) {
 				if (StringUtils.isNotBlank(detail.getDefaultSettleId())){
 					TInsuranceSettle settle = tInsuranceSettleService.getById(detail.getDefaultSettleId());
@@ -1051,12 +1050,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 							detail.setEstimatePremium(new BigDecimal("0.00"));
 						}
 						tInsuranceSettleService.save(burden);
-						//推送负的给ekp
-						String s = pushEstimate(detail, CommonConstants.THREE_INT);
-						//这里退回的时候，必须置为null,防止是实缴的时候，登记保费出错
-						if(StringUtils.isNotBlank(s)){
-							detail.setDefaultSettleId(null);
+						SettleVo settleVo = getInsuranceDetailSettleStatus(detail.getId(), detail.getDefaultSettleId());
+						if(!Common.isEmpty(settleVo) && InsurancesConstants.SETTLE_ONE.equals(settleVo.getEstimateStatus()) && InsurancesConstants.SETTLE_ONE.equals(settleVo.getActualStatus())){
+							//推送负的给ekp
+							String s = pushEstimate(detail, CommonConstants.THREE_INT);
+							//这里退回的时候，必须置为null,防止是实缴的时候，登记保费出错
+							if(StringUtils.isNotBlank(s)){
+								detail.setDefaultSettleId(null);
+							}
 						}
+
 					}
 				}
 				//获取成功数据的remark
@@ -3169,13 +3172,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 					if (null != jsonObject){
 						record.setProjectName(Optional.ofNullable(jsonObject.getDepartName()).orElse(""));
 					}
-					TInsuranceDetail detail = new TInsuranceDetail();
+					TInsuranceDetail detail = getById(record.getId());
 					TInsuranceRefund refund = new TInsuranceRefund();
 					detail.setId(record.getId());
 					//update状态由「待减员」置为「减员中」
 					detail.setUpdateBy(user.getId());
 					detail.setUpdateTime(LocalDateTime.now());
 					detail.setReduceHandleStatus(CommonConstants.TWO_INT);
+
 					detailList.add(detail);
 					refund.setId(detail.getRefundId());
 					refund.setReduceHandleStatus(CommonConstants.TWO_INT);
@@ -4496,13 +4500,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if (Optional.ofNullable(settle).isPresent()){
 					SettleVo settleVo = getInsuranceDetailSettleStatus(insuranceDetail.getId(), defaultSettleId);
 					if(!Common.isEmpty(settleVo)){
-						if (InsurancesConstants.SETTLE_ONE.equals(settleVo.getActualStatus())){
-							param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_TWO_NOT_REGISTERED);
+						if (InsurancesConstants.SETTLE_ONE.equals(settleVo.getEstimateStatus()) || InsurancesConstants.SETTLE_ONE.equals(settleVo.getActualStatus())){
+							param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_CHANGE_SETTLE_STATUS_TWO_ERROR);
 							errorList.add(param);
 							continue;
 						}
-						if (InsurancesConstants.SETTLE_TWO.equals(settleVo.getActualStatus())){
-							param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_THREE_NOT_REGISTERED);
+						if (InsurancesConstants.SETTLE_TWO.equals(settleVo.getEstimateStatus()) || InsurancesConstants.SETTLE_TWO.equals(settleVo.getActualStatus())){
+							param.setErrorMessage(InsurancesConstants.SETTLE_MONTH_CHANGE_SETTLE_STATUS_THREE_ERROR);
 							errorList.add(param);
 							continue;
 						}
@@ -5003,13 +5007,13 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				if (Optional.ofNullable(settle).isPresent()){
 					SettleVo settleVo = getInsuranceDetailSettleStatus(insuranceDetail.getId(), defaultSettleId);
 					if(!Common.isEmpty(settleVo)){
-						if (InsurancesConstants.SETTLE_ONE.equals(settleVo.getActualStatus())){
-							param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_TWO_NOT_REGISTERED);
+						if (InsurancesConstants.SETTLE_ONE.equals(settleVo.getEstimateStatus()) || InsurancesConstants.SETTLE_ONE.equals(settleVo.getActualStatus())){
+							param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_SETTLE_STATUS_TWO_ERROR);
 							errorList.add(param);
 							continue;
 						}
-						if (InsurancesConstants.SETTLE_TWO.equals(settleVo.getActualStatus())){
-							param.setErrorMessage(InsurancesConstants.SETTLE_HANDLE_THREE_NOT_REGISTERED);
+						if (InsurancesConstants.SETTLE_TWO.equals(settleVo.getEstimateStatus()) || InsurancesConstants.SETTLE_TWO.equals(settleVo.getActualStatus())){
+							param.setErrorMessage(InsurancesConstants.DEPT_NO_CHANGE_SETTLE_STATUS_THREE_ERROR);
 							errorList.add(param);
 							continue;
 						}
@@ -5387,11 +5391,12 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			param.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
 			pushType = CommonConstants.SEVEN_INT;
 		}
-		if(StringUtils.isBlank(eKPInsuranceUtil.sendToEkp(param))){
+		String s = eKPInsuranceUtil.sendToEkp(param);
+		if(StringUtils.isBlank(s)){
 			saveInsuranceEkp(param,pushType);
 			return null;
 		}else {
-			return eKPInsuranceUtil.sendToEkp(param);
+			return s;
 		}
 	}
 

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/vo/TStatisticsCurrentReportMarketVo.java

@@ -34,7 +34,10 @@ import java.math.BigDecimal;
  * @date 2022-08-05 11:40:14
  */
 @Data
-public class TStatisticsCurrentReportMarketVo extends RowIndex implements Serializable {
+public class TStatisticsCurrentReportMarketVo implements Serializable {
+
+	@ExcelAttribute(name = "行号")
+	private Integer rowIndex;
 
 	/**
 	 * 税务主体(封面抬头)

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsCurrentReportMarketServiceImpl.java

@@ -135,18 +135,19 @@ public class TStatisticsCurrentReportMarketServiceImpl extends ServiceImpl<TStat
 								declareMonth = DateUtil.getYearMonth(cachedDataList.get(0).getCreateStart());
 							}
 							if (Common.isEmpty(declareMonth)) {
-								errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT
-										, "请检查‘税款所属期起’单元格格式是文本格式，且满足日期格式yyyy-MM-dd或yyyyMMdd"));
-							}
-							try {
-								Integer.parseInt(declareMonth);
-							} catch (Exception e) {
-								errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT
+								errorMessageList.add(new ErrorMessage(CommonConstants.TWO_INT
 										, "请检查‘税款所属期起’单元格格式是文本格式，且满足日期格式yyyy-MM-dd或yyyyMMdd"));
+							} else {
+								try {
+									Integer.parseInt(declareMonth);
+								} catch (Exception e) {
+									errorMessageList.add(new ErrorMessage(CommonConstants.TWO_INT
+											, "请检查‘税款所属期起’单元格格式是文本格式，且满足日期格式yyyy-MM-dd或yyyyMMdd"));
+								}
 							}
 							declareTitle = cachedDataList.get(0).getInvoiceTitle();
 							if (Common.isEmpty(declareTitle)) {
-								errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT
+								errorMessageList.add(new ErrorMessage(CommonConstants.TWO_INT
 										, "封面抬头全称-不能为空"));
 							}
 							if (Common.isNotNull(declareMonth) && Common.isNotNull(declareTitle)) {
@@ -157,7 +158,7 @@ public class TStatisticsCurrentReportMarketServiceImpl extends ServiceImpl<TStat
 								queryWrapperSc.setEntity(sdsCheck);
 								int count = baseMapper.getCountByMonthAndTitle(declareMonth, declareTitle);
 								if (count > CommonConstants.ZERO_INT) {
-									errorMessageList.add(new ErrorMessage(CommonConstants.ZERO_INT
+									errorMessageList.add(new ErrorMessage(CommonConstants.TWO_INT
 											, "当前月同一-封面抬头全称-已存在数据。"));
 								}
 							}

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsRemunerationMapper.xml

@@ -80,7 +80,6 @@
             1=1
             <include refid="tStatisticsRemuneration_where"/>
         </where>
-		group by a.EMP_IDCARD,a.DECLARE_MONTH,a.EMP_NAME
 		order by a.DECLARE_MONTH desc
     </select>
 
@@ -88,7 +87,7 @@
 	<select id="doStatisticsRemuneration" resultMap="tStatisticsRemunerationMap">
 		select
 			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX) PERSONAL_TAX,
-			sum(a.SALARY_TAX_UNIT) INCOME,a.INVOICE_TITLE DECLARE_UNIT,'居民身份证' CARD_TYPE
+			sum(a.RELAY_SALARY) INCOME,a.INVOICE_TITLE DECLARE_UNIT,'居民身份证' CARD_TYPE
 		from t_salary_account a
 		where a.DELETE_FLAG = 0 and a.SETTLEMENT_MONTH = #{lastMonth} and a.FORM_TYPE = '4'
 		GROUP BY a.EMP_IDCARD,DECLARE_UNIT