巡检维修相关问题

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/controller/CmmsInspectController.java

@@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.util.ObjectUtil;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -23,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
 import org.jeecg.modules.cmmsInspectTcontentItem.service.ICmmsInspectTcontentItemService;
+import org.jeecg.modules.cmmsRepair.entity.IndexNum;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -251,4 +254,22 @@ public class CmmsInspectController extends JeecgController<CmmsInspect, ICmmsIns
 		page.setRecords(list);
 		return Result.ok(page);
 	}
+	
+	/**
+	*   author: dzc
+	*   version: 1.0
+	*   des: 首页待巡检数
+	*   date: 2024/2/27
+	*/
+	@AutoLog(value = "巡检工单-首页待巡检数")
+	@ApiOperation(value="巡检工单-首页待巡检数", notes="巡检工单-首页待巡检数")
+	//@RequiresPermissions("org.jeecg.modules:ems_cmms_repair:freeze")
+	@PostMapping(value = "/indexinspectnum")
+	public Result<IndexNum> IndexInspectNum() {
+		IndexNum indexNum = cmmsInspectService.IndexInspectNum();
+		if (ObjectUtil.isNotNull(indexNum)){
+			return Result.OK(indexNum);
+		}
+		return Result.error("操作失败！");
+	}
  }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/mapper/CmmsInspectMapper.java

