From 12c90475afebb4ac2dd48f51512a72510f674978 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Thu, 25 Jan 2024 09:58:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/system/controller/SysProfileController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java index 35065ee4..0732640d 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java @@ -59,7 +59,7 @@ public class SysProfileController extends BaseController { */ @GetMapping public AjaxResult profile() { - String username = SecurityUtils.getUsername(); + String username = SecurityUtils.getLoginUser().getUsername(); SysUser user = userService.selectUserByUserName(username); AjaxResult ajax = AjaxResult.success(user); ajax.put("roleGroup", userService.selectUserRoleGroup(username)); From cffce178a3f584595219034cd700944992870f98 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Thu, 25 Jan 2024 10:35:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E6=98=B5=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/system/SysLogininforMapper.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 2355ec64..160ae5fc 100644 --- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -19,25 +19,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" From e62aa0f71c850db5fdfe284e2e614eed804f7bf0 Mon Sep 17 00:00:00 2001 From: "1539530615@qq.com" <1539530615@qq.com> Date: Thu, 25 Jan 2024 13:16:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/SysNoticeController.java | 10 ++++-- .../sgzb/app/mapper/SysNoticeMapper.java | 2 ++ .../sgzb/app/service/SysNoticeService.java | 2 ++ .../service/impl/SysNoticeServiceImpl.java | 10 ++++++ .../resources/mapper/app/SysNoticeMapper.xml | 14 ++++++++ .../mapper/RepairAuditDetailsMapper.java | 2 ++ .../impl/RepairAuditDetailsServiceImpl.java | 35 +++++++++---------- .../material/RepairAuditDetailsMapper.xml | 7 +++- 8 files changed, 61 insertions(+), 21 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/SysNoticeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/SysNoticeController.java index 0de954ad..18355cd0 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/SysNoticeController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/SysNoticeController.java @@ -24,9 +24,15 @@ public class SysNoticeController { @ApiOperation(value = "查询通知公告列表") @GetMapping("/getList") - public AjaxResult getList(@RequestParam(required = false, defaultValue = "", value = "keyword") String keyword) - { + public AjaxResult getList(@RequestParam(required = false, defaultValue = "", value = "keyword") String keyword) { List list = service.getList(keyword); return AjaxResult.success("操作成功",list); } + + @ApiOperation(value = "查询通知公告详细") + @GetMapping("/getById") + public AjaxResult getById(@RequestParam(required = false, defaultValue = "", value = "noticeId") Long noticeId) { + SysNotice bean = service.getById(noticeId); + return AjaxResult.success("操作成功",bean); + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/SysNoticeMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/SysNoticeMapper.java index b909cf00..bca79807 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/SysNoticeMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/SysNoticeMapper.java @@ -17,4 +17,6 @@ public interface SysNoticeMapper { * @return */ List getList(String keyword); + + SysNotice getById(Long noticeId); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/SysNoticeService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/SysNoticeService.java index 8fa2eaeb..30c2b5e7 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/SysNoticeService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/SysNoticeService.java @@ -15,4 +15,6 @@ public interface SysNoticeService { * @return */ List getList(String keyword); + + SysNotice getById(Long noticeId); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/SysNoticeServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/SysNoticeServiceImpl.java index 64ab4eac..318f006e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/SysNoticeServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/SysNoticeServiceImpl.java @@ -29,4 +29,14 @@ public class SysNoticeServiceImpl implements SysNoticeService { } return list; } + + @Override + public SysNotice getById(Long noticeId) { + SysNotice bean = mapper.getById(noticeId); + if (bean.getNoticeContent() != null){ + String noticeContent = Base64.getEncoder().encodeToString(bean.getNoticeContent()); + bean.setNoticeContentStr(noticeContent); + } + return bean; + } } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/SysNoticeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/SysNoticeMapper.xml index 342a038c..039b539d 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/SysNoticeMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/SysNoticeMapper.xml @@ -21,4 +21,18 @@ order by create_time desc + diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java index cdd49f63..9e05368f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java @@ -82,4 +82,6 @@ public interface RepairAuditDetailsMapper int insertRepairDetails(RepairTaskDetails repairTaskDetails); Long getBackId(Long repairId); + + List selectnotAuditByTaskId(Long taskId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java index 5548ab96..7cb908b2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java @@ -172,6 +172,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService } List auditAllList = repairAuditDetailsMapper.selectRepairAuditDetailsByTaskId(taskId); + List notAuditList = repairAuditDetailsMapper.selectnotAuditByTaskId(taskId); // 查询协议表 TmTaskAgreement tmTaskAgreement = agreementMapper.selectTmTaskAgreementByTaskId(taskId); String taskCode =""; @@ -241,7 +242,6 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService // 创建报废任务 BigDecimal scrapNum = scrapDetails.getScrapNum(); if (scrapNum.compareTo(b) > 0) { - // 添加退料任务 ScrapApplyDetails scrapApplyDetails = new ScrapApplyDetails(); scrapApplyDetails.setTaskId(scrapTaskId); scrapApplyDetails.setTypeId(typeId); @@ -258,16 +258,14 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService } // 修饰审核通过时改修任务为已通过审核 - int i = 0; - int j = 0; - if (repairInputList != null){ - i = repairInputList.size(); - } - if (scrapNumList != null){ - j = scrapNumList.size(); - } - if (auditAllList.size() == (i + j)){ - task1.setTaskStatus(47); + if (auditDetailList != null){ + if (auditDetailList.size() == notAuditList.size()){ + task1.setTaskStatus(47); + } + }else if (auditAllList != null){ + if (auditAllList.size() == notAuditList.size()){ + task1.setTaskStatus(47); + } } task1.setUpdateTime(new Date()); task1.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); @@ -280,7 +278,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService }else { repairDetailList.addAll(auditAllList); } - if(repairDetailList != null && repairDetailList.size() > 0){ + if(repairDetailList.size() > 0){ if (repairDetailList.get(0).getCompanyId() != null){ companyId = repairDetailList.get(0).getCompanyId(); } @@ -309,8 +307,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService TmTask tmTask = new TmTask(); tmTask.setTaskId(taskId); tmTask.setRemark(scrapAudit.getRemark()); - int i = repairDetailList.size(); - if (auditAllList.size() == i){ + if (repairDetailList.size() == notAuditList.size()){ tmTask.setTaskStatus(48); } tmTask.setUpdateTime(new Date()); @@ -326,10 +323,12 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService } } }else { - for (RepairAuditDetails bean : auditAllList){ - bean.setAuditBy(SecurityUtils.getLoginUser().getUserid()); - bean.setStatus(status); - repairAuditDetailsMapper.updateStatus(bean); + if (auditAllList != null) { + for (RepairAuditDetails bean : auditAllList){ + bean.setAuditBy(SecurityUtils.getLoginUser().getUserid()); + bean.setStatus(status); + repairAuditDetailsMapper.updateStatus(bean); + } } } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml index 3f94bc10..d47aaf9a 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml @@ -295,7 +295,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dic.NAME taskStatusName, bui.unit_name unitName, bpl.lot_name projectName, - tk.create_by createBy, + su.user_name createBy, tk.create_time createTime, tk.remark, tk.CODE repairNum, @@ -324,6 +324,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt ON rad.type_id = mt.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id left join ma_machine mma on rad.ma_id= mma.ma_id + LEFT JOIN sys_user su ON su.user_id = tk.create_by WHERE tk.task_type = 45 @@ -382,5 +383,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from repair_apply_details where id = #{repairId} + \ No newline at end of file