Merge branch 'develop'

yifu-common/yifu-common-ekp/src/main/resources/ekpIncomeConfig.properties

-income.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
-#income.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
+#income.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
+income.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
 income.fdModelIdManage=181d76db26e419a88dba97b0c406689e
 income.fdFlowIdManage=182d3b6e522b2690119e70d4ff082136
 income.fdModelIdRisk=181d76db26e4112e14b9bb4274d06ba1

yifu-common/yifu-common-ekp/src/main/resources/ekpOrderConfig.properties

-ekporder.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
-#ekporder.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
+#ekporder.url=http://192.168.0.228:8080/api/sys-modeling/appModelRestService/addModel
+ekporder.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
 ekporder.orderFdModelId=182f1b7ffe2e96f975564e44e559847d
 ekporder.orderFdFlowId=182f1c098ce991ca96bc927408792beb
 ekporder.replyFdModelId=182f1bb35bb2156fb9a02904bc88dd8a

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

@@ -42,6 +42,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAccountItemService;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAccountService;
 import com.yifu.cloud.plus.v1.yifu.salary.util.SalaryCommonUtil;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountSearchVo;
+import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryAccountSumVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryDetailVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.WageProofDto;
 import io.swagger.v3.oas.annotations.Operation;
@@ -411,5 +412,18 @@ public class TSalaryAccountController {
 		}
 		return R.ok(tSalaryAccountService.allYearExport(tSalaryAccount));
 	}
+
+	/**
+	 * @param salaryId
+	 * @Description: 提交时获取应发实发
+	 * @Author: hgw
+	 * @Date: 2023/4/18 16:30
+	 **/
+	@Operation(description = "提交时获取应发实发")
+	@GetMapping("/getAccountSumBySalaryId")
+	public R<TSalaryAccountSumVo> getAccountSumBySalaryId(@RequestParam String salaryId) {
+		// 劳务费，应发取值为导表的金额，不是加了税的应发。2023-4-23 11:21:10 产品倩倩与客服沟通的结果
+		return R.ok(tSalaryAccountService.getAccountSumBySalaryId(salaryId));
+	}
 	
 }

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

@@ -192,10 +192,15 @@ public class TSalaryStandardController {
 				YifuUser user = SecurityUtils.getUser();
 				if (user != null) {
 					// 添加流程进展明细
-					tSalaryStandardService.saveRecordLog(s, user, CommonConstants.TWO_STRING, "提交审核");
+					tSalaryStandardService.saveRecordLog(s, user, CommonConstants.TWO_STRING, "提交，并自动生成收入");
 					tSalaryStandard.setSubmitTime(new Date());
-					tSalaryStandard.setStatus(CommonConstants.ONE_INT);
+					tSalaryStandard.setStatus(CommonConstants.dingleDigitIntArray[11]);
+					tSalaryStandard.setIncomeStartTime(new Date());
 					tSalaryStandardService.updateById(tSalaryStandard);
+					tSalaryStandard = tSalaryStandardService.getById(tSalaryStandard.getId());
+					// 生成收入
+					tSalaryStandardService.doIncome(tSalaryStandard);
+
 					return R.ok("提交成功！");
 				} else {
 					return R.failed("请登录！");

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

@@ -125,4 +125,12 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
 	 **/
 	R<String> saveSalaryDiff(List<AccountByEkpDiffVo> voList);
 
+	/**
+	 * @Description: 提交后触发生成收入
+	 * @Author: hgw
+	 * @Date: 2023/4/18 16:44
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	R<String> doIncome(TSalaryStandard tSalaryStandard);
+
 }

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

@@ -242,6 +242,28 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 
 	}
 
+	@Override
+	public R<String> doIncome(TSalaryStandard tSalaryStandard) {
+		if (Common.isNotNull(tSalaryStandard)) {
+			R<TSettleDomainSelectVo> sdr = HttpDaprUtil.invokeMethodPost(archivesProperties.getAppUrl(), archivesProperties.getAppId()
+					, "/tsettledomain/inner/getSettleDomainVoById", tSalaryStandard.getDeptId()
+					, TSettleDomainSelectVo.class, SecurityConstants.FROM_IN);
+			// 结算主体
+			TSettleDomainSelectVo dept;
+			if (sdr != null && sdr.getData() != null) {
+				dept = sdr.getData();
+			} else {
+				return R.failed("获取项目信息失败，请联管理员！");
+			}
+			List<TSalaryAccount> salaryAccountList = salaryAccountService.getListByIncome(tSalaryStandard.getId());
+			if (salaryAccountList != null && !salaryAccountList.isEmpty()) {
+				// 异步-收入相关
+				doSalaryAsync.doIncomeDetail(dept, salaryAccountList, tSalaryStandard.getId(), tSalaryStandard);
+			}
+		}
+		return R.ok();
+	}
+
 	/**
 	 * @Description: 删除
 	 * @Author: hgw

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

@@ -2845,7 +2845,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		}
 		if (Common.isNotNull(excel.getFundReduceDate())){
 			// 公积金状态：派增（0待审核、1待办理、3办理成功、4办理失败9 审核不通过）、派减（5待审核 6待办理 7 办理成功 8 办理失败 ）
-			if (CommonConstants.THREE_STRING.equals(socialFund.getFundStatus())){
+			if (CommonConstants.THREE_STRING.equals(socialFund.getFundStatus())
+					|| CommonConstants.EIGHT_STRING.equals(socialFund.getFundStatus())){
 				temp.append(DispatchConstants.DISPATCH_FUND);
 			}
 			dispatch.setFundHandleStatus(CommonConstants.ZERO_STRING);