维修审核驳回修改

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<SysNotice> 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);
+    }
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/SysNoticeMapper.java

@@ -17,4 +17,6 @@ public interface SysNoticeMapper {
      * @return
      */
     List<SysNotice> getList(String keyword);
+
+    SysNotice getById(Long noticeId);
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/SysNoticeService.java

@@ -15,4 +15,6 @@ public interface SysNoticeService {
      * @return
      */
     List<SysNotice> getList(String keyword);
+
+    SysNotice getById(Long noticeId);
 }

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;
+    }
 }

sgzb-modules/sgzb-base/src/main/resources/mapper/app/SysNoticeMapper.xml

@@ -21,4 +21,18 @@
         </if>
         order by create_time desc
     </select>
+    <select id="getById" resultType="com.bonus.sgzb.app.domain.SysNotice">
+        select notice_id as noticeId,
+               notice_title as noticeTitle,
+               notice_type as noticeType,
+               notice_content as noticeContent,
+               status as status,
+               create_by as createBy,
+               create_time as createTime,
+               update_by as updateBy,
+               update_time as updateTime,
+               remark as remark
+        from sys_notice
+        where status = '0' and notice_id = #{noticeId}
+    </select>
 </mapper>

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<RepairAuditDetails> selectnotAuditByTaskId(Long taskId);
 }

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<RepairAuditDetails> auditAllList = repairAuditDetailsMapper.selectRepairAuditDetailsByTaskId(taskId);
+            List<RepairAuditDetails> 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;
+                if (auditDetailList != null){
-                int j = 0;
+                    if (auditDetailList.size() == notAuditList.size()){
-                if (repairInputList != null){
+                        task1.setTaskStatus(47);
-                    i = repairInputList.size();
+                    }
-                }
+                }else if (auditAllList != null){
-                if (scrapNumList != null){
+                    if (auditAllList.size() == notAuditList.size()){
-                    j = scrapNumList.size();
+                        task1.setTaskStatus(47);
-                }
+                    }
-                if (auditAllList.size() == (i + j)){
-                    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 (repairDetailList.size() == notAuditList.size()){
-                if (auditAllList.size() == i){
                     tmTask.setTaskStatus(48);
                 }
                 tmTask.setUpdateTime(new Date());
@@ -326,10 +323,12 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
                     }
                 }
             }else {
-                for (RepairAuditDetails bean : auditAllList){
+                if (auditAllList != null) {
-                    bean.setAuditBy(SecurityUtils.getLoginUser().getUserid());
+                    for (RepairAuditDetails bean : auditAllList){
-                    bean.setStatus(status);
+                        bean.setAuditBy(SecurityUtils.getLoginUser().getUserid());
-                    repairAuditDetailsMapper.updateStatus(bean);
+                        bean.setStatus(status);
+                        repairAuditDetailsMapper.updateStatus(bean);
+                    }
                 }
             }
         }

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
         <if test="keyword != null and keyword != ''">
@@ -382,5 +383,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from repair_apply_details
         where id = #{repairId}
     </select>
+    <select id="selectnotAuditByTaskId" resultType="com.bonus.sgzb.material.domain.RepairAuditDetails">
+        <include refid="selectRepairAuditDetailsVo"/>
+        where task_id = #{taskId} and rd.STATUS = '0'
+    </select>
 
 </mapper>