bonus
/
ahdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码调整

This commit is contained in:
mashuai 2024-08-23 10:14:28 +08:00
parent 8df9efcdbe
commit 6b6c2f6daa
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-api/bonus-api-system/src/main/java/com/bonus/base/api/domain/MaType.java
View File

@ -72,7 +72,7 @@ public class MaType extends BaseEntity implements Serializable {
*/ */
private Integer leasePrice; private Integer leasePrice;
/** /**
* 管理类型（0是编码 1数量和编码 2数量） * 管理类型（0是编码 1数量）
*/ */
private String manageType; private String manageType;
/** /**

3
bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseAcceptServiceImpl.java
View File

@ -66,10 +66,11 @@ public class BpmPurchaseAcceptServiceImpl implements BpmPurchaseAcceptService {
//只有任务状态为待验收时，方可批量验收合格 //只有任务状态为待验收时，方可批量验收合格
if (purchaseDto.getId() != null) { if (purchaseDto.getId() != null) {
String[] split = purchaseDto.getId().split(","); String[] split = purchaseDto.getId().split(",");
ArrayList<Integer> taskIdList = new ArrayList<>(); List<Integer> taskIdList = new ArrayList<>();
for (int i = 0; i < split.length; i++) { for (int i = 0; i < split.length; i++) {
taskIdList.add(Integer.parseInt(split[i])); taskIdList.add(Integer.parseInt(split[i]));
} }
purchaseDto.setTaskIds(taskIdList);
List<Integer> statusList = mapper.selectStatus(purchaseDto); List<Integer> statusList = mapper.selectStatus(purchaseDto);
if (CollectionUtils.isNotEmpty(statusList)) { if (CollectionUtils.isNotEmpty(statusList)) {
for (Integer status : statusList) { for (Integer status : statusList) {

4
bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseAcceptMapper.xml
View File

@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectStatus" resultType="java.lang.Integer"> <select id="selectStatus" resultType="java.lang.Integer">
select status from bpm_task bt select status from bpm_task
where id in where id in
<foreach collection="taskIds" item="taskId" open="(" separator="," close=")"> <foreach collection="taskIds" item="taskId" open="(" separator="," close=")">
#{taskId} #{taskId}
@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="select" resultType="com.bonus.purchase.vo.PurchaseAcceptVo"> <select id="select" resultType="com.bonus.purchase.vo.PurchaseAcceptVo">
select task_id as id, select task_id as id,
status as status status as status
from bpm_purchase_info bp from bpm_purchase_info
where id in where id in
<foreach collection="array" item="taskId" open="(" separator="," close=")"> <foreach collection="array" item="taskId" open="(" separator="," close=")">
#{taskId} #{taskId}