Commit 8ff8e2fe authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.9' into MVP1.7.9

parents 2d100692 71642f17
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
ifnull(c.fd_recipient_bank,a.fd_recipient_bank) fdRecipientBank, ifnull(c.fd_recipient_bank,a.fd_recipient_bank) fdRecipientBank,
'' fdRecipientAdress, '' fdRecipientAdress,
c.fd_recipient_bank_code fdRecipientBankCode, c.fd_recipient_bank_code fdRecipientBankCode,
'1' payType, '2' payType,
a.fd_payee_account fdPayeeAccount, a.fd_payee_account fdPayeeAccount,
a.fd_payee_name fdPayeeName, a.fd_payee_name fdPayeeName,
concat('',round(a.fd_money * 100,0)) fdMoney, concat('',round(a.fd_money * 100,0)) fdMoney,
......
...@@ -17,6 +17,7 @@ import org.springframework.security.access.prepost.PreAuthorize; ...@@ -17,6 +17,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List;
/** /**
...@@ -107,4 +108,15 @@ public class TEmployeeInsurancePreController { ...@@ -107,4 +108,15 @@ public class TEmployeeInsurancePreController {
public void export(HttpServletResponse response, @RequestBody TEmployeeInsurancePreSearchVo searchVo) { public void export(HttpServletResponse response, @RequestBody TEmployeeInsurancePreSearchVo searchVo) {
tEmployeeInsurancePreService.listExport(response,searchVo); tEmployeeInsurancePreService.listExport(response,searchVo);
} }
/**
* 商险待办任务表 批量导出
* @author huych
* @date 2025-03-31 12:25:13
**/
@Operation(description = "商险派单信息单个/批量确认")
@PostMapping("/confirm")
public R confirm(@RequestBody List<String> idList) {
return tEmployeeInsurancePreService.confirm(idList);
}
} }
...@@ -20,10 +20,12 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance; ...@@ -20,10 +20,12 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TEmployeeInsurancePre;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreSearchVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreSearchVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.List;
/** /**
* 商险待办任务表 * 商险待办任务表
...@@ -39,6 +41,18 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc ...@@ -39,6 +41,18 @@ public interface TEmployeeInsurancePreService extends IService<TEmployeeInsuranc
*/ */
IPage<TEmployeeInsurancePre> getTEmployeeInsurancePrePage(Page<TEmployeeInsurancePre> page, TEmployeeInsurancePreSearchVo tEmployeeInsurancePre); IPage<TEmployeeInsurancePre> getTEmployeeInsurancePrePage(Page<TEmployeeInsurancePre> page, TEmployeeInsurancePreSearchVo tEmployeeInsurancePre);
/**
* 商险待办任务表导出
* @param searchVo 商险待办任务表
* @return
*/
void listExport(HttpServletResponse response, TEmployeeInsurancePreSearchVo searchVo); void listExport(HttpServletResponse response, TEmployeeInsurancePreSearchVo searchVo);
/**
* 商险待办任务表简单分页查询
* @param idList id集合
* @return
*/
R confirm(List<String> idList);
} }
...@@ -3,7 +3,9 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl; ...@@ -3,7 +3,9 @@ package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; 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.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainRegistListVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainRegistListVo;
...@@ -105,6 +107,22 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur ...@@ -105,6 +107,22 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
} }
} }
@Override
public R confirm(List<String> idList) {
List<TEmployeeInsurancePre> insurancePreList = baseMapper.selectList(Wrappers.<TEmployeeInsurancePre>query()
.lambda().in(TEmployeeInsurancePre::getId, idList)
.eq(TEmployeeInsurancePre::getProcessStatus, CommonConstants.ZERO_STRING));
if (Common.isEmpty(insurancePreList)) {
return R.failed(CommonConstants.NO_DATA_TO_HANDLE);
}
LambdaUpdateWrapper<TEmployeeInsurancePre> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.in(TEmployeeInsurancePre::getId,idList)
.eq(TEmployeeInsurancePre::getProcessStatus, CommonConstants.ZERO_STRING)
.set(TEmployeeInsurancePre::getProcessStatus, CommonConstants.ONE_STRING);
this.update(updateWrapper);
return R.ok();
}
/** /**
* @Description: 获取前端客服的所有项目权限 * @Description: 获取前端客服的所有项目权限
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment