Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/controller/CmmsSubmissionEquipmentController.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.cmmsSubmissionEquipment.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sun.org.apache.regexp.internal.RE;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -24,6 +25,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -41,6 +43,14 @@ public class CmmsSubmissionEquipmentController extends JeecgController<CmmsSubmi
 	private ICmmsSubmissionEquipmentService cmmsSubmissionEquipmentService;
 	 @Autowired
 	 private ITpmEquipmentService equipmentService;
+	/**
+	 * 根据设备id查询该所有工单所有检测时间、检测结果、有效时间
+	 * */
+	@ApiOperation(value="根据设备id查询该所有工单所有检测时间、检测结果、有效时间", notes="根据设备id查询该所有工单所有检测时间、检测结果、有效时间")
+	@GetMapping(value = "/jclistByEquipmentId")
+	public List<CmmsSubmissionEquipment> getSubmissionEquipmentByEquipmentId(String equipmentId){
+		return cmmsSubmissionEquipmentService.getSubmissionEquipmentByEquipmentId(equipmentId);
+	}
 
 	/**
 	 * 分页列表查询

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/mapper/CmmsSubmissionEquipmentMapper.java

@@ -40,8 +40,8 @@ public interface CmmsSubmissionEquipmentMapper extends BaseMapper<CmmsSubmission
     /**
      * 根据设备id查询该所有工单所有检测时间、检测结果、有效时间
      * */
-    @Select("select id,submissionDate,submissionResult,submissionEffectiveDate " +
+    @Select("select id,submission_date,submission_result,submission_effective_date " +
             "from cmms_submission_equipment " +
-            "order by submissionDate desc")
+            "order by submission_date desc")
     List<CmmsSubmissionEquipment> getSubmissionEquipmentByEquipmentId(String equipmentId);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/service/ICmmsSubmissionEquipmentService.java

@@ -14,6 +14,11 @@ import java.util.List;
 public interface ICmmsSubmissionEquipmentService extends IService<CmmsSubmissionEquipment> {
 
     /**
+     * 根据设备id查询该所有工单所有检测时间、检测结果、有效时间
+     * */
+    List<CmmsSubmissionEquipment> getSubmissionEquipmentByEquipmentId(String equipmentId);
+
+    /**
      * 根据送检工单id查询该工单送检设备总数
      * */
     public Integer totalNum(String cmmsSubmissionId);

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/service/impl/CmmsSubmissionEquipmentServiceImpl.java

@@ -24,6 +24,13 @@ public class CmmsSubmissionEquipmentServiceImpl extends ServiceImpl<CmmsSubmissi
     @SuppressWarnings("all")
     private CmmsSubmissionEquipmentMapper submissionEquipmentMapper;
 
+    /**
+     * 根据设备id查询该所有工单所有检测时间、检测结果、有效时间
+     * */
+    public List<CmmsSubmissionEquipment> getSubmissionEquipmentByEquipmentId(String equipmentId){
+        return submissionEquipmentMapper.getSubmissionEquipmentByEquipmentId(equipmentId);
+    }
+
 
     /**
      * 根据送检工单id查询该工单送检设备总数

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/entity/CmmsUpkeepDto.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.cmmsUpkeep.entity;
 
 import lombok.Data;
 import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
+import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItem;
+import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItemDto;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 
 import java.util.List;
@@ -27,4 +29,14 @@ public class CmmsUpkeepDto extends CmmsUpkeep{
      * 图片
      */
     private List<SysUploadFile> files;
+
+    /**
+     * 设备id
+     */
+    private String equipmentid;
+
+    /**
+     * 保养项信息
+     */
+    private List<CmmsUpkeepItemDto> cmmsUpkeepItemList;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/service/impl/CmmsUpkeepServiceImpl.java

@@ -7,6 +7,9 @@ import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
 import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepDto;
 import org.jeecg.modules.cmmsUpkeep.mapper.CmmsUpkeepMapper;
 import org.jeecg.modules.cmmsUpkeep.service.ICmmsUpkeepService;
+import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan;
+import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlanDto;
+import org.jeecg.modules.cmmsUpkeepPlan.service.ICmmsUpkeepPlanService;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 import org.jeecg.modules.sysUploadFile.service.ISysUploadFileService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +38,10 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
 
     @Autowired
     @SuppressWarnings("all")
+    private ICmmsUpkeepPlanService cmmsUpkeepPlanService;
+
+    @Autowired
+    @SuppressWarnings("all")
     private ICmmsOrderNodeService cmmsOrderNodeService;
 
     @Autowired
@@ -42,7 +49,7 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
     private ISysUploadFileService sysUploadFileService;
 
     /**
-     * 通过id查询保养工单
+     * 通过id查询保养工单详情
      *
      * @param id 保养工单主键
      * @return 保养工单
@@ -50,7 +57,7 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
     public CmmsUpkeepDto selectCmmsUpkeepById(String id)
     {
         CmmsUpkeepDto cmmsUpkeepDto = new CmmsUpkeepDto();
-        cmmsUpkeepDto.setId(id);
+        cmmsUpkeepDto.setId(id);//保养工单id
         // 保养工单
         CmmsUpkeep cmmsUpkeep = this.getById(id);
         cmmsUpkeepDto.setCreateBy(cmmsUpkeep.getCreateBy());
@@ -74,6 +81,10 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
         cmmsUpkeepDto.setStatus(cmmsUpkeep.getStatus());
         cmmsUpkeepDto.setOpinion(cmmsUpkeep.getOpinion());
 
+        //通过计划id查询保养计划以及保养计划-保养项
+        CmmsUpkeepPlanDto cmmsUpkeepPlanDto = cmmsUpkeepPlanService.getCmmsUpkeepPlanById(cmmsUpkeepDto.getUpkeepplanid());
+        cmmsUpkeepDto.setEquipmentid(cmmsUpkeepPlanDto.getEquipmentid());
+        cmmsUpkeepDto.setCmmsUpkeepItemList(cmmsUpkeepPlanDto.getCmmsUpkeepItemDtoList());
 
         // 保养操作记录
         CmmsOrderNode node = new CmmsOrderNode();
@@ -179,13 +190,15 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
         cmmsUpkeep.setOpinion(cmmsUpkeepDto.getOpinion());
 
         // 附件
-        sysUploadFileService.batchSave(cmmsUpkeepDto.getFiles(), cmmsUpkeepDto.getId(), "");
+        if(cmmsUpkeepDto.getFiles()!=null && cmmsUpkeepDto.getFiles().size()>0) sysUploadFileService.batchSave(cmmsUpkeepDto.getFiles(), cmmsUpkeepDto.getId(), "");//增加附件
 
         //需要增加的工单操作记录
         CmmsOrderNode node = cmmsUpkeepDto.getNodeList().get(0);
+        node.setId(IdWorker.getIdStr());
 //        node.setNodename(String.valueOf(Integer.parseInt(node.getNodename())+1));
         node.setRelid(cmmsUpkeepDto.getId());
         node.setHandledate(new Date());
+        node.setOpinion(cmmsUpkeepDto.getOpinion());
         cmmsOrderNodeService.save(node);
 
         return this.updateById(cmmsUpkeep);

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/mapper/xml/CmmsUpkeepPlanMapper.xml

@@ -98,16 +98,17 @@
 
     <!--修改下次生成工单时间及通知信息-->
     <update id="updateCmmsUpkeepCreateNoticeByIds" parameterType="org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan">
-        <foreach item="item" collection="cmmsUpkeepPlanList" index="index" open="(" separator="," close=")">
+        <foreach item="item" collection="cmmsUpkeepPlanList">
             update cmms_upkeep_plan set nexttime = #{item.nexttime}, ifnotice = #{item.ifnotice}, noticetime = #{item.noticetime}
             where id=#{item.id};
         </foreach>
     </update>
 
     <!--修改是否已发送通知信息-->
-    <update id="updateCmmsUpkeepPlanIfnoticeByIds" parameterType="org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan">
+    <update id="updateCmmsUpkeepPlanIfnoticeByIds">
         <foreach item="item" collection="cmmsUpkeepPlanList">
-            update cmms_upkeep_plan set ifnotice = #{item.ifnotice} where id=#{item.id}
+            update cmms_upkeep_plan set ifnotice = #{item.ifnotice}
+            where id=#{item.id};
         </foreach>
     </update>
 

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/service/impl/CmmsUpkeepPlanServiceImpl.java

@@ -128,6 +128,7 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
      */
     public boolean insertCmmsUpkeepPlan(CmmsUpkeepPlanDto cmmsUpkeepPlanDto)
     {
+        System.out.println(cmmsUpkeepPlanDto);
         //一、更新保养计划表
         //新建一个保养计划实例
         CmmsUpkeepPlan cmmsUpkeepPlan = new CmmsUpkeepPlan();
@@ -241,9 +242,7 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
      *
      */
     public boolean updateCmmsUpkeepCreateNoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList){
-        boolean rtn = cmmsUpkeepPlanMapper.updateCmmsUpkeepCreateNoticeByIds(cmmsUpkeepPlanList);
-        setRedisCache();
-        return rtn;
+        return cmmsUpkeepPlanMapper.updateCmmsUpkeepCreateNoticeByIds(cmmsUpkeepPlanList);
     }
 
 
@@ -252,9 +251,7 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
      *
      */
     public boolean updateCmmsUpkeepPlanIfnoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList){
-        boolean rtn = cmmsUpkeepPlanMapper.updateCmmsUpkeepPlanIfnoticeByIds(cmmsUpkeepPlanList);
-        setRedisCache();
-        return rtn;
+        return cmmsUpkeepPlanMapper.updateCmmsUpkeepPlanIfnoticeByIds(cmmsUpkeepPlanList);
     }
 
     /**