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

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/CertRecordSearchVo.java

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @Author fxj
@@ -14,7 +15,8 @@ import java.time.LocalDateTime;
  */
 @Data
 public class CertRecordSearchVo extends TCertRecord {
-	private String ids;
+
+	private List<String> idList;
 
 	/**
 	 * 创建时间区间 [开始时间，结束时间]

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeProjectExportParamVO.java

@@ -502,4 +502,6 @@ public class EmployeeProjectExportParamVO extends BaseEntity {
 	 */
 	@Schema(description = "导出IDS")
 	private String ids;
+
+	private List<String> exportFields;
 }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TCertRecordController.java

@@ -51,7 +51,6 @@ import java.util.List;
 @RequiredArgsConstructor
 @RequestMapping("/tcertrecord" )
 @Tag(name = "证明开具记录表管理")
-@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class TCertRecordController {
 
     private final TCertRecordService tCertRecordService;
@@ -87,9 +86,9 @@ public class TCertRecordController {
      * @return
      */
     @Operation(summary = "不分页查询", description = "不分页查询")
-    @GetMapping("/noPage" )
+    @PostMapping("/noPage" )
     //@PreAuthorize("@pms.hasPermission('demo_tcertrecord_get')" )
-    public R<List<TCertRecord>> getTCertRecordNoPage(CertRecordSearchVo searchVo) {
+    public R<List<TCertRecord>> getTCertRecordNoPage(@RequestBody CertRecordSearchVo searchVo) {
 		setAuth(searchVo);
         return R.ok(tCertRecordService.getTCertRecordNoPage(searchVo));
     }

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TCutsomerDataPermissonController.java

@@ -55,8 +55,8 @@ public class TCutsomerDataPermissonController {
    * @return
    */
   @Operation(description = "导出的list")
-  @GetMapping("/getList")
-  public R<List<TCutsomerDataPermisson>> getTCutsomerDataPermissonList(TCutsomerDataPermisson tCutsomerDataPermisson) {
+  @PostMapping("/getList")
+  public R<List<TCutsomerDataPermisson>> getTCutsomerDataPermissonList(@RequestBody TCutsomerDataPermisson tCutsomerDataPermisson) {
     return  new R<>(tCutsomerDataPermissonService.getTCutsomerDataPermissonList(tCutsomerDataPermisson));
   }
 

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeProjectController.java

@@ -240,34 +240,30 @@ public class TEmployeeProjectController {
 
 	/**
 	 * 通过id批量删除项目档案
-	 * @param ids
 	 * @return R
 	 */
 	@Operation(summary = "通过id批量删除项目档案", description = "通过id批量删除项目档案")
 	@SysLog("通过id批量删除项目档案" )
 	@PostMapping("/deletebyIds" )
 	@PreAuthorize("@pms.hasPermission('archives_temployeeproject_batchdel')" )
-	public R<List<ErrorMessage>> removeByIds(@RequestParam String ids) {
-		return tEmployeeProjectService.batchRemoveByIds(ids);
+	public R<List<ErrorMessage>> removeByIds(@RequestBody List<String> idList) {
+		return tEmployeeProjectService.batchRemoveByIds(idList);
 	}
 
 	/**
 	 * 批量导出项目档案信息
 	 * @param projectDTO
-	 * @param idstr
-	 * @param exportFields
 	 * @return R<List>
 	 * @Author huyc
 	 * @Date 2022-06-21
 	 **/
 	@PostMapping("/export")
-	public void export(HttpServletResponse response, @RequestParam(name = "idstr", required = false)String idstr,
-					   @RequestBody List<String> exportFields, EmployeeProjectExportParamVO projectDTO) {
+	public void export(HttpServletResponse response, @RequestBody  EmployeeProjectExportParamVO projectDTO) {
 		YifuUser user = SecurityUtils.getUser();
 		if (user != null && Common.isNotNull(user.getId())) {
 			menuUtil.setAuthSql(user, projectDTO);
 		}
-		tEmployeeProjectService.listExportProject(response,projectDTO,idstr,exportFields);
+		tEmployeeProjectService.listExportProject(response,projectDTO,projectDTO.getExportFields());
 	}
 
 	/**

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TSettleDomainController.java

@@ -185,6 +185,7 @@ public class TSettleDomainController {
 		List<TSettleDomainSelectVo> list = new ArrayList<>();
 		TSettleDomain tSettleDomain = tSettleDomainService.getById(tSettleDomainSelectVo.getId());
 		BeanUtils.copyProperties(tSettleDomain,tSettleDomainSelectVo);
+		tSettleDomainSelectVo.setCustomerCode(tSettleDomain.getCustomerNo());
 		list.add(tSettleDomainSelectVo);
 		TSettleDomainListVo listVo = new TSettleDomainListVo();
 		listVo.setListSelectVO(list);
@@ -205,6 +206,7 @@ public class TSettleDomainController {
 				.eq(TSettleDomain::getDepartNo, tSettleDomainSelectVo.getDepartNo())
 				.last(CommonConstants.LAST_ONE_SQL));
 		BeanUtils.copyProperties(tSettleDomain,tSettleDomainSelectVo);
+		tSettleDomainSelectVo.setCustomerCode(tSettleDomain.getCustomerNo());
 		list.add(tSettleDomainSelectVo);
 		TSettleDomainListVo listVo = new TSettleDomainListVo();
 		listVo.setListSelectVO(list);

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TEmployeeProjectService.java

@@ -150,21 +150,19 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
 	 * @Date: 2022/6/22 12:30
 	 * @return: R
 	 **/
-	R<List<ErrorMessage>> batchRemoveByIds(String ids);
+	R<List<ErrorMessage>> batchRemoveByIds(List<String> ids);
 
 	IPage<TEmployeeProject> getTEmployeeProjectInfoPage(Page page, TEmployeeProject vo);
 
 	/**
 	 * @param projectDTO
-	 * @param idstr
 	 * @param exportFields
 	 * @Description: 批量导出项目档案
 	 * @Author: huyc
 	 * @Date: 2022/6/23 10:30
 	 * @return: R
 	 **/
-	void listExportProject(HttpServletResponse response, EmployeeProjectExportParamVO projectDTO,
-						   String idstr, List<String> exportFields);
+	void listExportProject(HttpServletResponse response, EmployeeProjectExportParamVO projectDTO, List<String> exportFields);
 	/**
 	 * @param employeeInfo
 	 * @Description: 新增项目档案

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCertRecordServiceImpl.java

@@ -137,9 +137,8 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
 	@Override
 	public List<TCertRecord> getTCertRecordNoPage(CertRecordSearchVo searchVo) {
 		LambdaQueryWrapper<TCertRecord> wrapper = buildQueryWrapper(searchVo);
-		List<String> idList = Common.getList(searchVo.getIds());
-		if (Common.isNotNull(idList)){
-			wrapper.in(TCertRecord::getId,idList);
+		if (Common.isNotNull(searchVo.getIdList())){
+			wrapper.in(TCertRecord::getId,searchVo.getIdList());
 		}
 		if (Common.isNotNull(searchVo.getAuthSql())) {
 			if (Common.isNotNull(searchVo.getAuthSql()) && searchVo.getAuthSql().contains("a.")) {

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java

@@ -2335,6 +2335,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
 		audit.setLinkId(contract.getId());
 		audit.setLinkType(CommonConstants.ONE_INT);
 		audit.setRootName("提交申请");
+		contractAuditMapper.insert(audit);
 	}
 
 	private void saveEmp(Map<String, EmpAddDispatchVo> empAddsMap) {

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

@@ -1107,22 +1107,19 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 
 	@Override
 	@Transactional
-	public R<List<ErrorMessage>> batchRemoveByIds(String ids) {
+	public R<List<ErrorMessage>> batchRemoveByIds(List<String> ids) {
 		List<ErrorMessage> errorList = new ArrayList<>();
 
 		List<TEmployeeProject> updList = new ArrayList<>();
 
 		List<TEmployeeInfo> infoUpdList = new ArrayList<>();
 
-		List<String> idsList;
-		if (!Common.isEmpty(ids)) {
-			idsList = Common.initStrToList(ids, CommonConstants.COMMA_STRING);
-		} else {
+		if (Common.isEmpty(ids)) {
 			return R.failed(ErrorCodes.PARAM_NOT_EMPTY);
 		}
 		List<TEmployeeProject> list = new ArrayList<>();
-		if (Common.isNotEmpty(idsList)) {
-			list = baseMapper.selectList(Wrappers.<TEmployeeProject>query().lambda().in(TEmployeeProject::getId, idsList)
+		if (Common.isNotEmpty(ids)) {
+			list = baseMapper.selectList(Wrappers.<TEmployeeProject>query().lambda().in(TEmployeeProject::getId, ids)
 					.eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT));
 		}
 		if (Common.isNotEmpty(list)) {
@@ -1176,8 +1173,7 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 	 * @Date 10:55 2022/6/23
 	 **/
 	@Override
-	public void listExportProject(HttpServletResponse response, EmployeeProjectExportParamVO searchVo, String idstr, List<String> exportFields) {
-		searchVo.setIdList(Common.getList(idstr));
+	public void listExportProject(HttpServletResponse response, EmployeeProjectExportParamVO searchVo, List<String> exportFields) {
 		String fileName = "项目档案批量导出" + DateUtil.getThisTime() + CommonConstants.XLSX;
 		// 根据用户传入确定要导出的字段
 		Set<String> includeColumnFiledNames = new HashSet<>(exportFields);

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml

@@ -431,7 +431,7 @@
 				${tEmployeeContractInfo.authSql}
 			</if>
 		</where>
-		order by a.CREATE_TIME desc
+		order by a.APPLY_NO desc
 	</select>
 
 	<!--list-->
@@ -443,7 +443,7 @@
 			a.DELETE_FLAG = 0
 			<include refid="tEmployeeContractInfo_where"/>
 		</where>
-		order by a.CREATE_TIME desc
+		order by a.APPLY_NO desc
 	</select>
 
 	<!--导出-->
@@ -459,7 +459,7 @@
 			</if>
 		</where>
 		GROUP BY a.id
-		order by a.CREATE_TIME desc
+		order by a.APPLY_NO desc
 	</select>
 
 	<!--导出历史合并-->
@@ -479,7 +479,7 @@
 			</if>
 		</where>
 		GROUP BY a.EMP_IDCARD,a.SETTLE_DOMAIN
-		order by a.CREATE_TIME desc
+		order by a.APPLY_NO desc
 	</select>
 
 	<!--tEmployeeContractInfo简单分页查询-->
@@ -537,7 +537,7 @@
 				${tEmployeeContractInfo.authSql}
 			</if>
 		</where>
-		order by a.CREATE_TIME desc
+		order by a.APPLY_NO desc
 		<if test="tEmployeeContractInfo != null">
 			<if test="tEmployeeContractInfo.limitStart != null">
 				limit #{tEmployeeContractInfo.limitStart},#{tEmployeeContractInfo.limitEnd}

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/ArchivesDaprUtil.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.TypeReference;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeContractInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeInfo;
 import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject;
+import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
 import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
@@ -12,6 +13,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprArchivesProperties;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
@@ -141,6 +143,25 @@ public class ArchivesDaprUtil {
 		return res;
 	}
 
+	/**
+	 * @param deptNo 部门编码
+	 * @Description: 获取部门信息
+	 * @Author: hgw
+	 * @Date: 2022/11/16 14:50
+	 * @return: com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
+	 **/
+	public TSettleDomainSelectVo selectDeptByNo(String deptNo){
+		TSettleDomainSelectVo dept = new TSettleDomainSelectVo();
+		dept.setDepartNo(deptNo);
+		R<TSettleDomainListVo> listVo = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl()
+				, daprArchivesProperties.getAppId(),"/tsettledomain/selectSettleDomainSelectVoByNo"
+				, dept, TSettleDomainListVo.class, SecurityConstants.FROM_IN);
+		if (Common.isNotNull(listVo) && listVo.getData() != null && listVo.getData().getListSelectVO() != null && !listVo.getData().getListSelectVO().isEmpty()) {
+			dept = listVo.getData().getListSelectVO().get(0);
+		}
+		return dept;
+	}
+
 	public R<EmpDispatchAddVo> addDispatchInfo(EmpDispatchAddVo addVo) {
 		R<EmpDispatchAddVo> res = HttpDaprUtil.invokeMethodPost(daprArchivesProperties.getAppUrl(),daprArchivesProperties.getAppId(),"/temployeeinfo/addDispatchInfo" , JSON.toJSONString(addVo), EmpDispatchAddVo.class, SecurityConstants.FROM_IN);
 		if (Common.isEmpty(res)){

yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/InsuranceDaprUtil.java

+package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
+
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties;
+import com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptVo;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+
+/**
+ * @Author hgw
+ * @Date 2022-11-17 10:16:59
+ * @Description
+ * @Version 1.0
+ */
+@Log4j2
+@EnableConfigurationProperties(DaprInsurancesProperties.class)
+public class InsuranceDaprUtil {
+	@Autowired
+	private DaprInsurancesProperties daprInsurancesProperties;
+	/**
+	 * @Author hgw
+	 * @Description ekp费用划转，商险划转项目
+	 * @Date 2022-11-17 11:03:08
+	 * @Param
+	 * @return
+	**/
+	public void ekpUpdateInsuranceDept(ChangeDeptVo changeDeptVo){
+		HttpDaprUtil.invokeMethodPost(daprInsurancesProperties.getAppUrl()
+				, daprInsurancesProperties.getAppId(),"/insuranceDetail/inner/ekpUpdateInsuranceDept" , changeDeptVo
+				, Object.class, SecurityConstants.FROM_IN);
+	}
+
+}

yifu-common/yifu-common-dapr/src/main/resources/META-INF/spring.factories

@@ -4,4 +4,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
     com.yifu.cloud.plus.v1.yifu.common.dapr.util.CheckDaprUtil,\
     com.yifu.cloud.plus.v1.yifu.common.dapr.util.SocialDaprUtils,\
     com.yifu.cloud.plus.v1.yifu.common.dapr.util.MenuUtil,\
+    com.yifu.cloud.plus.v1.yifu.common.dapr.util.InsuranceDaprUtil,\
     com.yifu.cloud.plus.v1.yifu.common.dapr.util.SalaryDaprUtil

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

@@ -13,6 +13,7 @@ import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
 import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
+import com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -625,5 +626,18 @@ public class TInsuranceDetailController {
 		return tInsuranceDetailService.getOrderInsuredListPage(page,param);
 	}
 
+	/**
+	 * @param changeDeptVo
+	 * @Description: ekp费用划转，商险划转项目
+	 * @Author: hgw
+	 * @Date: 2022/11/17 10:56
+	 * @return: void
+	 **/
+	@Operation(summary = "ekp费用划转，商险划转项目", description = "ekp费用划转，商险划转项目")
+	@Inner
+	@PostMapping("/inner/ekpUpdateInsuranceDept")
+	public void ekpUpdateInsuranceDept(@RequestBody ChangeDeptVo changeDeptVo) {
+		tInsuranceDetailService.ekpUpdateInsuranceDept(changeDeptVo);
+	}
 
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java

@@ -3,12 +3,14 @@ package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author licancan
@@ -224,5 +226,14 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 */
 	IPage<InsuredOrderListVo> getOrderInsuredListPage(Page<InsuredOrderListVo> page, @Param("param")  InsuredOrderParam param);
 
+	/**
+	 * @param idSet
+	 * @param dept
+	 * @Description: ekp费用划转-商险
+	 * @Author: hgw
+	 * @Date: 2022/11/17 11:01
+	 * @return: int
+	 **/
+	int ekpUpdateInsuranceDept(@Param("idSet") Set<String> idSet, @Param("dept") TSettleDomainSelectVo dept);
 
 }

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

@@ -9,6 +9,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
+import com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptVo;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -398,4 +399,13 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	R getOrderInsuredListPage(Page<InsuredOrderListVo> page, InsuredOrderParam param);
 
 	SettleVo getInsuranceDetailSettleStatus(String detailId, String defaultSettleId);
+
+	/**
+	 * @param changeDeptVo
+	 * @Description: ekp费用划转，商险划转项目
+	 * @Author: hgw
+	 * @Date: 2022/11/17 10:56
+	 * @return: void
+	 **/
+	void ekpUpdateInsuranceDept(ChangeDeptVo changeDeptVo);
 }

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

@@ -34,6 +34,8 @@ import com.yifu.cloud.plus.v1.yifu.insurances.util.LocalDateUtil;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
+import com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptDetailVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeDetailReturnVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -6352,4 +6354,18 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			}
 		}
 	}
+
+	@Override
+	public void ekpUpdateInsuranceDept(ChangeDeptVo changeDeptVo) {
+		Set<String> detailIdSet = new HashSet<>();
+		for (ChangeDeptDetailVo vo : changeDeptVo.getShangxian()) {
+			if (Common.isNotNull(vo.getId())) {
+				detailIdSet.add(vo.getId().split(CommonConstants.DOWN_LINE_STRING)[0]);
+			}
+		}
+		if (!detailIdSet.isEmpty()) {
+			baseMapper.ekpUpdateInsuranceDept(detailIdSet, changeDeptVo.getDept());
+		}
+	}
+
 }

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

@@ -1170,4 +1170,20 @@
 		order by createTime desc
 	</select>
 
+	<!-- ekp费用划转-商险-->
+	<update id="ekpUpdateInsuranceDept">
+		update t_insurance_detail p
+		set
+		p.DEPT_ID = #{dept.id}
+		,p.DEPT_NAME = #{dept.departName}
+		,p.DEPT_NO = #{dept.departNo}
+		,p.UNIT_ID = #{dept.customerId}
+		,p.UNIT_NAME = #{dept.customerName}
+		,p.UNIT_NO = #{dept.customerCode}
+		where p.id in
+		<foreach item="item" index="index" collection="idSet" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</update>
+
 </mapper>

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/controller/OrderController.java

@@ -57,9 +57,9 @@ public class OrderController {
 	 * @return {@link R<List<OrderListVO>>}
 	 */
 	@Operation(summary = "订单列表不分页查询", description = "订单列表不分页查询")
-	@GetMapping("/getOrderList")
+	@PostMapping("/getOrderList")
 	@PreAuthorize("@pms.hasPermission('order:order_getOrderList')")
-	public R<List<OrderListVO>> getOrderList(OrderListParam param) {
+	public R<List<OrderListVO>> getOrderList(@RequestBody OrderListParam param) {
 		return tOrderService.getOrderList(param);
 	}
 

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TEkpChangeDeptLog.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.social.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import java.util.Date;
+
+/**
+ * EKP费用划转，改变缴费库、预估库、收入、收入明细、商险明细（订单表没有项目信息，不划转）
+ *
+ * @author hgw
+ * @date 2022-11-17 15:58:59
+ */
+@Data
+@TableName("t_ekp_change_dept_log")
+@Schema(description = "EKP费用划转，改变缴费库、预估库、收入、收入明细、商险明细（订单表没有项目信息，不划转）")
+public class TEkpChangeDeptLog {
+
+	/**
+	 * id
+	 */
+	@TableId(type = IdType.ASSIGN_ID)
+	@ExcelProperty("id")
+	@Schema(description = "id")
+	private String id;
+	/**
+	 * 创建人-EKP传过来的
+	 */
+	@ExcelAttribute(name = "创建人-EKP传过来的", maxLength = 50)
+	@Length(max = 50, message = "创建人-EKP传过来的不能超过50个字符")
+	@ExcelProperty("创建人-EKP传过来的")
+	@Schema(description = "创建人-EKP传过来的")
+	private String createName;
+	/**
+	 * 创建时间
+	 */
+	@ExcelAttribute(name = "创建时间", isDate = true)
+	@ExcelProperty("创建时间")
+	@Schema(description = "创建时间")
+	private Date createTime;
+	/**
+	 * 老项目名称
+	 */
+	@ExcelAttribute(name = "老项目名称", maxLength = 50)
+	@Length(max = 50, message = "老项目名称不能超过50个字符")
+	@ExcelProperty("老项目名称")
+	@Schema(description = "老项目名称")
+	private String preDeptName;
+	/**
+	 * 老项目编码
+	 */
+	@ExcelAttribute(name = "老项目编码", maxLength = 32)
+	@Length(max = 32, message = "老项目编码不能超过32个字符")
+	@ExcelProperty("老项目编码")
+	@Schema(description = "老项目编码")
+	private String preDeptNo;
+	/**
+	 * 新项目名称
+	 */
+	@ExcelAttribute(name = "新项目名称", maxLength = 50)
+	@Length(max = 50, message = "新项目名称不能超过50个字符")
+	@ExcelProperty("新项目名称")
+	@Schema(description = "新项目名称")
+	private String newDeptName;
+	/**
+	 * 新项目编码
+	 */
+	@ExcelAttribute(name = "新项目编码", maxLength = 32)
+	@Length(max = 32, message = "新项目编码不能超过32个字符")
+	@ExcelProperty("新项目编码")
+	@Schema(description = "新项目编码")
+	private String newDeptNo;
+	/**
+	 * 划转类型：类型1;类型2;类型3
+	 */
+	@ExcelAttribute(name = "划转类型：类型1;类型2;类型3", maxLength = 32)
+	@Length(max = 32, message = "划转类型：类型1;类型2;类型3不能超过32个字符")
+	@ExcelProperty("划转类型：类型1;类型2;类型3")
+	@Schema(description = "划转类型：类型1;类型2;类型3")
+	private String transferType;
+	/**
+	 * 缴费库预估库id(社保)
+	 */
+	@ExcelAttribute(name = "缴费库预估库id(社保)", maxLength = 2000)
+	@Length(max = 2000, message = "缴费库预估库id(社保)不能超过2000个字符")
+	@ExcelProperty("缴费库预估库id(社保)")
+	@Schema(description = "缴费库预估库id(社保)")
+	private String socialId;
+	/**
+	 * 缴费库预估库id(公积金)
+	 */
+	@ExcelAttribute(name = "缴费库预估库id(公积金)", maxLength = 2000)
+	@Length(max = 2000, message = "缴费库预估库id(公积金)不能超过2000个字符")
+	@ExcelProperty("缴费库预估库id(公积金)")
+	@Schema(description = "缴费库预估库id(公积金)")
+	private String fundId;
+	/**
+	 * 收入id(管理费)
+	 */
+	@ExcelAttribute(name = "收入id(管理费)", maxLength = 2000)
+	@Length(max = 2000, message = "收入id(管理费)不能超过2000个字符")
+	@ExcelProperty("收入id(管理费)")
+	@Schema(description = "收入id(管理费)")
+	private String manageId;
+	/**
+	 * 收入id(风险金)
+	 */
+	@ExcelAttribute(name = "收入id(风险金)", maxLength = 2000)
+	@Length(max = 2000, message = "收入id(风险金)不能超过2000个字符")
+	@ExcelProperty("收入id(风险金)")
+	@Schema(description = "收入id(风险金)")
+	private String riskId;
+	/**
+	 * 商险id
+	 */
+	@ExcelAttribute(name = "商险id", maxLength = 2000)
+	@Length(max = 2000, message = "商险id不能超过2000个字符")
+	@ExcelProperty("商险id")
+	@Schema(description = "商险id")
+	private String insuranceId;
+
+}

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.social.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 费用划转明细vo
+ * @author hgw
+ * @date 2022-11-16 10:35:30
+ */
+@Data
+public class ChangeDeptDetailVo implements Serializable {
+
+	// id
+	private String id;
+
+	// 姓名
+	private String name;
+
+	// 身份证号
+	private String idCard;
+
+	// 订单类型
+	private String orderType;
+
+}

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.social.vo;
+
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 费用划转vo
+ * @author hgw
+ * @date 2022-11-16 10:35:30
+ */
+@Data
+public class ChangeDeptVo implements Serializable {
+
+	// 申请人账号
+	private String creator;
+
+	// 划转前项目名称
+	private String preProjectname;
+
+	// 划转前项目编码
+	private String preProjectno;
+
+	// 划转前客户名称
+	private String preCustomername;
+
+	// 划转前客户编码
+	private String preCustomerno;
+
+	// 划转后项目名称
+	private String nowProjectname;
+
+	// 划转后项目编码
+	private String nowProjectno;
+
+	// 划转后客户名称
+	private String nowCustomername;
+
+	// 划转后客户编码
+	private String nowCustomerno;
+
+	// 划转类型：类型1;类型2;类型3
+	private String transferType;
+
+	// 社保明细
+	private List<ChangeDeptDetailVo> shebao;
+
+	// 公积金明细
+	private List<ChangeDeptDetailVo> gongjijin;
+
+	// 商险明细
+	private List<ChangeDeptDetailVo> shangxian;
+
+	// 管理费明细
+	private List<ChangeDeptDetailVo> guanlifei;
+
+	// 风险金明细
+	private List<ChangeDeptDetailVo> fenxianjin;
+
+	// 商险使用的项目信息
+	private TSettleDomainSelectVo dept;
+
+}

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

@@ -171,12 +171,7 @@ public class SysBaseSetInfoController {
 	@PostMapping("/disableOrEnableById")
 	@PreAuthorize("@pms.hasPermission('social_sysbasesetinfo_enable')")
 	public R<Boolean> disableOrEnableById(@RequestParam String id, @RequestParam Integer status) {
-		SysBaseSetInfo baseSetInfo = sysBaseSetInfoService.getById(id);
-		if (null == baseSetInfo){
-			return R.failed("无对应ID的数据！");
-		}
-		baseSetInfo.setStatus(status);
-		return new R<>(sysBaseSetInfoService.updateById(baseSetInfo));
+		return sysBaseSetInfoService.updateByIdAsso(id,status);
 	}
 
 }

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

@@ -384,17 +384,16 @@ public class TDispatchInfoController {
 	@Operation(description = "派单申请批量审核，传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyAudit') auditStatus:1审核通过 2审核不通过")
 	@PostMapping("/addApplyAudit")
 	//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyAudit')")
-	public R<List<ErrorMessage>> addApplyAudit(@RequestParam(name = "ids", required = true) String ids,
+	public R<List<ErrorMessage>> addApplyAudit(@RequestBody List<String> idList,
 									@RequestParam(name = "auditStatus", required = true) String auditStatus,
 									@RequestParam(name = "auditRemark", required = false) String auditRemark,
 									@RequestParam(name = "remark", required = false) String remark) {
-		return  tDispatchInfoService.addApplyAudit(ids,auditStatus,auditRemark,remark);
+		return  tDispatchInfoService.addApplyAudit(idList,auditStatus,auditRemark,remark);
 	}
 
 	/**
 	 * 派单申请办理
 	 * hgw社保办理
-	 * @param ids
 	 * @param handleStatus 1 办理成功 2 办理失败
 	 * @param handleRemark
 	 * @param typeSub 0 社保 1  公积金
@@ -406,13 +405,13 @@ public class TDispatchInfoController {
 	@Operation(description = "派单批量办理，传参派单ID hasPermission('wxhr:tdispatchinfo_addApplyHandle') handleStatus 1 办理成功 2 办理失败")
 	@PostMapping("/addApplyHandle")
 	//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_addApplyHandle')")
-	public R<List<ErrorMessage>> addApplyHandle(@RequestParam(name = "ids", required = true) String ids,
+	public R<List<ErrorMessage>> addApplyHandle(@RequestBody List<String> idList,
 									 @RequestParam(name = "typeSub", required = true) String typeSub,
 									 @RequestParam(name = "handleStatus", required = true) String handleStatus,
 									 @RequestParam(name = "handleRemark", required = false) String handleRemark,
 									 @RequestParam(name = "socialType", required = false) String socialType,
 									 @RequestParam(name = "remark", required = false) String remark) {
-		return tDispatchInfoService.addApplyHandle(ids,typeSub,handleStatus,handleRemark,socialType,remark);
+		return tDispatchInfoService.addApplyHandle(idList,typeSub,handleStatus,handleRemark,socialType,remark);
 	}
 
 	/**

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

@@ -29,14 +29,13 @@ import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
 import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoService;
+import com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoSearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoVo;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
-import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -54,7 +53,6 @@ import java.util.List;
 @RequiredArgsConstructor
 @RequestMapping("/tpaymentinfo" )
 @Tag(name = "缴费库管理")
-@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class TPaymentInfoController {
 
 	private final TPaymentInfoService tPaymentInfoService;
@@ -408,4 +406,16 @@ public class TPaymentInfoController {
 		tPaymentInfoService.pushPaymentSocialFundInfo();
 		return R.ok();
 	}
+
+	/**
+	 * 费用划转，EKP通知MVP跟着一起划转
+	 * @author  hgw
+	 * @return R
+	 */
+	@Operation(summary = "费用划转--EKP调用接口", description = "费用划转--EKP调用接口")
+	@SysLog("费用划转--EKP调用接口")
+	@PostMapping("/changeDeptByEkp")
+	public R<String> changeDeptByEkp(@RequestBody ChangeDeptVo changeDeptVo) {
+		return tPaymentInfoService.changeDeptByEkp(changeDeptVo);
+	}
 }

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

@@ -215,8 +215,8 @@ public class TPreDispatchInfoController {
 	@Operation(summary = "一键派单:按创建人查找正常未派单的数据", description = "一键派单:按创建人查找正常未派单的数据")
 	@PostMapping("/oneKeyToDispatch")
 	@PreAuthorize("@pms.hasPermission('social_tpredispatchinfo_dispatch')")
-	public R oneKeyToDispatch(@RequestParam String idStr) {
-		return tPreDispatchInfoService.oneKeyToDispatch(idStr);
+	public R oneKeyToDispatch(@RequestBody List<String> idList) {
+		return tPreDispatchInfoService.oneKeyToDispatch(idList);
 	}
 
 	/**

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TEkpChangeDeptLogMapper.java

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.social.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TEkpChangeDeptLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * EKP费用划转，改变缴费库、预估库、收入、收入明细、商险明细（订单表没有项目信息，不划转）
+ *
+ * @author hgw
+ * @date 2022-11-17 15:58:59
+ */
+@Mapper
+public interface TEkpChangeDeptLogMapper extends BaseMapper<TEkpChangeDeptLog> {
+}

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java

@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TForecastLibrary;
@@ -28,6 +29,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 预估费用
@@ -77,4 +79,16 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
 	 * @return
 	 **/
 	int updatePushStatus(@Param("idList") List<String> idList);
+
+	int checkForecastChange(@Param("idSet") Set<String> idSet);
+
+	/**
+	 * @param idSet
+	 * @Description: 修改缴费库
+	 * @Author: hgw
+	 * @Date: 2022-11-16 17:51:41
+	 * @return: int
+	 **/
+	int changeForecastDept(@Param("idSet") Set<String> idSet, @Param("dept") TSettleDomainSelectVo dept);
+
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TIncomeMapper.java

@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
 import com.yifu.cloud.plus.v1.yifu.social.vo.IncomeExportVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo;
@@ -27,6 +28,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 收入明细表
@@ -71,4 +73,24 @@ public interface TIncomeMapper extends BaseMapper<TIncome> {
 	 **/
 	int deleteIncomeDetailByApplyNo(@Param("applyNo") String applyNo);
 
+	/**
+	 * @param idSet
+	 * @param dept
+	 * @Description: ekp费用划转-收入
+	 * @Author: hgw
+	 * @Date: 2022/11/17 9:43
+	 * @return: int
+	 **/
+	int changeIncomeDept(@Param("idSet") Set<String> idSet, @Param("dept") TSettleDomainSelectVo dept);
+
+	/**
+	 * @param idSet
+	 * @param dept
+	 * @Description: ekp费用划转-明细
+	 * @Author: hgw
+	 * @Date: 2022/11/17 9:43
+	 * @return: int
+	 **/
+	int changeIncomeDetailDept(@Param("idSet") Set<String> idSet, @Param("dept") TSettleDomainSelectVo dept);
+
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java

@@ -20,9 +20,11 @@ package com.yifu.cloud.plus.v1.yifu.social.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptDetailVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoExportVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoSearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoVo;
@@ -30,6 +32,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 缴费库
@@ -143,4 +146,22 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
 	 **/
 	int updatePushStatus(@Param("idList") List<String> idList);
 
+	/**
+	 * @param idSet
+	 * @Description: 校验缴费库是否有已结算的数据，有，则不允许ekp费用划转
+	 * @Author: hgw
+	 * @Date: 2022/11/16 17:32
+	 * @return: int
+	 **/
+	int checkPaymentChange(@Param("idSet") Set<String> idSet);
+
+	/**
+	 * @param idSet
+	 * @Description: 修改缴费库
+	 * @Author: hgw
+	 * @Date: 2022-11-16 17:51:41
+	 * @return: int
+	 **/
+	int changePaymentDept(@Param("idSet") Set<String> idSet, @Param("dept") TSettleDomainSelectVo dept);
+
 }

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

@@ -67,4 +67,5 @@ public interface SysBaseSetInfoService extends IService<SysBaseSetInfo> {
 	 **/
 	Map<String, SysBaseSetInfo> getSysBaseSetInfoMap(String baseType);
 
+    R<Boolean> updateByIdAsso(String id,int status);
 }

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

@@ -74,9 +74,9 @@ public interface TDispatchInfoService extends IService<TDispatchInfo> {
 
     List<ErrorMessage> addBatchApplyAudit(List<String> idsList, YifuUser user, int flag, String auditStatus, String auditRemark, String remark);
 
-	R<List<ErrorMessage>>  addApplyAudit(String ids, String auditStatus, String auditRemark, String remark);
+	R<List<ErrorMessage>>  addApplyAudit(List<String> ids, String auditStatus, String auditRemark, String remark);
 
-	R<List<ErrorMessage>>  addApplyHandle(String ids, String typeSub, String handleStatus, String handleRemark, String socialType, String remark);
+	R<List<ErrorMessage>>  addApplyHandle(List<String> ids, String typeSub, String handleStatus, String handleRemark, String socialType, String remark);
 
 	void doexportSocialRecordRoster(HttpServletResponse response, SocialHandleSearchVo searchVo, String idStr, String[] exportFields);
 

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+
+package com.yifu.cloud.plus.v1.yifu.social.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TEkpChangeDeptLog;
+
+/**
+ * EKP费用划转，改变缴费库、预估库、收入、收入明细、商险明细（订单表没有项目信息，不划转）
+ *
+ * @author hgw
+ * @date 2022-11-17 15:58:59
+ */
+public interface TEkpChangeDeptLogService extends IService<TEkpChangeDeptLog> {
+}

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

@@ -20,6 +20,7 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
@@ -29,6 +30,7 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo;
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 收入明细表
@@ -76,4 +78,14 @@ public interface TIncomeService extends IService<TIncome> {
 	 **/
 	void deleteIncomeAndDetailByApplyNo(String applyNo);
 
+	/**
+	 * @param idSet
+	 * @param dept
+	 * @Description: ekp费用划转-收入
+	 * @Author: hgw
+	 * @Date: 2022/11/17 9:42
+	 * @return: void
+	 **/
+	void changeIncomeAndDetailDept(Set<String> idSet, TSettleDomainSelectVo dept);
+
 }

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

@@ -24,6 +24,7 @@ import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentBySalaryVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.TPaymentVo;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.UpdateSocialFoundVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentInfo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.ChangeDeptVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoSearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoVo;
 
@@ -149,4 +150,13 @@ public interface TPaymentInfoService extends IService<TPaymentInfo> {
 
 	void pushPaymentSocialFundInfo();
 
+	/**
+	 * @param changeDeptVo
+	 * @Description: 费用划转-ekp同步hro
+	 * @Author: hgw
+	 * @Date: 2022/11/16 10:38
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	R<String> changeDeptByEkp(ChangeDeptVo changeDeptVo);
+
 }

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

@@ -88,8 +88,9 @@ public interface TPreDispatchInfoService extends IService<TPreDispatchInfo> {
 	 * @Author huyc
 	 * @Date 2022-07-18
 	 * @return
-	 **/
-	R oneKeyToDispatch(String idStr);
+	 *
+	 * @param idStr*/
+	R oneKeyToDispatch(List<String> idStr);
 
 	/**
 	 * 修改预派单记录

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

@@ -27,8 +27,10 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.social.entity.SysBaseSetInfo;
+import com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.SysPayProportion;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.SysBaseSetInfoMapper;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.SysHouseHoldInfoMapper;
 import com.yifu.cloud.plus.v1.yifu.social.service.SysBaseSetInfoService;
 import com.yifu.cloud.plus.v1.yifu.social.service.SysPayProportionService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TForecastLibraryService;
@@ -55,8 +57,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 
 	private final SysPayProportionService sysPayProportionService;
 
-	private final TForecastLibraryService tForecastLibraryService;
-
+	private final SysHouseHoldInfoMapper sysHouseHoldInfoMapper;
 	/**
 	 * 基数设置表简单分页查询
 	 *
@@ -267,4 +268,25 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
 		}
 		return setInfoMap;
 	}
+
+	@Override
+	public R<Boolean> updateByIdAsso(String id ,int status) {
+		SysBaseSetInfo baseSetInfo = baseMapper.selectById(id);
+		if (null == baseSetInfo){
+			return R.failed("无对应ID的数据！");
+		}
+		if (CommonConstants.ZERO_INT == status){
+			SysHouseHoldInfo holdInfo = sysHouseHoldInfoMapper.selectById(baseSetInfo.getDepartId());
+			if (Common.isNotNull(holdInfo) && CommonConstants.ONE_STRING.equals(holdInfo.getDelFlag())){
+				return R.failed("对应户已禁用，禁止启用基数！");
+			}
+		}
+		baseSetInfo.setStatus(status);
+		int res = baseMapper.updateById(baseSetInfo);
+		if (res >= 0){
+			return R.ok();
+		}else {
+			return R.failed(CommonConstants.RESULT_DATA_FAIL);
+		}
+	}
 }

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

@@ -87,9 +87,9 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
 		}
 		if (CommonConstants.ONE_STRING.equals(hold.getDelFlag())
 				&& baseSetInfoMapper.selectCount(Wrappers.<SysBaseSetInfo>query().lambda()
-				.eq(SysBaseSetInfo::getBaseType, hold.getType())
+				.eq(SysBaseSetInfo::getBaseType, holdInfo.getType())
 				.le(SysBaseSetInfo::getApplyStartDate, DateUtil.getCurrentDateTime())
-				.in(SysBaseSetInfo::getDepartId,hold.getId())
+				.in(SysBaseSetInfo::getDepartId,holdInfo.getId())
 				.eq(SysBaseSetInfo::getStatus,CommonConstants.ZERO_STRING)
 				.eq(SysBaseSetInfo::getDeleteFlag, CommonConstants.ZERO_STRING)
 				.and(obj-> obj.isNull(SysBaseSetInfo::getApplyEndDate).or()

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

@@ -3123,13 +3123,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	@Transactional(rollbackFor = Exception.class)
 	@ShardingTransactionType(TransactionType.BASE)
 	@Override
-	public R<List<ErrorMessage>> addApplyAudit(String ids, String auditStatus, String auditRemark, String remark) {
+	public R<List<ErrorMessage>> addApplyAudit(List<String> ids, String auditStatus, String auditRemark, String remark) {
 		YifuUser user = SecurityUtils.getUser();
 		if (null == user) {
 			return R.failed(CommonConstants.USER_FAIL);
 		}
 		try {
-			if (!Common.isNotNull(ids)) {
+			if (Common.isEmpty(ids)) {
 				return R.failed(DispatchConstants.DISPATCH_ID_NOT_EMPTY);
 			}
 			int flag;
@@ -3142,7 +3142,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			} else {
 				return R.failed("派单审核状态参数异常：0待审核  1审核通过 2审核不通过");
 			}
-			List<ErrorMessage> errorInfo = addBatchApplyAudit(Common.initStrToList(ids, CommonConstants.COMMA_STRING), user,  flag, auditStatus, Common.isNullToString(auditRemark),remark);
+			List<ErrorMessage> errorInfo = addBatchApplyAudit(ids, user,  flag, auditStatus, Common.isNullToString(auditRemark),remark);
 			return R.ok(errorInfo,"派单审核结果：");
 		} catch (Exception e) {
 			log.error("派单审核异常：" + e.getMessage());
@@ -3152,13 +3152,14 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 	@Transactional(rollbackFor = Exception.class)
 	@ShardingTransactionType(TransactionType.BASE)
 	@Override
-	public R<List<ErrorMessage>> addApplyHandle(String ids, String typeSub, String handleStatus, String handleRemark, String socialType, String remark) {
+	public R<List<ErrorMessage>> addApplyHandle(List<String> ids, String typeSub, String handleStatus,
+												String handleRemark, String socialType, String remark) {
 		try {
 			YifuUser user = SecurityUtils.getUser();
 			if (null == user) {
 				return R.failed(CommonConstants.USER_FAIL);
 			}
-			if (!Common.isNotNull(ids)) {
+			if (Common.isEmpty(ids)) {
 				return R.failed(DispatchConstants.DISPATCH_ID_NOT_EMPTY);
 			}
 			int flag;
@@ -3171,8 +3172,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			} else {
 				return R.failed("派单办理状态参数异常：0待办理  1办理通过 2办理不通过");
 			}
-			List<ErrorMessage> errorInfo = addBatchApplyHandle(Common.initStrToList(ids, CommonConstants.COMMA_STRING)
-					, typeSub, user,  flag, handleStatus, Common.isNullToString(handleRemark), socialType,remark);
+			List<ErrorMessage> errorInfo = addBatchApplyHandle(ids, typeSub, user,  flag, handleStatus,
+					Common.isNullToString(handleRemark), socialType,remark);
 			if (errorInfo == null || errorInfo.isEmpty()) {
 				return R.ok(null,"办理成功！");
 			} else {

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

+/*
+ *    Copyright (c) 2018-2025, lengleng All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the yifu4cloud.com developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: lengleng (wangiegie@gmail.com)
+ */
+package com.yifu.cloud.plus.v1.yifu.social.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.social.entity.TEkpChangeDeptLog;
+import com.yifu.cloud.plus.v1.yifu.social.mapper.TEkpChangeDeptLogMapper;
+import com.yifu.cloud.plus.v1.yifu.social.service.TEkpChangeDeptLogService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Service;
+/**
+ * EKP费用划转，改变缴费库、预估库、收入、收入明细、商险明细（订单表没有项目信息，不划转）
+ *
+ * @author hgw
+ * @date 2022-11-17 15:58:59
+ */
+@Log4j2
+@Service
+public class TEkpChangeDeptLogServiceImpl extends ServiceImpl<TEkpChangeDeptLogMapper, TEkpChangeDeptLog> implements TEkpChangeDeptLogService {
+}

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

@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
 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.ekp.util.EkpIncomeUtil;
@@ -48,6 +49,7 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeVo;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.ServletOutputStream;
@@ -1059,4 +1061,17 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 		baseMapper.deleteIncomeDetailByApplyNo(applyNo);
 	}
 
+	/**
+	 * @param idSet
+	 * @param dept
+	 * @Description: ekp费用划转-收入
+	 * @Author: hgw
+	 * @Date: 2022/11/17 9:42
+	 * @return: void
+	 **/
+	public void changeIncomeAndDetailDept(Set<String> idSet, TSettleDomainSelectVo dept) {
+		baseMapper.changeIncomeDept(idSet, dept);
+		baseMapper.changeIncomeDetailDept(idSet, dept);
+	}
+
 }

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

@@ -39,6 +39,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.exception.ErrorCodes;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
+import com.yifu.cloud.plus.v1.yifu.common.dapr.util.InsuranceDaprUtil;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil;
@@ -53,13 +54,11 @@ import com.yifu.cloud.plus.v1.yifu.social.constants.PaymentConstants;
 import com.yifu.cloud.plus.v1.yifu.social.constants.SocialConstants;
 import com.yifu.cloud.plus.v1.yifu.social.entity.*;
 import com.yifu.cloud.plus.v1.yifu.social.mapper.*;
+import com.yifu.cloud.plus.v1.yifu.social.service.TEkpChangeDeptLogService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TIncomeService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TPaymentInfoService;
 import com.yifu.cloud.plus.v1.yifu.social.service.TSendEkpErrorService;
-import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentHeFeiVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoExportVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoSearchVo;
-import com.yifu.cloud.plus.v1.yifu.social.vo.TPaymentInfoVo;
+import com.yifu.cloud.plus.v1.yifu.social.vo.*;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -130,6 +129,15 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 	@Autowired
 	private TSendEkpErrorService tSendEkpErrorService;
 
+	@Autowired
+	private TForecastLibraryMapper tForecastLibraryMapper;
+
+	@Autowired
+	private InsuranceDaprUtil insuranceDaprUtil;
+
+	@Autowired
+	private TEkpChangeDeptLogService tEkpChangeDeptLogService;
+
 	/**
 	 * 缴费库简单分页查询
 	 *
@@ -3262,4 +3270,128 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 		sb.insert(4, "-");
 		return sb.toString();
 	}
+
+	/**
+	 * @param changeDeptVo 变更主体数据
+	 * @Description: 费用划转-ekp同步hro
+	 * @Author: hgw
+	 * @Date: 2022/11/16 10:39
+	 * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.String>
+	 **/
+	@Override
+	public R<String> changeDeptByEkp(ChangeDeptVo changeDeptVo) {
+		// 获取项目信息：
+		TSettleDomainSelectVo dept = archivesDaprUtil.selectDeptByNo(changeDeptVo.getNowProjectno());
+		if (dept != null && dept.getId() != null) {
+			changeDeptVo.setDept(dept);
+			// 变更数据的主键id
+			Set<String> idSet;
+
+			// 存储日志使用的
+			StringBuilder socialId = new StringBuilder();
+			StringBuilder fundId = new StringBuilder();
+			StringBuilder manageId = new StringBuilder();
+			StringBuilder riskId = new StringBuilder();
+			StringBuilder insuranceId = new StringBuilder();
+			// 如果选择了社保公积金信息要划转，则校验。
+			// 否则跳过这一步，直接划转
+			if ((changeDeptVo.getShebao() != null && !changeDeptVo.getShebao().isEmpty())
+					|| (changeDeptVo.getGongjijin() != null && !changeDeptVo.getGongjijin().isEmpty())) {
+				idSet = new HashSet<>();
+				if (changeDeptVo.getShebao() != null && !changeDeptVo.getShebao().isEmpty()) {
+					for (ChangeDeptDetailVo vo : changeDeptVo.getShebao()) {
+						idSet.add(vo.getId());
+						socialId.append(vo.getId()).append(CommonConstants.DUNHAO_STRING);
+					}
+				}
+				if (changeDeptVo.getGongjijin() != null && !changeDeptVo.getGongjijin().isEmpty()) {
+					for (ChangeDeptDetailVo vo : changeDeptVo.getGongjijin()) {
+						idSet.add(vo.getId());
+						fundId.append(vo.getId()).append(CommonConstants.DUNHAO_STRING);
+					}
+				}
+				if (!idSet.isEmpty()) {
+					// 查询是否允许划转缴费库、预估库 的 社保、公积金
+					boolean flag = this.checkChange(idSet);
+					if (!flag) {
+						return R.failed("社保公积金已被结算，请先退回并删除工资表！");
+					}
+
+					// 1划转缴费率、预估库的项目（社保公积金）
+					baseMapper.changePaymentDept(idSet, dept);
+					tForecastLibraryMapper.changeForecastDept(idSet, dept);
+				}
+			}
+
+			// 2划转管理费、风险金
+			if ((changeDeptVo.getGuanlifei() != null && !changeDeptVo.getGuanlifei().isEmpty())
+				|| (changeDeptVo.getFenxianjin() != null && !changeDeptVo.getFenxianjin().isEmpty())) {
+				idSet = new HashSet<>();
+				if (changeDeptVo.getGuanlifei() != null && !changeDeptVo.getGuanlifei().isEmpty()) {
+					for (ChangeDeptDetailVo vo : changeDeptVo.getGuanlifei()) {
+						idSet.add(vo.getId());
+						manageId.append(vo.getId()).append(CommonConstants.DUNHAO_STRING);
+					}
+				}
+				if (changeDeptVo.getFenxianjin() != null && !changeDeptVo.getFenxianjin().isEmpty()) {
+					for (ChangeDeptDetailVo vo : changeDeptVo.getFenxianjin()) {
+						idSet.add(vo.getId());
+						riskId.append(vo.getId()).append(CommonConstants.DUNHAO_STRING);
+					}
+				}
+				if (!idSet.isEmpty()) {
+					incomeService.changeIncomeAndDetailDept(idSet, dept);
+				}
+			}
+			// 3划转商险
+			if (changeDeptVo.getShangxian() != null && !changeDeptVo.getShangxian().isEmpty()) {
+				idSet = new HashSet<>();
+				for (ChangeDeptDetailVo vo : changeDeptVo.getShangxian()) {
+					idSet.add(vo.getId());
+					insuranceId.append(vo.getId()).append(CommonConstants.DUNHAO_STRING);
+				}
+				if (!idSet.isEmpty()) {
+					insuranceDaprUtil.ekpUpdateInsuranceDept(changeDeptVo);
+				}
+			}
+
+			// 4 记录日志
+			TEkpChangeDeptLog log = new TEkpChangeDeptLog();
+			log.setCreateName(changeDeptVo.getCreator());
+			log.setCreateTime(new Date());
+			log.setPreDeptName(changeDeptVo.getPreProjectname());
+			log.setPreDeptNo(changeDeptVo.getPreProjectno());
+			log.setNewDeptName(changeDeptVo.getNowProjectname());
+			log.setNewDeptNo(changeDeptVo.getNowProjectno());
+			log.setTransferType(changeDeptVo.getTransferType());
+			log.setSocialId(socialId.toString());
+			log.setFundId(fundId.toString());
+			log.setManageId(manageId.toString());
+			log.setRiskId(riskId.toString());
+			log.setInsuranceId(insuranceId.toString());
+			// 4记录费用划转日志
+			tEkpChangeDeptLogService.save(log);
+			return R.ok();
+		} else {
+			return R.failed("根据新编码未获取到项目信息");
+		}
+	}
+
+	/**
+	 * @param idSet
+	 * @Description: 校验是否存在已结算薪资的数据
+	 * @Author: hgw
+	 * @Date: 2022/11/16 17:30
+	 * @return: boolean
+	 **/
+	private boolean checkChange(Set<String> idSet) {
+		int settleCount = baseMapper.checkPaymentChange(idSet);
+		if (settleCount == 0) {
+			settleCount = tForecastLibraryMapper.checkForecastChange(idSet);
+			return settleCount == 0;
+		} else {
+			return false;
+		}
+	}
+
 }

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

@@ -505,13 +505,12 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 
 	/**
 	 * 一键派单
-	 * @param idStr
 	 * @return
 	 * @Author huyc
 	 * @Date 2022-07-18
 	 **/
 	@Override
-	public R oneKeyToDispatch(String idStr) {
+	public R oneKeyToDispatch(List<String> idList) {
 		YifuUser user = SecurityUtils.getUser();
 		if (null == user || null == user.getId()) {
 			return R.failed(CommonConstants.USER_FAIL);
@@ -535,7 +534,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		initSettleDomainMaps(settleDomainR, settleDomainNameMap, customerNameMap, settleIdAndCustomerIdMap);
 		// 获取当前创建人 截止到当前时间的 正常未派单 未删除的预派单数据
 		List<TPreDispatchInfo> preList;
-		if (Common.isEmpty(idStr)) {
+		if (Common.isEmpty(idList)) {
 			preList = baseMapper.selectList(Wrappers.<TPreDispatchInfo>query().lambda()
 					.eq(TPreDispatchInfo::getCreateBy, user.getId())
 					.le(TPreDispatchInfo::getCreateTime, LocalDateTime.now())
@@ -543,7 +542,6 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 					.eq(TPreDispatchInfo::getDispatchFlag, CommonConstants.ZERO_STRING)
 					.eq(TPreDispatchInfo::getPreStatus, CommonConstants.ZERO_STRING));
 		} else {
-			List<String> idList = Common.initStrToList(idStr, ",");
 			preList = baseMapper.selectList(Wrappers.<TPreDispatchInfo>query().lambda()
 					.in(TPreDispatchInfo::getId, idList)
 					.eq(TPreDispatchInfo::getCreateBy, user.getId())

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -574,7 +574,7 @@
 			1=1
 			<include refid="tDispatchInfo_where"/>
 		</where>
-		order by a.CREATE_TIME desc
+		order by a.APPLY_NO desc
     </select>
 
 	<!--tDispatchInfo简单分页查询-->
@@ -589,7 +589,7 @@
 			<include refid="tDispatchInfo_where"/>
 		</where>
 
-		order by a.CREATE_TIME desc
+		order by a.APPLY_NO desc
 	</select>
 
 	<!-- 派单导出 -->
@@ -654,7 +654,7 @@
             a.DELETE_FLAG = '0'
             <include refid="tDispatchInfo_where"/>
         </where>
-		order by a.CREATE_TIME desc
+		order by a.APPLY_NO desc
 		<if test="tDispatchInfo.limitStart != null">
 			limit #{tDispatchInfo.limitStart},#{tDispatchInfo.limitEnd}
 		</if>
@@ -706,7 +706,7 @@
 			a.DELETE_FLAG = '0' and a.STATUS = '1'
 			<include refid="tDispatchInfoAudit_where"/>
 		</where>
-		order by a.CREATE_TIME desc
+		order by a.APPLY_NO desc
 		<if test="tDispatchInfo.limitStart != null">
 			limit #{tDispatchInfo.limitStart},#{tDispatchInfo.limitEnd}
 		</if>
@@ -1021,7 +1021,7 @@
 				</if>
 			</if>
 			group by a.id
-			order by a.CREATE_TIME desc
+			order by a.APPLY_NO desc
 		</where>
 	</sql>
 
@@ -1131,7 +1131,7 @@
 				</if>
 			</if>
 			group by a.id
-			order by a.CREATE_TIME desc
+			order by a.APPLY_NO desc
 		</where>
 	</sql>
 

yifu-social/yifu-social-biz/src/main/resources/mapper/TEkpChangeDeptLogMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~
+  ~      Copyright (c) 2018-2025, lengleng All rights reserved.
+  ~
+  ~  Redistribution and use in source and binary forms, with or without
+  ~  modification, are permitted provided that the following conditions are met:
+  ~
+  ~ Redistributions of source code must retain the above copyright notice,
+  ~  this list of conditions and the following disclaimer.
+  ~  Redistributions in binary form must reproduce the above copyright
+  ~  notice, this list of conditions and the following disclaimer in the
+  ~  documentation and/or other materials provided with the distribution.
+  ~  Neither the name of the yifu4cloud.com developer nor the names of its
+  ~  contributors may be used to endorse or promote products derived from
+  ~  this software without specific prior written permission.
+  ~  Author: lengleng (wangiegie@gmail.com)
+  ~
+  -->
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.social.mapper.TEkpChangeDeptLogMapper">
+
+	<resultMap id="tEkpChangeDeptLogMap" type="com.yifu.cloud.plus.v1.yifu.social.entity.TEkpChangeDeptLog">
+		<id property="id" column="ID"/>
+		<result property="createName" column="CREATE_NAME"/>
+		<result property="createTime" column="CREATE_TIME"/>
+		<result property="preDeptName" column="PRE_DEPT_NAME"/>
+		<result property="preDeptNo" column="PRE_DEPT_NO"/>
+		<result property="newDeptName" column="NEW_DEPT_NAME"/>
+		<result property="newDeptNo" column="NEW_DEPT_NO"/>
+		<result property="transferType" column="TRANSFER_TYPE"/>
+		<result property="socialId" column="SOCIAL_ID"/>
+		<result property="fundId" column="FUND_ID"/>
+		<result property="manageId" column="MANAGE_ID"/>
+		<result property="riskId" column="RISK_ID"/>
+		<result property="insuranceId" column="INSURANCE_ID"/>
+	</resultMap>
+	<sql id="Base_Column_List">
+		a.ID,
+		a.CREATE_NAME,
+		a.CREATE_TIME,
+		a.PRE_DEPT_NAME,
+		a.PRE_DEPT_NO,
+		a.NEW_DEPT_NAME,
+		a.NEW_DEPT_NO,
+		a.TRANSFER_TYPE,
+		a.SOCIAL_ID,
+		a.FUND_ID,
+		a.MANAGE_ID,
+		a.RISK_ID,
+		a.INSURANCE_ID
+	</sql>
+	<sql id="tEkpChangeDeptLog_where">
+		<if test="tEkpChangeDeptLog != null">
+			<if test="tEkpChangeDeptLog.id != null and tEkpChangeDeptLog.id.trim() != ''">
+				AND a.ID = #{tEkpChangeDeptLog.id}
+			</if>
+			<if test="tEkpChangeDeptLog.createName != null and tEkpChangeDeptLog.createName.trim() != ''">
+				AND a.CREATE_NAME = #{tEkpChangeDeptLog.createName}
+			</if>
+			<if test="tEkpChangeDeptLog.createTime != null">
+				AND a.CREATE_TIME = #{tEkpChangeDeptLog.createTime}
+			</if>
+			<if test="tEkpChangeDeptLog.preDeptName != null and tEkpChangeDeptLog.preDeptName.trim() != ''">
+				AND a.PRE_DEPT_NAME = #{tEkpChangeDeptLog.preDeptName}
+			</if>
+			<if test="tEkpChangeDeptLog.preDeptNo != null and tEkpChangeDeptLog.preDeptNo.trim() != ''">
+				AND a.PRE_DEPT_NO = #{tEkpChangeDeptLog.preDeptNo}
+			</if>
+			<if test="tEkpChangeDeptLog.newDeptName != null and tEkpChangeDeptLog.newDeptName.trim() != ''">
+				AND a.NEW_DEPT_NAME = #{tEkpChangeDeptLog.newDeptName}
+			</if>
+			<if test="tEkpChangeDeptLog.newDeptNo != null and tEkpChangeDeptLog.newDeptNo.trim() != ''">
+				AND a.NEW_DEPT_NO = #{tEkpChangeDeptLog.newDeptNo}
+			</if>
+			<if test="tEkpChangeDeptLog.transferType != null and tEkpChangeDeptLog.transferType.trim() != ''">
+				AND a.TRANSFER_TYPE = #{tEkpChangeDeptLog.transferType}
+			</if>
+			<if test="tEkpChangeDeptLog.socialId != null and tEkpChangeDeptLog.socialId.trim() != ''">
+				AND a.SOCIAL_ID = #{tEkpChangeDeptLog.socialId}
+			</if>
+			<if test="tEkpChangeDeptLog.fundId != null and tEkpChangeDeptLog.fundId.trim() != ''">
+				AND a.FUND_ID = #{tEkpChangeDeptLog.fundId}
+			</if>
+			<if test="tEkpChangeDeptLog.manageId != null and tEkpChangeDeptLog.manageId.trim() != ''">
+				AND a.MANAGE_ID = #{tEkpChangeDeptLog.manageId}
+			</if>
+			<if test="tEkpChangeDeptLog.riskId != null and tEkpChangeDeptLog.riskId.trim() != ''">
+				AND a.RISK_ID = #{tEkpChangeDeptLog.riskId}
+			</if>
+			<if test="tEkpChangeDeptLog.insuranceId != null and tEkpChangeDeptLog.insuranceId.trim() != ''">
+				AND a.INSURANCE_ID = #{tEkpChangeDeptLog.insuranceId}
+			</if>
+		</if>
+	</sql>
+</mapper>

yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml

@@ -689,4 +689,27 @@
 		</foreach>
 	</update>
 
+	<!-- 校验预估库库是否有已结算的数据，有，则不允许ekp费用划转 -->
+	<select id="checkForecastChange" resultType="java.lang.Integer">
+		select count(1) from t_forecast_library p
+		where (p.SALARY_SOCIAL_FLAG = '1' or p.SALARY_FUND_FLAG = '1') and p.id in
+		<foreach item="item" index="index" collection="idSet" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</select>
+
+	<!-- ekp费用划转 -->
+	<update id="changeForecastDept">
+		update t_forecast_library p
+		set p.SETTLE_DOMAIN_ID = #{dept.id}
+		,p.DEPT_NAME = #{dept.departName}
+		,p.DEPT_NO = #{dept.departNo}
+		,p.UNIT_ID = #{dept.customerId}
+		,p.UNIT_NAME = #{dept.customerName}
+		where (p.SALARY_SOCIAL_FLAG = '0' and p.SALARY_FUND_FLAG = '0') and p.id in
+		<foreach item="item" index="index" collection="idSet" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</update>
+
 </mapper>

yifu-social/yifu-social-biz/src/main/resources/mapper/TIncomeMapper.xml

@@ -268,4 +268,35 @@
 	<delete id="deleteIncomeDetailByApplyNo">
 		delete from t_income where APPLY_NO = #{applyNo}
 	</delete>
+
+	<!-- ekp费用划转-收入 -->
+	<update id="changeIncomeDept">
+		update t_income p
+		set p.DEPT_ID = #{dept.id}
+		,p.DEPT_NAME = #{dept.departName}
+		,p.DEPT_NO = #{dept.departNo}
+		,p.UNIT_ID = #{dept.customerId}
+		,p.UNIT_NAME = #{dept.customerName}
+		,p.UNIT_NO = #{dept.customerCode}
+		where p.id in
+		<foreach item="item" index="index" collection="idSet" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</update>
+
+	<!-- ekp费用划转-明细 -->
+	<update id="changeIncomeDetailDept">
+		update t_income_detail p
+		set p.DEPT_ID = #{dept.id}
+		,p.DEPT_NAME = #{dept.departName}
+		,p.DEPT_NO = #{dept.departNo}
+		,p.UNIT_ID = #{dept.customerId}
+		,p.UNIT_NAME = #{dept.customerName}
+		,p.UNIT_NO = #{dept.customerCode}
+		where p.id in
+		<foreach item="item" index="index" collection="idSet" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</update>
+
 </mapper>

yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml

@@ -1165,4 +1165,28 @@
 		</foreach>
 	</update>
 
+	<!-- 校验缴费库是否有已结算的数据，有，则不允许ekp费用划转 -->
+	<select id="checkPaymentChange" resultType="java.lang.Integer">
+		select count(1) from t_payment_info p
+		where (p.SALARY_SOCIAL_FLAG = '1' or p.SALARY_FUND_FLAG = '1') and p.id in
+		<foreach item="item" index="index" collection="idSet" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</select>
+
+	<!-- ekp费用划转-->
+	<update id="changePaymentDept">
+		update t_payment_info p
+		set
+		    p.SETTLE_DOMAIN_ID = #{dept.id}
+			,p.SETTLE_DOMAIN_NAME = #{dept.departName}
+			,p.SETTLE_DOMAIN_CODE = #{dept.departNo}
+			,p.UNIT_ID = #{dept.customerId}
+			,p.UNIT_NAME = #{dept.customerName}
+		where (p.SALARY_SOCIAL_FLAG = '0' and p.SALARY_FUND_FLAG = '0') and p.id in
+		<foreach item="item" index="index" collection="idSet" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</update>
+
 </mapper>