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 11:41:08 +08:00
parent cdcb65cb03
commit e8b7ba5ee5
14 changed files with 57 additions and 312 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
+3 -51
View File
@@ -84,51 +84,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@Resource
private SendMessageService sendMessageService;
// /**
// * 分页列表查询
// *
// * @param payMailBillSearch
// * @param pageNo
// * @param pageSize
// * @param
// * @return
// */
// @ApiOperation(value="邮寄票据-分页列表查询", notes="邮寄票据-分页列表查询")
// @GetMapping(value = "/list")
// public Result<?> queryPageList( PayMailBillSearch payMailBillSearch,
// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize
// ) {
//// QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
// Page<PayMailBill> page = new Page<>(pageNo, pageSize);
// if(ObjectUtils.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());
// }
// if(ObjectUtils.isNotEmpty(payMailBillSearch.getChargeCompanyName())) {
// payMailBillSearch.setChargeCompanyName(SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName()));
// }
// if(ObjectUtils.isNotEmpty(payMailBillSearch.getProjectName())) {
// payMailBillSearch.setProjectName(SearchUtil.exchenge(payMailBillSearch.getProjectName()));
// }
// IPage<PayMailBill> pageList = payMailBillService.pageLists(page, payMailBillSearch);
// if (!CollectionUtils.isEmpty(pageList.getRecords())) {
// try {
// pageList.getRecords().forEach(p -> {
// if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) {
// p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile()));
// }
// });
// } catch (Exception e) {
// log.error("手机号解密异常！", e);
// }
// }
// return Result.OK(pageList);
// }
/**
* 分页列表查询
@@ -228,9 +183,9 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
queryPayMailBillProject.eq(PayMailBillProject::getBillId,payMailBill.getId());
PayMailBillProject one = payMailBillProjectService.getOne(queryPayMailBillProject,false);
if(ObjectUtils.isNotEmpty(one)){
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject2 = new LambdaQueryWrapper<>();
queryPayMailBillProject2.eq(PayMailBillProject::getProjectId,one.getProjectId());
List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject2);
LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProjectTwo = new LambdaQueryWrapper<>();
queryPayMailBillProjectTwo.eq(PayMailBillProject::getProjectId,one.getProjectId());
List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProjectTwo);
// 开票金额
BigDecimal invoice = new BigDecimal("0.00");
@@ -413,9 +368,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
}
// Date day=new Date();
// SimpleDateFormat df = new SimpleDateFormat("yyyy年MM月dd日HH时mm分ss秒");
// return super.exportXls(request, payMailBill, PayMailBill.class, df.format(day).toString()+"邮寄票据信息");
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
-44
View File
@@ -154,50 +154,6 @@ public class PayMailContractController extends JeroController<PayMailContract, I
return Result.OK("操作成功!");
}
// /**
// * 通过id删除
// *
// * @param id
// * @return
// */
// @AutoLog(value = "邮寄合同-通过id删除")
// @ApiOperation(value="邮寄合同-通过id删除", notes="邮寄合同-通过id删除")
// @DeleteMapping(value = "/delete")
// public Result<?> delete(@RequestParam(name="id",required=true) String id) {
// payMailContractService.removeById(id);
// return Result.OK("删除成功!");
// }
//
// /**
// * 批量删除
// *
// * @param ids
// * @return
// */
// @AutoLog(value = "邮寄合同-批量删除")
// @ApiOperation(value="邮寄合同-批量删除", notes="邮寄合同-批量删除")
// @DeleteMapping(value = "/deleteBatch")
// public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
// this.payMailContractService.removeByIds(Arrays.asList(ids.split(",")));
// return Result.OK("批量删除成功!");
// }
//
// /**
// * 通过id查询
// *
// * @param id
// * @return
// */
// @AutoLog(value = "邮寄合同-通过id查询")
// @ApiOperation(value="邮寄合同-通过id查询", notes="邮寄合同-通过id查询")
// @GetMapping(value = "/queryById")
// public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
// PayMailContract payMailContract = payMailContractService.getById(id);
// if(payMailContract==null) {
// return Result.error("未找到对应数据");
// }
// return Result.OK(payMailContract);
// }
/**
* 导出excel