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

app按钮修改

This commit is contained in:
1539530615@qq.com 2024-01-23 09:20:54 +08:00
parent b333348e34
commit ffbe56adb5
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMenuMapper.xml
View File

@ -27,7 +27,8 @@
<select id="getMenuById" resultType="com.bonus.sgzb.app.domain.AppMenu"> <select id="getMenuById" resultType="com.bonus.sgzb.app.domain.AppMenu">
select amu.id, select amu.id,
amu.menu_id as menuId, amu.menu_id as menuId,
am.icon_name as iconName am.icon_name as iconName,
am.icon_mark as iconMark
from app_menu_user amu from app_menu_user amu
left join app_menu am on am.id = amu.menu_id left join app_menu am on am.id = amu.menu_id
where user_id = #{userId} where user_id = #{userId}

9
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -182,8 +182,6 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
taskStatus = 53; taskStatus = 53;
taskType = 50; taskType = 50;
long inputTaskId = genTask(taskCode,taskType,taskStatus,tmTaskAgreement,companyId); long inputTaskId = genTask(taskCode,taskType,taskStatus,tmTaskAgreement,companyId);
for (RepairAuditDetails inputDetails : repairInputList) { for (RepairAuditDetails inputDetails : repairInputList) {
Long typeId = inputDetails.getTypeId(); Long typeId = inputDetails.getTypeId();
Long maId = inputDetails.getMaId(); Long maId = inputDetails.getMaId();
@ -207,7 +205,6 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
} }
} }
if(scrapNumList != null && scrapNumList.size() > 0){ if(scrapNumList != null && scrapNumList.size() > 0){
companyId = scrapNumList.get(0).getCompanyId(); companyId = scrapNumList.get(0).getCompanyId();
taskCode = purchaseCodeRule("BF",57); taskCode = purchaseCodeRule("BF",57);
taskStatus = 58; taskStatus = 58;
@ -216,14 +213,10 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
for (RepairAuditDetails scrapDetails : scrapNumList) { for (RepairAuditDetails scrapDetails : scrapNumList) {
Long typeId = scrapDetails.getTypeId(); Long typeId = scrapDetails.getTypeId();
Long maId = scrapDetails.getMaId(); Long maId = scrapDetails.getMaId();
BigDecimal repairNum = scrapDetails.getRepairedNum();
BigDecimal b = new BigDecimal(0); BigDecimal b = new BigDecimal(0);
// 创建报废任务 // 创建报废任务
BigDecimal scrapNum = scrapDetails.getScrapNum(); BigDecimal scrapNum = scrapDetails.getScrapNum();
if (scrapNum.compareTo(b) > 0) { if (scrapNum.compareTo(b) > 0) {
// 添加退料任务 // 添加退料任务
ScrapApplyDetails scrapApplyDetails = new ScrapApplyDetails(); ScrapApplyDetails scrapApplyDetails = new ScrapApplyDetails();
scrapApplyDetails.setTaskId(scrapTaskId); scrapApplyDetails.setTaskId(scrapTaskId);
@ -236,12 +229,10 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
scrapApplyDetails.setCreateById(SecurityUtils.getUserId()); scrapApplyDetails.setCreateById(SecurityUtils.getUserId());
scrapApplyDetails.setCreateTime(new Date()); scrapApplyDetails.setCreateTime(new Date());
scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails); scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails);
} }
} }
} }
// 修饰审核通过时改修任务为已通过审核 // 修饰审核通过时改修任务为已通过审核
task1.setTaskStatus(47); task1.setTaskStatus(47);
task1.setUpdateTime(new Date()); task1.setUpdateTime(new Date());