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:40:53 +08:00
parent 471bc9af79
commit a9e22710b4
4 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,10 +6,7 @@ import com.bonus.common.core.web.page.TableDataInfo;
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;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@ -35,8 +32,8 @@ public class IwsCostPushController extends BaseController {
* @param obj 查询条件
*/
@ApiOperation("查询协议推送匹配列表--分页")
@PostMapping("/findAgreementPushMatchList")
public TableDataInfo findAgreementPushMatchList(@RequestBody IwsCostPushBean obj) {
@GetMapping("/findAgreementPushMatchList")
public TableDataInfo findAgreementPushMatchList(IwsCostPushBean obj) {
startPage();
List<IwsCostPushBean> list = iwsCostPushService.findAgreement(obj);
return getDataTable(list);

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

@ -23,7 +23,7 @@ public class IwsCostPushBean implements Serializable {
private String id;
// 协议号
@Excel(name = "协议号")
@Excel(name = "协议号", sort = 1)
private String agreementCode;
// 协议id
@ -33,13 +33,13 @@ public class IwsCostPushBean implements Serializable {
private String unitId;
@Excel(name = "工程名称")
@Excel(name = "工程名称", sort = 3)
private String projectName;
@Excel(name = "工程编号")
@Excel(name = "工程编号", sort = 4)
private String projectCode;
@Excel(name = "单位名称")
@Excel(name = "单位名称", sort = 2)
private String unitName;
private String typeName;
@ -80,15 +80,16 @@ public class IwsCostPushBean implements Serializable {
private String year;
// 是否结算
@Excel(name = "是否结算", readConverterExp = "0=未结算,1=已结算")
@Excel(name = "是否结算", readConverterExp = "0=未结算,1=已结算", sort = 6)
private Byte isSettlement = 0;
// 结算时间
@Excel(name = "结算时间", dateFormat = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "结算时间", dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 7)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime settlementTime;
// 是否匹配
@Excel(name = "是否匹配", readConverterExp = "0=未匹配,1=已匹配", sort = 5)
private Byte isMatch = 0;
private String userName;

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/push/mapper/IwsCostPushMapper.java
View File

@ -20,4 +20,8 @@ public interface IwsCostPushMapper {
*/
List<IwsCostPushBean> findAgreement(IwsCostPushBean o);
/**
* 更新协议push状态
*/
int updateAgreementIsPush(IwsCostPushBean o);
}

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

@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="findAgreement" resultType="com.bonus.material.push.domain.IwsCostPushBean">
SELECT
bp.PRO_ID AS projectId,
bp.pro_id AS projectId,
bp.pro_name AS projectName,
bp.pro_code AS projectCode,
bu.unit_name AS unitName,
@ -36,6 +36,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<update id="updateAgreementIsPush">
UPDATE bm_agreement_info
SET is_push = #{isPush}
WHERE agreement_id IN
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</update>
</mapper>