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

测试问题修改

This commit is contained in:
hayu 2024-06-04 09:01:38 +08:00
parent b1b42b9a78
commit 351bcbfb12
4 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java
View File

@ -180,15 +180,15 @@ public class BackApplyServiceImpl implements BackApplyService {
record.setCreateBy(userid.toString()); record.setCreateBy(userid.toString());
if(roles.contains("admin")){ if(roles.contains("admin")){
record.setStatus("2"); record.setStatus("2");
return backApplyMapper.refuse(record); backApplyMapper.refuse(record);
} }
if (companyId != null && companyId == 101) { if (companyId != null && companyId == 101) {
record.setStatus("2"); record.setStatus("2");
return backApplyMapper.refuse(record); backApplyMapper.refuse(record);
} }
if (companyId != null && companyId == 102) { if (companyId != null && companyId == 102) {
record.setStatus("4"); record.setStatus("4");
return backApplyMapper.refuse(record); backApplyMapper.refuse(record);
} }
List<Integer> taskIdById = backApplyMapper.getTaskIdById(record); List<Integer> taskIdById = backApplyMapper.getTaskIdById(record);
if (CollUtil.isNotEmpty(taskIdById)) { if (CollUtil.isNotEmpty(taskIdById)) {
@ -202,7 +202,7 @@ public class BackApplyServiceImpl implements BackApplyService {
record.setTaskStatus("101"); record.setTaskStatus("101");
backApplyMapper.updateTmTask(record); backApplyMapper.updateTmTask(record);
} }
return 0; return 1;
} }
} }

5
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -624,7 +624,10 @@
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id
WHERE WHERE
lad.parennt_id = #{record.id} AND lad.company_id = #{record.companyId} lad.parennt_id = #{record.id}
<if test="record.companyId != null and record.companyId != ''">
AND lad.company_id = #{record.companyId}
</if>
GROUP BY GROUP BY
lad.id lad.id
</select> </select>

11
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java
View File

@ -141,15 +141,4 @@ public class MachIneDto {
@ApiModelProperty(value = "表单集合入库数量") @ApiModelProperty(value = "表单集合入库数量")
private Double putInStoreNum; private Double putInStoreNum;
/**
* 单位名称
*/
@ApiModelProperty(value = "单位名称")
private String unitId;
/**
* 工程名称
*/
@ApiModelProperty(value = "工程名称")
private String proId;
} }

3
sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml
View File

@ -211,7 +211,4 @@
<select id="selectTaskNumByMonth" resultType="java.lang.Integer"> <select id="selectTaskNumByMonth" resultType="java.lang.Integer">
select count(*) from ma_type_put_in_storage_info where DATE_FORMAT(CREATE_DATE,'%y%m') = DATE_FORMAT(#{date},'%y%m') select count(*) from ma_type_put_in_storage_info where DATE_FORMAT(CREATE_DATE,'%y%m') = DATE_FORMAT(#{date},'%y%m')
</select> </select>
<select id="selectTaskNumByMonth" resultType="java.lang.Integer">
select count(*) from ma_type_put_in_storage_info where DATE_FORMAT(CREATE_DATE,'%y%m') = DATE_FORMAT(#{date},'%y%m')
</select>
</mapper> </mapper>