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

bug修改

This commit is contained in:
liang.chao 2024-04-12 17:18:48 +08:00
parent 5eb3fdf54a
commit 1ecf314a2a
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -491,6 +491,12 @@ public class TmTaskServiceImpl implements TmTaskService {
for (TmTask tmTask : tmTaskList) { for (TmTask tmTask : tmTaskList) {
int count = 0; int count = 0;
if (tmTask != null) { if (tmTask != null) {
if (tmTask.getTaskStatus() == 31) {
tmTask.setTaskName("机具分公司审核");
}
if (tmTask.getTaskStatus() == 32) {
tmTask.setTaskName("施工部审核");
}
// 去查询任务分单表 // 去查询任务分单表
List<LeaseApplyInfo> collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask); List<LeaseApplyInfo> collect = tmTaskMapper.getAuditManageListByLeaseInfo(tmTask);
// 对领料任务集合查询具体详情 // 对领料任务集合查询具体详情
@ -525,6 +531,12 @@ public class TmTaskServiceImpl implements TmTaskService {
List<TmTask> tmTaskList = new ArrayList<>(); List<TmTask> tmTaskList = new ArrayList<>();
TmTask tmTask = tmTaskMapper.getLeaseListTmTask(task); TmTask tmTask = tmTaskMapper.getLeaseListTmTask(task);
if (tmTask != null) { if (tmTask != null) {
if (tmTask.getTaskStatus() == 31) {
tmTask.setTaskName("机具分公司审核");
}
if (tmTask.getTaskStatus() == 32) {
tmTask.setTaskName("施工部审核");
}
List<LeaseApplyInfo> leaseApplyInfoList = tmTaskMapper.getLeaseListByLeaseInfo(task); List<LeaseApplyInfo> leaseApplyInfoList = tmTaskMapper.getLeaseListByLeaseInfo(task);
tmTask.setLeaseApplyInfoList(leaseApplyInfoList); tmTask.setLeaseApplyInfoList(leaseApplyInfoList);

8
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java
View File

@ -411,9 +411,9 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
List<BackApplyInfo> list = new ArrayList(); List<BackApplyInfo> list = new ArrayList();
for (BackApplyInfo backApplyInfo1 : backApplyDetails) { for (BackApplyInfo backApplyInfo1 : backApplyDetails) {
BackApplyInfo backCheckDetails = new BackApplyInfo(); BackApplyInfo backCheckDetails = new BackApplyInfo();
for (BackApplyInfo backApplyInfo2 : backApplyInfoList) { if (backApplyInfoList != null) {
if (backApplyInfo1.getCompanyId().equals(backApplyInfo2.getCompanyId())) { if (backApplyInfo1.getCompanyId().equals(backApplyInfoList.get(0).getCompanyId())) {
backCheckDetails.setParentId(backApplyInfo1.getId().intValue()); backCheckDetails.setParentId(backApplyInfoList.get(0).getId().intValue());
backCheckDetails.setTypeId(backApplyInfo1.getTypeId()); backCheckDetails.setTypeId(backApplyInfo1.getTypeId());
backCheckDetails.setMaId(backApplyInfo1.getMaId()); backCheckDetails.setMaId(backApplyInfo1.getMaId());
backCheckDetails.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString()); backCheckDetails.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString());
@ -605,7 +605,7 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId()); DirectApplyInfo directApplyInfos = getDirectApplyInfoById(directApplyInfoDetails.getId());
directApplyInfos.setStatus("1"); directApplyInfos.setStatus("1");
directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername()); directApplyInfos.setAuditor(SecurityUtils.getLoginUser().getUsername());
directApplyInfos.setAuditTime(DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss")); directApplyInfos.setAuditTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
res = refuseDirectApplyInfo(directApplyInfos); res = refuseDirectApplyInfo(directApplyInfos);
} else { } else {
return res; return res;

1
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
View File

@ -516,6 +516,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.type_name typeCode, mt.type_name typeCode,
mt2.type_name AS typeName, mt2.type_name AS typeName,
bagi.agreement_code as agreementCode, bagi.agreement_code as agreementCode,
bad.pre_num AS preNum,
bad.audit_num AS num bad.audit_num AS num
FROM FROM
back_apply_details bad back_apply_details bad

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
View File

@ -492,7 +492,7 @@
dai.id = #{id} dai.id = #{id}
AND sai.STATUS = '0' AND sai.STATUS = '0'
GROUP BY GROUP BY
dad.id,sai.ma_id,sai.type_id dad.id,sai.type_id
</select> </select>
<select id="getListAll" resultType="com.bonus.sgzb.base.api.domain.DirectApplyInfo"> <select id="getListAll" resultType="com.bonus.sgzb.base.api.domain.DirectApplyInfo">
SELECT SELECT