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

yifu-common/yifu-common-ekp/src/main/java/com/yifu.cloud.plus.v1/yifu/ekp/util/EkpInsuranceUtil.java

@@ -60,7 +60,6 @@ public class EkpInsuranceUtil {
 			//wholeForm.add("formValues", new String(formValues.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认证，那么客户端需要加入
 			//addAuth(headers,"yourAccount"+":"+"yourPassword");是VO，则使用APPLICATION_JSON

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

@@ -2033,16 +2033,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}else {
 				param.setInsuranceHandleCity(Integer.parseInt(redisHandleCityName));
 			}
-
 			//保单开始日期、结束日期，由系统根据保单号关联查询投保状态为 "已投保" 的商险记录的任意一条
-			TInsuranceDetail limitOne = this.baseMapper.selectOne(Wrappers.<TInsuranceDetail>query().lambda()
+			TInsuranceDetail limitOne = getOne(Wrappers.<TInsuranceDetail>query().lambda()
 					.eq(TInsuranceDetail::getPolicyNo, param.getPolicyNo())
 					.eq(TInsuranceDetail::getBuyHandleStatus, CommonConstants.THREE_INT)
 					//有效
-					.and(
+					/*.and(
 					wrapper -> wrapper.eq(TInsuranceDetail::getIsEffect,CommonConstants.ZERO_INT)
 							.or().isNull(TInsuranceDetail::getIsEffect)
-					)
+					)*/
 					//未过期
 					.and(
 					wrapper -> wrapper.eq(TInsuranceDetail::getIsOverdue,CommonConstants.ZERO_INT)
@@ -3360,7 +3359,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			return R.failed(InsurancesConstants.SETTLE_MONTH_CHANGE_LIST_IS_EMPTY);
 		}
 		Map<String, List<SettleMonthChangeCheckParam>> map = settleMonthChangeCheck(settleMonthCheckList, user);
-		//todo 生成EKP通知，通知ekp变更结算月份
 		List<SettleMonthChangeCheckParam> successList = map.get("successList");
 		List<SettleMonthChangeCheckParam> errorList = map.get("errorList");
 		List<SettleMonthChangeCheckParam> ekpList = new ArrayList<>();
@@ -3394,6 +3392,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			threadPool.execute(()->{
 				List<EkpInteractiveParam> deptDetail = getDeptDetail(ekpList);
 				for (EkpInteractiveParam ekpInteractiveParam : deptDetail) {
+					TInsuranceDetail byId = getById(ekpInteractiveParam.getDetailId());
+					BeanCopyUtils.copyProperties(byId,ekpInteractiveParam);
+					ekpInteractiveParam.setInteractiveType(InsurancesConstants.UPDATE_SETTLE_BILL);
 					String body = eKPInsuranceUtil.sendToEkp(ekpInteractiveParam);
 					if (!StringUtils.isBlank(body)){
 						TInsuranceOperate insuranceOperate = new TInsuranceOperate();
@@ -3452,6 +3453,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				EkpInteractiveParam interactiveParam = new EkpInteractiveParam();
 				TInsuranceDetail one = getOne(lambdaQuery().getWrapper().eq(TInsuranceDetail::getId, success.getId()));
 				BeanCopyUtils.copyProperties(one,interactiveParam);
+				interactiveParam.setDetailId(success.getId());
 				LambdaUpdateWrapper<TInsuranceDetail> updateWrapper = new LambdaUpdateWrapper<>();
 				Integer oldSettleType = success.getOldSettleType();
 				Integer newSettleType = success.getNewSettleType();
@@ -5375,7 +5377,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			if(null != byId.getActualPremium()){
 				param.setActualPremium(byId.getActualPremium().negate());
 			}
-			param.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
+			param.setInteractiveType(InsurancesConstants.CORRECT_SETTLE_BILL);
 			param.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
 			pushType = CommonConstants.FIVE_INT;
 		}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java

@@ -150,6 +150,7 @@ public class TSalaryStandardController {
 	@Operation(description = "简单分页查询")
 	@GetMapping("/auditPage")
 	public R<IPage<TSalaryStandard>> getTSalaryStandardAuditPage(Page<TSalaryStandard> page, TSalaryStandardSearchVo tSalaryStandard) {
+		tSalaryStandard.setStatus(CommonConstants.ONE_INT);
 		return new R<>(tSalaryStandardService.getTSalaryStandardAuditPage(page, tSalaryStandard));
 	}
 

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

@@ -32,12 +32,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsDeclarer;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsLabor;
+import com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsDeclarerMapper;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsLaborMapper;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsLaborService;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsLaborSearchVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsLaborVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
@@ -58,7 +61,11 @@ import java.util.stream.Collectors;
  */
 @Log4j2
 @Service
+@RequiredArgsConstructor
 public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMapper, TStatisticsLabor> implements TStatisticsLaborService {
+
+	private final TStatisticsDeclarerMapper declarerMapper;
+
 	/**
 	 * 本期劳务费申报表简单分页查询
 	 *
@@ -275,8 +282,15 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
 		}
 		String lastMonth =  DateUtil.addMonthByYearMonth(-1,declareMonth);  //上月
 		List<TStatisticsLabor> stdvoList = baseMapper.doStatisticsLabor(declareMonth,lastMonth);
-		for (TStatisticsLabor declarer : stdvoList) {
-			this.save(declarer);
+		for (TStatisticsLabor labor : stdvoList) {
+			TStatisticsDeclarer declarer = declarerMapper.selectOne(Wrappers.<TStatisticsDeclarer>query().lambda()
+					.eq(TStatisticsDeclarer::getDeclareMonth,declareMonth)
+					.eq(TStatisticsDeclarer::getEmpIdcard,labor.getEmpIdcard())
+					.eq(TStatisticsDeclarer::getDeclareUnit,labor.getDeclareUnit())
+					.last(CommonConstants.LAST_ONE_SQL));
+			if (Common.isNotNull(declarer) && CommonConstants.ZERO_STRING.equals(declarer.getIsDeclare())) {
+				this.save(labor);
+			}
 		}
 		return R.ok();
 	}

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

@@ -30,11 +30,14 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsDeclarer;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsLabor;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsRemuneration;
+import com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsDeclarerMapper;
 import com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsRemunerationMapper;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsRemunerationService;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsRemunerationSearchVo;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Service;
 
@@ -54,7 +57,11 @@ import java.util.stream.Collectors;
  */
 @Log4j2
 @Service
+@RequiredArgsConstructor
 public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsRemunerationMapper, TStatisticsRemuneration> implements TStatisticsRemunerationService {
+
+	private final TStatisticsDeclarerMapper declarerMapper;
+
 	/**
 	 * 本期稿酬申报表简单分页查询
 	 *
@@ -178,7 +185,14 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
 		String lastMonth =  DateUtil.addMonthByYearMonth(-1,declareMonth);  //上月
 		List<TStatisticsRemuneration> stdvoList = baseMapper.doStatisticsRemuneration(declareMonth,lastMonth);
 		for (TStatisticsRemuneration remuneration : stdvoList) {
-			this.save(remuneration);
+			TStatisticsDeclarer declarer = declarerMapper.selectOne(Wrappers.<TStatisticsDeclarer>query().lambda()
+					.eq(TStatisticsDeclarer::getDeclareMonth,declareMonth)
+					.eq(TStatisticsDeclarer::getEmpIdcard,remuneration.getEmpIdcard())
+					.eq(TStatisticsDeclarer::getDeclareUnit,remuneration.getDeclareUnit())
+					.last(CommonConstants.LAST_ONE_SQL));
+			if (Common.isNotNull(declarer) && CommonConstants.ZERO_STRING.equals(declarer.getIsDeclare())) {
+				this.save(remuneration);
+			}
 		}
 		return R.ok();
 	}

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

@@ -91,7 +91,7 @@
 	<!--统计-->
 	<select id="doStatisticsLabor" resultMap="tStatisticsLaborMap">
 		select
-			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX + a.SALARY_TAX_UNIT) PERSONAL_TAX,sum(a.RELAY_SALARY_UNIT) INCOME,
+			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(IFNULL(a.SALARY_TAX,0) + IFNULL(a.SALARY_TAX_UNIT,0)) PERSONAL_TAX,sum(a.RELAY_SALARY_UNIT) INCOME,
 			a.INVOICE_TITLE DECLARE_UNIT,'一般劳务报酬所得' INCOME_ITEM,'居民身份证' CARD_TYPE
 		from t_salary_account a
 		where a.DELETE_FLAG = 0 and a.SETTLEMENT_MONTH = #{lastMonth} and a.FORM_TYPE = '3'

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java

@@ -251,8 +251,8 @@ public class TDispatchInfoController {
 	@SysLog("派单信息记录表 批量导入-派减")
 	@PostMapping("/importListReduce")
 	//@PreAuthorize("@pms.hasPermission('demo_tdispatchinfo-batch-reduce')")
-	public R<List<ErrorMessage>> importListReduce(@RequestBody MultipartFile file){
-		return tDispatchInfoService.importReduceDiy(file.getInputStream());
+	public R<List<ErrorMessage>> importListReduce(@RequestBody MultipartFile file, @RequestParam(required = false)String orderId){
+		return tDispatchInfoService.importReduceDiy(file.getInputStream(),orderId);
 	}
 
 	/**

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

@@ -58,11 +58,11 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
 							 List<ErrorMessage> errorMessageList,
 							 YifuUser user, String orderId);
 
-	R<List<ErrorMessage>> importReduceDiy(InputStream inputStream);
+	R<List<ErrorMessage>> importReduceDiy(InputStream inputStream, String orderId);
 
 	@Transactional
 	@ShardingTransactionType(TransactionType.BASE)
-	void batchReduceDispatch(List<TDispatchReduceVo> excelVOList, List<ErrorMessage> errorMessageList, YifuUser user);
+	void batchReduceDispatch(List<TDispatchReduceVo> excelVOList, List<ErrorMessage> errorMessageList, YifuUser user, String orderId);
 
 	R<Boolean> removeByIdDiy(String id);
 

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

@@ -2312,7 +2312,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 
 
 	@Override
-	public R<List<ErrorMessage>> importReduceDiy(InputStream inputStream) {
+	public R<List<ErrorMessage>> importReduceDiy(InputStream inputStream, String orderId) {
 		YifuUser user = SecurityUtils.getUser();
 		if (Common.isEmpty(user)){
 			R.failed(CommonConstants.USER_FAIL);
@@ -2361,7 +2361,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				 */
 				private void saveData() {
 					log.info("{}条数据，开始存储数据库！", cachedDataList.size());
-					batchReduceDispatch(cachedDataList, errorMessageList,user);
+					batchReduceDispatch(cachedDataList, errorMessageList,user,orderId);
 					log.info("存储数据库成功！");
 				}
 			}).sheet().doRead();
@@ -2375,7 +2375,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	@ShardingTransactionType(TransactionType.BASE)
-	public void batchReduceDispatch(List<TDispatchReduceVo> excelVOList, List<ErrorMessage> errorMessageList, YifuUser user) {
+	public void batchReduceDispatch(List<TDispatchReduceVo> excelVOList, List<ErrorMessage> errorMessageList, YifuUser user, String orderId) {
 		if (!Common.isNotNull(excelVOList)){
 			return;
 		}
@@ -2424,6 +2424,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			// 初始化派单 和 社保公积金查询信息
 			dispatch = getDispatchInfo(empVo, excel, socialFund,setInfoVo,user);
 			try {
+				dispatch.setOrderId(orderId);
 				dispatch.setApplyNo(getApplyCode());
 				dispatch.setStatus(CommonConstants.ONE_STRING);
 				baseMapper.insert(dispatch);

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

@@ -432,7 +432,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			dispatchReduceVo.setRowIndex(CommonConstants.ONE_INT);
 			List<TDispatchReduceVo> dispatchImportList = new ArrayList<>();
 			dispatchImportList.add(dispatchReduceVo);
-			dispatchInfoService.batchReduceDispatch(dispatchImportList, errorMessageList, user);
+			dispatchInfoService.batchReduceDispatch(dispatchImportList, errorMessageList, user, orderId);
 			//  处理派减结果
 			errorMessage = handleDispatchAddRes(preInfo,errorMessageList);
 			if (null != errorMessage){
@@ -623,7 +623,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 				dispatchReduce(dispatchReduceVo, pre);
 				List<TDispatchReduceVo> dispatchImportList = new ArrayList<>();
 				dispatchImportList.add(dispatchReduceVo);
-				dispatchInfoService.batchReduceDispatch(dispatchImportList, errorMessageList, user);
+				dispatchInfoService.batchReduceDispatch(dispatchImportList, errorMessageList, user, orderId);
 
 				//处理派减结果
 				handleDispatchAddRes(pre, errorMessageList);