diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java index 5aef4eda..41e50add 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java @@ -89,8 +89,8 @@ public class PayMailBillController extends JeroController pageList = payMailBillService.page(page, queryWrapper); return Result.OK(pageList); } - - /** - * 添加 - * - * @param payMailBill - * @return - */ - @ApiOperation(value="邮寄票据-添加", notes="邮寄票据-添加") - @PostMapping(value = "/add") - @Transactional - public Result add(@RequestBody PayMailBill payMailBill) { - payMailBillService.save(payMailBill); - return Result.OK("添加成功！"); - } + /** * 添加 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java index 37072d35..5f991963 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java @@ -118,4 +118,8 @@ public class PayMailBill implements Serializable { @NotNull(message = "项目负责人不能为空") private java.lang.String principalName; + @NotNull(message = "项目负责人不能为空") + @ApiModelProperty(value = "项目负责人") + private java.lang.String principalId; + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillSearch.java index b7ae4fc3..4afab08e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillSearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillSearch.java @@ -21,7 +21,7 @@ public class PayMailBillSearch { @ApiModelProperty(value = "项目负责人") - private java.lang.String principalName; + private java.lang.String principalId; @ApiModelProperty(value = "项目名称") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java index d9c8c5df..6c082d7d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java @@ -62,6 +62,7 @@ public class PayWorkingGroupStatisticsController { double sum2 = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney()==null ? "0.00" : t.getComeAllMoney())).sum(); HashMap objectObjectHashMap = new HashMap<>(); DecimalFormat df = new DecimalFormat("#.00"); + objectObjectHashMap.put("pageList",pageList); objectObjectHashMap.put("sumOfMoney", df.format(sum)); objectObjectHashMap.put("sumOfReallyMoney", df.format(sum2)); @@ -112,6 +113,11 @@ public class PayWorkingGroupStatisticsController { double sum2 = pageList.getRecords().stream().mapToDouble(t -> Double.parseDouble(t.getComeAllMoney() == null ? "0" : t.getComeAllMoney())).sum(); HashMap hashMap = new HashMap<>(); DecimalFormat df = new DecimalFormat("#.00"); +for(PayWorkGroupSubletStatistics s: pageList.getRecords()){ + String key = String.valueOf(s.getChargeUse()); + String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key); + s.setChargeUse_text(payment_charge_use); +} hashMap.put("pageList",pageList); hashMap.put("sumOfMoney", df.format(sum)); hashMap.put("sumOfReallyMoney", df.format(sum2)); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java index 4c886ab3..dc9b3d49 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java @@ -32,11 +32,14 @@ public class PayWorkGroupSubletStatistics { @ApiModelProperty(value = "实收总金额") private String comeAllMoney; + @Excel(name = "来款用途", width = 15, dicCode="payment_charge_use") @Dict(dicCode = "payment_charge_use") - @Excel(name = "来款用途", width = 15) @ApiModelProperty(value = "来款用途") private int chargeUse; - - +// +// @Excel(name = "来款用途", width = 15, dicCode="payment_charge_use") + @Dict(dicCode = "payment_charge_use") + @ApiModelProperty(value = "来款用途文本") + private String chargeUse_text; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index 2c49b094..082b0681 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -84,7 +84,8 @@ AND pwgs.charge_use=#{payWorkingGroupSubletSearch.chargeUse} - AND pwgs.charge_company_temporary_name=#{payWorkingGroupSubletSearch.chargeCompanyTemporaryName} + AND pwgs.charge_company_temporary_name LIKE + concat('%',concat(#{payWorkingGroupSubletSearch.chargeCompanyTemporaryName},'%')) AND pwgs.in_account=#{payWorkingGroupSubletSearch.inAccountStatue} diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml index 994215a6..3eefa24e 100644 --- a/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -147,7 +147,8 @@ spring: driver-class-name: com.p6spy.engine.spy.P6SpyDriver redis: database: 14 - host: 121.36.69.172 + # host: 121.36.69.172 + host: 192.168.18.254 lettuce: pool: max-active: 8 #最大连接数据库连接数,设 0 为没有限制 @@ -155,8 +156,10 @@ spring: max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。 min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 100ms - password: hzwlsoft.com - port: 4780 + # password: hzwlsoft.com + password: 123456 + # port: 4780 + port: 6379 #mybatis plus 设置 mybatis-plus: