From 471bc9af79c4df4d2f90e22848b46311bef2395a Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Thu, 23 Jan 2025 16:13:37 +0800 Subject: [PATCH] =?UTF-8?q?i=E7=9A=96=E9=80=81=E6=8E=A8=E9=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/interceptor/DataEnDecryptInterceptor.java | 2 +- .../push/controller/IwsCostPushController.java | 3 ++- .../bonus/material/push/domain/IwsCostPushBean.java | 10 ++++++++-- .../mapper/material/push/IwsCostPushMapper.xml | 3 ++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/interceptor/DataEnDecryptInterceptor.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/interceptor/DataEnDecryptInterceptor.java index 5f259906..65498550 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/interceptor/DataEnDecryptInterceptor.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/interceptor/DataEnDecryptInterceptor.java @@ -29,7 +29,7 @@ import java.util.Properties; }) public class DataEnDecryptInterceptor implements Interceptor { protected final Logger logger = LoggerFactory.getLogger(this.getClass()); - final static String USER_MAPPER_ID = ""; + final static String USER_MAPPER_ID = "NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN"; final static String DEPT_MAPPER_ID = "com.bonus.material.basic.mapper.BmUnitMapper"; @Override public Object intercept(Invocation invocation) throws Throwable { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java index ed698f06..bac34bd1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java @@ -7,6 +7,7 @@ import com.bonus.material.push.domain.IwsCostPushBean; import com.bonus.material.push.service.IwsCostPushService; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -35,7 +36,7 @@ public class IwsCostPushController extends BaseController { */ @ApiOperation("查询协议推送匹配列表--分页") @PostMapping("/findAgreementPushMatchList") - public TableDataInfo findAgreementPushMatchList(IwsCostPushBean obj) { + public TableDataInfo findAgreementPushMatchList(@RequestBody IwsCostPushBean obj) { startPage(); List list = iwsCostPushService.findAgreement(obj); return getDataTable(list); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java index b744a04f..a5a10485 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java @@ -33,9 +33,12 @@ public class IwsCostPushBean implements Serializable { private String unitId; - @Excel(name = "项目名称") + @Excel(name = "工程名称") private String projectName; + @Excel(name = "工程编号") + private String projectCode; + @Excel(name = "单位名称") private String unitName; @@ -78,13 +81,16 @@ public class IwsCostPushBean implements Serializable { // 是否结算 @Excel(name = "是否结算", readConverterExp = "0=未结算,1=已结算") - private Byte isSettlement; + private Byte isSettlement = 0; // 结算时间 @Excel(name = "结算时间", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime settlementTime; + // 是否匹配 + private Byte isMatch = 0; + private String userName; private List ids; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml index 144ac73b..26be1c13 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml @@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT bp.PRO_ID AS projectId, bp.pro_name AS projectName, + bp.pro_code AS projectCode, bu.unit_name AS unitName, bma.`agreement_code` AS agreementCode, bma.is_slt AS isSettlement, @@ -26,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND bma.unit_id = #{unitId} - + AND bma.is_push = #{isPush}