LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 分表委

Browse Source
This commit is contained in:
zhangqinlin
2021-10-15 14:00:55 +08:00
parent c5c31fa8bb
commit abf1942d32
8 changed files with 78 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+30 -12
View File
@@ -317,23 +317,41 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(
PayMailBillSearch payMailBillSearch,
@RequestParam(name = "ids",required = false) String ids) {
@RequestParam(name = "ids",required = false) String ids
) {
if(StringUtils.isBlank(ids)){
if(ObjectUtils.isNotEmpty(payMailBillSearch.getEndTime())) {
Calendar calendar = Calendar.getInstance();
QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) {
Calendar calendar= Calendar.getInstance();
calendar.setTime(payMailBillSearch.getEndTime());
calendar.add(Calendar.HOUR, 23);//时
calendar.add(Calendar.MINUTE, 59);//时
calendar.add(Calendar.SECOND, 59);//秒
payMailBillSearch.setEndTime(calendar.getTime());
calendar.add(Calendar.HOUR,23);//时
calendar.add(Calendar.MINUTE,59);//时
calendar.add(Calendar.SECOND,59);//秒
queryWrapper.ge("send_date", payMailBillSearch.getStartTime());
queryWrapper.le("send_date", calendar.getTime());
}else if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime())){
queryWrapper.ge("send_date", payMailBillSearch.getStartTime());
}else if (ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())){
Calendar calendar= Calendar.getInstance();
calendar.setTime(payMailBillSearch.getEndTime());
calendar.add(Calendar.HOUR,23);//时
calendar.add(Calendar.MINUTE,59);//时
calendar.add(Calendar.SECOND,59);//秒
queryWrapper.le("send_date", calendar.getTime());
}
if(ObjectUtils.isNotEmpty(payMailBillSearch.getChargeCompanyName())) {
payMailBillSearch.setChargeCompanyName(SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName()));
if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){
queryWrapper.like("charge_company_name",oConvertUtils.replaceAllPercent(payMailBillSearch.getChargeCompanyName()));
}
if(ObjectUtils.isNotEmpty(payMailBillSearch.getProjectName())) {
payMailBillSearch.setProjectName(SearchUtil.exchenge(payMailBillSearch.getProjectName()));
if (ObjectUtil.isNotEmpty(payMailBillSearch.getPrincipalId())){
queryWrapper.eq("principal_id",payMailBillSearch.getPrincipalId());
}
List<PayMailBill> pageList = payMailBillService.pageListTwo(payMailBillSearch);
if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){
queryWrapper.like("project_name",oConvertUtils.replaceAllPercent(payMailBillSearch.getProjectName()));
}
List<PayMailBill> pageList = payMailBillService.list(queryWrapper);
if (!CollectionUtils.isEmpty(pageList)) {
try {
pageList.forEach(p -> {
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+8 -6
View File
@@ -16,6 +16,7 @@ import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.oConvertUtils;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.mail.entity.PayMailBill;
@@ -65,9 +66,9 @@ public class PayMailContractController extends JeroController<PayMailContract, I
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize
) {
payMailBillList.setContractName(SearchUtil.exchenge(payMailBillList.getContractName()));
payMailBillList.setContractNum(SearchUtil.exchenge(payMailBillList.getContractNum()));
payMailBillList.setSignedCompanyTemporaryName(SearchUtil.exchenge(payMailBillList.getSignedCompanyTemporaryName()));
payMailBillList.setContractName(oConvertUtils.replaceAllPercent(payMailBillList.getContractName()));
payMailBillList.setContractNum(oConvertUtils.replaceAllPercent(payMailBillList.getContractNum()));
payMailBillList.setSignedCompanyTemporaryName(oConvertUtils.replaceAllPercent(payMailBillList.getSignedCompanyTemporaryName()));
Page<PayMailBillList> page = new Page<>(pageNo, pageSize);
IPage<PayMailBillList> pageList = payMailContractService.pageContract(page,payMailBillList);
if (!CollectionUtils.isEmpty(pageList.getRecords())) {
@@ -155,6 +156,7 @@ public class PayMailContractController extends JeroController<PayMailContract, I
return Result.OK("操作成功!");
}
/**
* 导出excel
*/
@@ -164,9 +166,9 @@ public class PayMailContractController extends JeroController<PayMailContract, I
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(PayMailBillList payMailBillList, @RequestParam(name = "ids", required = false) String ids) {
if (StringUtils.isBlank(ids)) {
payMailBillList.setContractName(SearchUtil.exchenge(payMailBillList.getContractName()));
payMailBillList.setContractNum(SearchUtil.exchenge(payMailBillList.getContractNum()));
payMailBillList.setSignedCompanyTemporaryName(SearchUtil.exchenge(payMailBillList.getSignedCompanyTemporaryName()));
payMailBillList.setContractName(oConvertUtils.replaceAllPercent(payMailBillList.getContractName()));
payMailBillList.setContractNum(oConvertUtils.replaceAllPercent(payMailBillList.getContractNum()));
payMailBillList.setSignedCompanyTemporaryName(oConvertUtils.replaceAllPercent(payMailBillList.getSignedCompanyTemporaryName()));
List<PayMailBillList> pageList = payMailContractService.pageContractTwo(payMailBillList);
if (!CollectionUtils.isEmpty(pageList)) {
try {
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
+4 -4
View File
@@ -19,16 +19,16 @@ pic.principal_id as principalId,
pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id)
<where>
<if test="payMailBillList.contractNum !='' and payMailBillList.contractNum !=null">
pic.contract_num like concat('%',concat(#{payMailBillList.contractNum},'%')) escape '/'
pic.contract_num like concat('%',concat(#{payMailBillList.contractNum},'%'))
</if>
<if test="payMailBillList.contractName !='' and payMailBillList.contractName !=null">
pic.contract_name like concat('%',concat(#{payMailBillList.contractName},'%')) escape '/'
and pic.contract_name like concat('%',concat(#{payMailBillList.contractName},'%'))
</if>
<if test="payMailBillList.signedCompanyTemporaryName !='' and payMailBillList.signedCompanyTemporaryName !=null">
pic.signed_company_temporary_name like concat('%',concat(#{payMailBillList.signedCompanyTemporaryName},'%')) escape '/'
and pic.signed_company_temporary_name like concat('%',concat(#{payMailBillList.signedCompanyTemporaryName},'%'))
</if>
<if test="payMailBillList.principalId !='' and payMailBillList.principalId !=null">
pic.principal_id = #{payMailBillList.principalId}
and pic.principal_id = #{payMailBillList.principalId}
</if>
</where>
order by post_status ASC , pc.create_time DESC