bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i皖送推送修改

This commit is contained in:
syruan 2025-01-23 16:13:37 +08:00
parent ba45c87fb8
commit 471bc9af79
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/interceptor/DataEnDecryptInterceptor.java
View File

@ -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 {

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/controller/IwsCostPushController.java
View File

@ -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<IwsCostPushBean> list = iwsCostPushService.findAgreement(obj);
return getDataTable(list);

10
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/domain/IwsCostPushBean.java
View File

@ -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<String> ids;

3
bonus-modules/bonus-material/src/main/resources/mapper/material/push/IwsCostPushMapper.xml
View File

@ -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"
<if test="unitId != null and unitId != ''">
AND bma.unit_id = #{unitId}
</if>
<if test="isPush != null and isPush != ''">
<if test="isPush != null">
AND bma.is_push = #{isPush}
</if>
<if test="isSettlement != null and isSettlement != ''">