@@ -44,4 +44,6 @@ public interface CmmsInspectMapper extends BaseMapper<CmmsInspect> {
     List<CmmsInspectPlanTaskVo> getTaskByPlanId(@Param("id") String id);
 
     List<CmmsInspectVo> getInspectByEqId(@Param("page") Page<CmmsInspectVo> page,@Param("cmmsInspect") CmmsInspectVo cmmsInspect);
+
+    List<Integer> getIndexNum();
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/mapper/xml/CmmsInspectMapper.xml

@@ -103,4 +103,10 @@
         ORDER BY t.create_time desc
     </select>
 
+    <select id="getIndexNum" resultType="java.lang.Integer">
+        select count(*) as totalnum from cmms_inspect where status in ('0')
+        union
+        select count(*) as todaynum from cmms_inspect where status in ('0') and date_format(create_time, '%Y-%m-%d')=date_format(now(), '%Y-%m-%d')
+    </select>
+
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/service/ICmmsInspectService.java

@@ -5,6 +5,7 @@ import org.jeecg.modules.cmmsInspect.entity.CmmsInspect;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.cmmsInspect.entity.CmmsInspectVo;
 import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlanVo;
+import org.jeecg.modules.cmmsRepair.entity.IndexNum;
 
 import java.util.List;
 
@@ -58,4 +59,13 @@ public interface ICmmsInspectService extends IService<CmmsInspect> {
     *   date: 2024/2/4
     */
     List<CmmsInspectVo> getInspectByEqId(Page<CmmsInspectVo> page,CmmsInspectVo cmmsInspect);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 首页待巡检数
+    *   date: 2024/2/27
+    */
+    IndexNum IndexInspectNum();
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/service/impl/CmmsInspectServiceImpl.java

@@ -15,6 +15,7 @@ import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlanVo;
 import org.jeecg.modules.cmmsInspectPlan.service.ICmmsInspectPlanService;
 import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTaskVo;
 import org.jeecg.modules.cmmsInspectSpot.service.ICmmsInspectSpotService;
+import org.jeecg.modules.cmmsRepair.entity.IndexNum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -44,7 +45,9 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
 
     @Override
     public List<CmmsInspectVo> getCmmsInspectList(Page<CmmsInspectVo> page, CmmsInspectVo cmmsInspect) {
+        //List<CmmsInspectVo> list = cmmsInspectMapper.getCmmsInspectList(page, cmmsInspect);
         return cmmsInspectMapper.getCmmsInspectList(page, cmmsInspect);
+
     }
 
     @Override
@@ -188,4 +191,13 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
     public List<CmmsInspectVo> getInspectByEqId(Page<CmmsInspectVo> page,CmmsInspectVo cmmsInspect) {
         return cmmsInspectMapper.getInspectByEqId(page,cmmsInspect);
     }
+
+    @Override
+    public IndexNum IndexInspectNum() {
+        List<Integer> list = cmmsInspectMapper.getIndexNum();
+        IndexNum indexNum = new IndexNum();
+        indexNum.setTodaynum(list.get(1));
+        indexNum.setTotalnum(list.get(0));
+        return indexNum;
+    }
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/controller/CmmsInspectTcontentItemController.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.cmmsRepair.entity.CmmsRepair;
+import org.jeecg.modules.cmmsRepair.entity.CmmsRepairVo;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -204,11 +205,11 @@ public class CmmsInspectTcontentItemController extends JeecgController<CmmsInspe
 	*   des: 异常项目查询 转报修
 	*   date: 2024/1/26
 	*/
-	@AutoLog(value = "巡检工单-异常项目查询-确认")
-	@ApiOperation(value="巡检工单-异常项目查询-确认", notes="巡检工单-异常项目查询-确认")
+	@AutoLog(value = "巡检工单-异常项目查询-转报修")
+	@ApiOperation(value="巡检工单-异常项目查询-转报修", notes="巡检工单-异常项目查询-转报修")
 	//@RequiresPermissions("org.jeecg.modules:cmms_inspect_tcontent_item:add")
 	@PostMapping(value = "/transrepair")
-	public Result<String> transrepair(@RequestBody CmmsRepair cmmsRepair, HttpServletRequest req) {
+	public Result<String> transrepair(@RequestBody CmmsRepairVo cmmsRepair, HttpServletRequest req) {
 		cmmsInspectTcontentItemService.transrepair(cmmsRepair,req);
 		return Result.OK("添加成功！");
 	}

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/entity/CmmsInspectTcontentItem.java

@@ -129,6 +129,7 @@ public class CmmsInspectTcontentItem implements Serializable {
 	/**异常状态：0待处理、1已确认、2已报修*/
 	@Excel(name = "异常状态：0待处理、1已确认、2已报修", width = 15)
     @ApiModelProperty(value = "异常状态：0待处理、1已确认、2已报修")
+    @Dict(dicCode = "abnormalItems_status")
     private java.lang.String unusualstatus;
 	/**确认事由*/
 	@Excel(name = "确认事由", width = 15)

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/mapper/CmmsInspectTcontentItemMapper.java

@@ -29,4 +29,8 @@ public interface CmmsInspectTcontentItemMapper extends BaseMapper<CmmsInspectTco
     int getCountIstatus(@Param("id") String id,@Param("inspectid") String inspectid);
 
     List<CmmsInspectTcontentItemVo> getItemList(Page<CmmsInspectTcontentItemVo> page, CmmsInspectTcontentItem cmmsInspectTcontentItem);
+
+    boolean updateStatusByInspectId(@Param("status") String status,@Param("inspectid") String inspectid);
+
+    List<CmmsInspectTcontentItem> getInspectItemByInspectId(String inspectid);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/mapper/xml/CmmsInspectTcontentItemMapper.xml

@@ -66,4 +66,12 @@
         where i.iresult = '1'
         order by i.itime desc
     </select>
+
+    <update id="updateStatusByInspectId" parameterType="java.lang.String">
+        update cmms_inspect set status = #{status} where id = #{inspectid}
+    </update>
+
+    <select id="getInspectItemByInspectId" parameterType="string" resultType="org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem">
+        select * from cmms_inspect_tcontent_item where inspectid = #{inspectid}
+    </select>
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/service/ICmmsInspectTcontentItemService.java

@@ -5,6 +5,7 @@ import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItem;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItemVo;
 import org.jeecg.modules.cmmsRepair.entity.CmmsRepair;
+import org.jeecg.modules.cmmsRepair.entity.CmmsRepairVo;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -56,7 +57,7 @@ public interface ICmmsInspectTcontentItemService extends IService<CmmsInspectTco
     *   des: 异常项目查询 转报修
     *   date: 2024/1/26
     */
-    boolean transrepair(CmmsRepair cmmsRepair, HttpServletRequest req);
+    boolean transrepair(CmmsRepairVo cmmsRepair, HttpServletRequest req);
 
     List<CmmsInspectTcontentItem> getInspectTcontentItemsById(String countId, String inspectId,String tasktype);
 

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectTcontentItem/service/impl/CmmsInspectTcontentItemServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.cmmsInspect.entity.CmmsInspect;
+import org.jeecg.modules.cmmsInspect.mapper.CmmsInspectMapper;
 import org.jeecg.modules.cmmsInspect.service.ICmmsInspectService;
 import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent;
 import org.jeecg.modules.cmmsInspectContent.service.ICmmsInspectContentService;
@@ -15,6 +16,7 @@ import org.jeecg.modules.cmmsInspectTcontentItem.entity.CmmsInspectTcontentItemV
 import org.jeecg.modules.cmmsInspectTcontentItem.mapper.CmmsInspectTcontentItemMapper;
 import org.jeecg.modules.cmmsInspectTcontentItem.service.ICmmsInspectTcontentItemService;
 import org.jeecg.modules.cmmsRepair.entity.CmmsRepair;
+import org.jeecg.modules.cmmsRepair.entity.CmmsRepairVo;
 import org.jeecg.modules.cmmsRepair.service.ICmmsRepairService;
 import org.jeecg.modules.tpmEquipment.entity.TpmEquipment;
 import org.jeecg.modules.tpmEquipment.service.ITpmEquipmentService;
@@ -79,7 +81,24 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
             inspectTcontentItemList.get(i).setHandleuser(userName);
             inspectTcontentItemList.get(i).setItime(DateUtils.getDate());
         }
-        return this.updateBatchById(inspectTcontentItemList);
+
+        boolean b = this.updateBatchById(inspectTcontentItemList);
+        if (b){
+           mapper.updateStatusByInspectId("1",inspectTcontentItemList.get(0).getInspectid());
+        }
+        // 查询该工单所对应的巡检项是否已经全部完成反馈，若已经全部完成反馈则，修改工单的状态
+        List<CmmsInspectTcontentItem> list = mapper.getInspectItemByInspectId(inspectTcontentItemList.get(0).getInspectid());
+        boolean flag = true;
+        for (CmmsInspectTcontentItem item : list) {
+            if ("0".equals(item.getIstatus())){
+                flag = false;
+                break;
+            }
+        }
+        if (flag) {
+            mapper.updateStatusByInspectId("2",inspectTcontentItemList.get(0).getInspectid());
+        }
+        return b;
     }
 
     @Override
@@ -110,9 +129,10 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
     }
 
     @Override
-    public boolean transrepair(CmmsRepair cmmsRepair, HttpServletRequest req) {
+    public boolean transrepair(CmmsRepairVo cmmsRepair, HttpServletRequest req) {
         String userName = JwtUtil.getUserNameByToken(req);
         CmmsInspectTcontentItem inspectTcontentItem = new CmmsInspectTcontentItem();
+        inspectTcontentItem.setId(cmmsRepair.getRelid());
         inspectTcontentItem.setUnusualstatus("2");
         inspectTcontentItem.setReportuser(userName);
         inspectTcontentItem.setReporttime(DateUtils.getDate());
@@ -126,7 +146,7 @@ public class CmmsInspectTcontentItemServiceImpl extends ServiceImpl<CmmsInspectT
             cmmsRepair.setRepairstatus("0");
         }
 
-        boolean b1 = repairService.save(cmmsRepair);
+        boolean b1 = repairService.addCmmsRepair(cmmsRepair);
         boolean b2 = this.updateById(inspectTcontentItem);
         return b1 && b2;
     }

module_cmms/src/main/java/org/jeecg/modules/cmmsOrderNode/entity/CmmsOrderNode.java

@@ -59,7 +59,6 @@ public class CmmsOrderNode implements Serializable {
 	/**操作节点名称*/
 	@Excel(name = "操作节点名称", width = 15)
     @ApiModelProperty(value = "操作节点名称")
-    @Dict(dicCode = "repair_order_status")
     private java.lang.String nodename;
 	/**工单ID*/
 	@Excel(name = "工单ID", width = 15)

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/controller/CmmsRepairController.java

@@ -10,6 +10,7 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.util.ObjectUtil;
 import lombok.extern.java.Log;
 import org.apache.ibatis.annotations.Param;
 import org.apache.shiro.SecurityUtils;
@@ -22,6 +23,7 @@ import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.cmmsRepair.entity.CmmsRepair;
 import org.jeecg.modules.cmmsRepair.entity.CmmsRepairVo;
+import org.jeecg.modules.cmmsRepair.entity.IndexNum;
 import org.jeecg.modules.cmmsRepair.service.ICmmsRepairService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -244,6 +246,23 @@ public class CmmsRepairController extends JeecgController<CmmsRepair, ICmmsRepai
 		 return Result.error("操作失败！");
 	 }
 
+	 /**
+	 *   author: dzc
+	 *   version: 1.0
+	 *   des: 首页待维修数
+	 *   date: 2024/2/27
+	 */
+	 @AutoLog(value = "维修工单-首页待维修数")
+	 @ApiOperation(value="维修工单-首页待维修数", notes="维修工单-首页待维修数")
+	 //@RequiresPermissions("org.jeecg.modules:ems_cmms_repair:freeze")
+	 @PostMapping(value = "/indexrepairnum")
+	 public Result<IndexNum> IndexRepairNum() {
+		 IndexNum indexNum = cmmsRepairService.IndexRepairNum();
+		 if (ObjectUtil.isNotNull(indexNum)){
+			 return Result.OK(indexNum);
+		 }
+		 return Result.error("操作失败！");
+	 }
 
 
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/entity/IndexNum.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.cmmsRepair.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author dzc
+ * @date 2024/2/27 14:14
+ * @package org.jeecg.modules.cmmsRepair.entity
+ * @project EMS_server
+ * @des
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class IndexNum {
+    /** 今日数 */
+    private Integer todaynum;
+    /** 总数 */
+    private Integer totalnum;
+}

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/mapper/CmmsRepairMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cmmsRepair.entity.CmmsRepair;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsRepair.entity.IndexNum;
 
 /**
  * @Description: 维修工单
@@ -20,4 +21,7 @@ public interface CmmsRepairMapper extends BaseMapper<CmmsRepair> {
     int updateCmmsRepair(CmmsRepair cmmsRepair);
 
     int updateRepairStatus(@Param("id") String id,@Param("repairstatus") String repairstatus);
+
+    List<Integer> getIndexRepairNum();
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/mapper/xml/CmmsRepairMapper.xml

@@ -52,6 +52,7 @@
         order by id desc
     </select>
 
+
     <!--    根据Id修改客户列表-->
     <update id="updateCmmsRepair" parameterType="org.jeecg.modules.cmmsRepair.entity.CmmsRepair">
         update cmms_repair
@@ -82,4 +83,10 @@
         update cmms_repair set repairstatus = #{repairstatus} where id = #{id}
     </update>
 
+
+    <select id="getIndexRepairNum" resultType="integer">
+        select count(*) as totalnum from cmms_repair where status in ('0')
+        union
+        select count(*) as todaynum from cmms_repair where status in ('0') and date_format(create_time, '%Y-%m-%d')=date_format(now(), '%Y-%m-%d')
+    </select>
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/service/ICmmsRepairService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.jeecg.modules.cmmsRepair.entity.CmmsRepair;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.cmmsRepair.entity.CmmsRepairVo;
+import org.jeecg.modules.cmmsRepair.entity.IndexNum;
 
 import java.util.List;
 
@@ -54,4 +55,13 @@ public interface ICmmsRepairService extends IService<CmmsRepair> {
     *   date: 2024/1/10
     */
     int updateRepairStatus(CmmsRepair cmmsRepair);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 首页待维修数
+    *   date: 2024/2/27
+    */
+    IndexNum IndexRepairNum();
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsRepair/service/impl/CmmsRepairServiceImpl.java

@@ -11,6 +11,7 @@ import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
 import org.jeecg.modules.cmmsOrderNode.service.ICmmsOrderNodeService;
 import org.jeecg.modules.cmmsRepair.entity.CmmsRepair;
 import org.jeecg.modules.cmmsRepair.entity.CmmsRepairVo;
+import org.jeecg.modules.cmmsRepair.entity.IndexNum;
 import org.jeecg.modules.cmmsRepair.mapper.CmmsRepairMapper;
 import org.jeecg.modules.cmmsRepair.service.ICmmsRepairService;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
@@ -159,4 +160,13 @@ public class CmmsRepairServiceImpl extends ServiceImpl<CmmsRepairMapper, CmmsRep
     public int updateRepairStatus(CmmsRepair cmmsRepair) {
         return cmmsRepairMapper.updateRepairStatus(cmmsRepair.getId(),cmmsRepair.getRepairstatus());
     }
+
+    @Override
+    public IndexNum IndexRepairNum() {
+        List<Integer> list = cmmsRepairMapper.getIndexRepairNum();
+        IndexNum indexNum = new IndexNum();
+        indexNum.setTodaynum(list.get(1));
+        indexNum.setTotalnum(list.get(0));
+        return indexNum;
+    }
 }