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

fix:

Browse Source
This commit is contained in:
zhangqinlin
2021-11-03 09:07:59 +08:00
parent ba006873c3
commit 2946c85aa9
5 changed files with 473 additions and 514 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
+8 -24
View File
@@ -133,11 +133,9 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@GetMapping(value = "/list")
public Result<?> queryPageList(PayMailBillSearch payMailBillSearch,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize
) {
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
Page<PayMailBill> page = new Page<>(pageNo, pageSize);
if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) {
Calendar calendar= Calendar.getInstance();
calendar.setTime(payMailBillSearch.getEndTime());
@@ -146,10 +144,8 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
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());
@@ -167,7 +163,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){
queryWrapper.like("project_name",oConvertUtils.replaceAllPercent(payMailBillSearch.getProjectName()));
}
IPage<PayMailBill> pageList = payMailBillService.pageList(page, queryWrapper);
getMobile(pageList.getRecords());
return Result.OK(pageList);
@@ -182,8 +177,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@ApiOperation(value="邮寄合同-修改", notes="邮寄合同-修改")
@PostMapping(value = "/editTwo")
@Transactional
public Result<?> editTwo(@RequestBody PayMailBill payMailBill
) {
public Result<?> editTwo(@RequestBody PayMailBill payMailBill) {
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
payMailBill.setPostStatus(1);
payMailBill.setContactMobile(PasswordUtil.encrypt(payMailBill.getContactMobile()));
@@ -351,12 +345,12 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
@Transactional
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMailBill payMailBill) {
public Result<?> edit(@RequestBody PayMailBill payMailBill){
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
payMailBill.setContactMobile(PasswordUtil.encrypt(payMailBill.getContactMobile()));
payMailBill.setPostStatus(1);
payMailBill.setPostStatus(1);
payMailBill.setMailer(sysUser.getUsername());
payMailBillService.updateById(payMailBill);
payMailBillService.updateById(payMailBill);
//变更5种项目的邮寄状态
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
queryPayMailBillProject.eq(PayMailBillProject::getBillId,payMailBill.getId());
@@ -651,11 +645,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@AutoLog(value = "邮寄票据-导出")
@ApiOperation(value="邮寄票据-导出", notes="邮寄票据-导出")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(
PayMailBillSearch payMailBillSearch,
@RequestParam(name = "ids",required = false) String ids
) {
public ModelAndView exportXls(PayMailBillSearch payMailBillSearch, @RequestParam(name = "ids",required = false) String ids) {
if(StringUtils.isBlank(ids)){
QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) {
@@ -692,16 +682,10 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
return AmountUtil.exportListXls(pageList,PayMailBill.class,"邮寄票据");
}else {
ArrayList<String> strings = new ArrayList<>(Arrays.asList(ids.split(",")));
List<PayMailBill> list = payMailBillService.listByIds(strings);
List<PayMailBill> list = payMailBillService.listByIds(strings);
getMobile(list);
return AmountUtil.exportListXls(list,PayMailBill.class,"邮寄票据");
return AmountUtil.exportListXls(list, PayMailBill.class, "邮寄票据");
}
}
private void getMobile(List<PayMailBill> list) {