Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/controller/CmmsUpkeepController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.cmmsUpkeep.controller;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -21,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlanDto;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -54,33 +56,45 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 	 /**
 	  * 查询保养工单列表-我的代办
 	  *
-	  * @param cmmsUpkeep 保养工单
+	  * @param cmmsUpkeepDto 保养工单
 	  * @return 保养工单集合
 	  */
 	 //@AutoLog(value = "查询保养工单列表-我的代办")
 	 @ApiOperation(value="查询保养工单列表-我的代办", notes="查询保养工单列表-我的代办")
 	 @GetMapping(value = "/selectMyChargeList")
-	 public Result<List<CmmsUpkeep>> selectMyChargeList(CmmsUpkeep cmmsUpkeep) {
-		 return Result.OK(cmmsUpkeepService.selectMyChargeList(cmmsUpkeep));
+	 public Result<IPage<CmmsUpkeepDto>> selectMyChargeList(CmmsUpkeepDto cmmsUpkeepDto,
+															@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+															@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+															HttpServletRequest req) {
+		 Page<CmmsUpkeepDto> page = new Page<CmmsUpkeepDto>(pageNo, pageSize);
+		 List<CmmsUpkeepDto> pageList = cmmsUpkeepService.selectMyChargeList(page, cmmsUpkeepDto);
+		 page.setRecords(pageList);
+		 return Result.OK(page);
 	 }
 
 	 /**
 	  * 查询保养工单列表-我的相关
 	  *
-	  * @param cmmsUpkeep 保养工单
+	  * @param cmmsUpkeepDto 保养工单
 	  * @return 保养工单集合
 	  */
 	 //@AutoLog(value = "查询保养工单列表-我的相关")
 	 @ApiOperation(value="查询保养工单列表-我的相关", notes="查询保养工单列表-我的相关")
 	 @GetMapping(value = "/selectMyRelateList")
-	 public Result<List<CmmsUpkeep>> selectMyRelateList(CmmsUpkeep cmmsUpkeep) {
-		 return Result.OK(cmmsUpkeepService.selectMyRelateList(cmmsUpkeep));
+	 public Result<IPage<CmmsUpkeepDto>> selectMyRelateList(CmmsUpkeepDto cmmsUpkeepDto,
+													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													   HttpServletRequest req) {
+		 Page<CmmsUpkeepDto> page = new Page<CmmsUpkeepDto>(pageNo, pageSize);
+		 List<CmmsUpkeepDto> pageList = cmmsUpkeepService.selectMyRelateList(page, cmmsUpkeepDto);
+		 page.setRecords(pageList);
+		 return Result.OK(page);
 	 }
 
 	/**
 	 * 分页列表查询
 	 *
-	 * @param cmmsUpkeep
+	 * @param cmmsUpkeepDto
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
@@ -89,14 +103,27 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 	//@AutoLog(value = "保养工单-分页列表查询")
 	@ApiOperation(value="保养工单-分页列表查询", notes="保养工单-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CmmsUpkeep>> queryPageList(CmmsUpkeep cmmsUpkeep,
+	public Result<IPage<CmmsUpkeepDto>> queryPageList(CmmsUpkeepDto cmmsUpkeepDto,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<CmmsUpkeep> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeep, req.getParameterMap());
-		Page<CmmsUpkeep> page = new Page<CmmsUpkeep>(pageNo, pageSize);
-		IPage<CmmsUpkeep> pageList = cmmsUpkeepService.page(page, queryWrapper);
-		return Result.OK(pageList);
+//		QueryWrapper<CmmsUpkeep> queryWrapper = QueryGenerator.initQueryWrapper(cmmsUpkeep, req.getParameterMap());
+		Page<CmmsUpkeepDto> page = new Page<CmmsUpkeepDto>(pageNo, pageSize);
+//		IPage<CmmsUpkeep> pageList = cmmsUpkeepService.page(page, queryWrapper);
+		List<CmmsUpkeepDto> pageList = new ArrayList<>();
+		//0我的相关  1我的代办
+		if(cmmsUpkeepDto.getCmmsUpkeepType()!=null && cmmsUpkeepDto.getCmmsUpkeepType().equals("0")){
+			System.out.println("0");
+			pageList = cmmsUpkeepService.selectMyRelateList(page, cmmsUpkeepDto);
+		}else if(cmmsUpkeepDto.getCmmsUpkeepType()!=null && cmmsUpkeepDto.getCmmsUpkeepType().equals("1")){
+			System.out.println("1");
+			pageList = cmmsUpkeepService.selectMyChargeList(page, cmmsUpkeepDto);
+		}else{
+			System.out.println("默认");
+			pageList = cmmsUpkeepService.selectMyRelateList(page, cmmsUpkeepDto);
+		}
+		page.setRecords(pageList);
+		return Result.OK(page);
 	}
 
 	/**

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

@@ -109,9 +109,10 @@ public class CmmsUpkeep implements Serializable {
 //	@Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")
     private java.lang.String upkeepdesc;
-	/**状态：0待处理、1已通知、2未执行、3未完成、4已完成*/
-	@Excel(name = "状态：0待处理、1已通知、2未执行、3未完成、4已完成", width = 15)
-    @ApiModelProperty(value = "状态：0待处理、1已通知、2未执行、3未完成、4已完成")
+	/**状态：未执行0，未完成1，已完成2*/
+	@Excel(name = "状态：未执行0，未完成1，已完成2", width = 15)
+    @Dict(dicCode = "upkeep_state")
+    @ApiModelProperty(value = "状态：未执行0，未完成1，已完成2")
     private java.lang.String status;
 	/**处理意见*/
 //	@Excel(name = "处理意见", width = 15)

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.cmmsUpkeep.entity;
 
 import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
 import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItem;
 import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItemDto;
@@ -39,4 +40,10 @@ public class CmmsUpkeepDto extends CmmsUpkeep{
      * 保养项信息
      */
     private List<CmmsUpkeepItemDto> cmmsUpkeepItemList;
+
+    /**
+     * 0我的相关，1我的待办
+     */
+    @Dict(dicCode = "upkeep_type")
+    private String cmmsUpkeepType;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/CmmsUpkeepMapper.java

@@ -2,9 +2,12 @@ package org.jeecg.modules.cmmsUpkeep.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepDto;
+import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlanDto;
 
 /**
  * @Description: 保养工单
@@ -17,18 +20,18 @@ public interface CmmsUpkeepMapper extends BaseMapper<CmmsUpkeep> {
     /**
      * 查询保养工单列表-我的代办
      *
-     * @param cmmsUpkeep 保养工单
+     * @param cmmsUpkeepDto 保养工单
      * @return 保养工单集合
      */
-    public List<CmmsUpkeep> selectMyChargeList(@Param("cmmsUpkeep") CmmsUpkeep cmmsUpkeep);
+    public List<CmmsUpkeepDto> selectMyChargeList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
 
     /**
      * 查询保养工单列表-我的相关
      *
-     * @param cmmsUpkeep 保养工单
+     * @param cmmsUpkeepDto 保养工单
      * @return 保养工单集合
      */
-    public List<CmmsUpkeep> selectMyRelateList(@Param("cmmsUpkeep") CmmsUpkeep cmmsUpkeep);
+    public List<CmmsUpkeepDto> selectMyRelateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
 
 
 

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/xml/CmmsUpkeepMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.cmmsUpkeep.mapper.CmmsUpkeepMapper">
 
-    <resultMap type="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep" id="CmmsUpkeepResult">
+    <resultMap type="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepDto" id="CmmsUpkeepResult">
         <result property="id"    column="id"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -24,37 +24,42 @@
         <result property="upkeepdesc"    column="upkeepdesc"    />
         <result property="status"    column="status"    />
         <result property="opinion"    column="opinion"    />
+        <result property="equipmentid"    column="equipmentid"    />
     </resultMap>
 
     <!-- 查询我的代办 -->
-    <select id="selectMyChargeList" parameterType="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep" resultMap="CmmsUpkeepResult">
+    <select id="selectMyChargeList" parameterType="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepDto" resultMap="CmmsUpkeepResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark, c.upkeepcode,
         c.upkeepplanid, c.upkeepprojid, c.projectname, c.planname, c.address, c.supplier, c.suppliertel,
-        c.linker, c.linkertel, c.chargeruser, c.upkeepname, c.upkeepdesc, c.status, c.opinion
-        from cmms_upkeep as c
+        c.linker, c.linkertel, c.chargeruser, c.upkeepname, c.upkeepdesc, c.status, c.opinion, p.equipmentid
+        from cmms_upkeep as c left join cmms_upkeep_plan as p on p.id=c.upkeepplanid
         <where>
-            <if test="cmmsUpkeep.upkeepcode != null and cmmsUpkeep.upkeepcode != ''"> and c.upkeepcode like concat('%', #{cmmsUpkeep.upkeepcode}, '%')</if>
-            <if test="cmmsUpkeep.upkeepname != null and cmmsUpkeep.upkeepname != ''"> and c.upkeepname like concat('%', #{cmmsUpkeep.upkeepname}, '%')</if>
-            <if test="cmmsUpkeep.chargeruser != null and cmmsUpkeep.chargeruser != ''"> and concat(chargeruser,',') like concat('%', #{cmmsUpkeep.chargeruser}, ',%')</if>
-            <if test="cmmsUpkeep.status != null and cmmsUpkeep.status != ''"> and status = #{cmmsUpkeep.status}</if>
-            <if test="cmmsUpkeep.status == null or cmmsUpkeep.status == ''"> and status in ('0','1')</if>
+            <if test="cmmsUpkeepDto.upkeepcode != null and cmmsUpkeepDto.upkeepcode != ''"> and c.upkeepcode like concat('%', #{cmmsUpkeepDto.upkeepcode}, '%')</if>
+            <if test="cmmsUpkeepDto.planname != null and cmmsUpkeepDto.planname != ''"> and c.planname like concat('%', #{cmmsUpkeepDto.planname}, '%')</if>
+            <if test="cmmsUpkeepDto.address != null and cmmsUpkeepDto.address != ''"> and c.address = #{cmmsUpkeepDto.address}</if>
+            <if test="cmmsUpkeepDto.chargeruser != null and cmmsUpkeepDto.chargeruser != ''"> and c.chargeruser = #{cmmsUpkeepDto.chargeruser}</if>
+            <if test="cmmsUpkeepDto.equipmentid != null and cmmsUpkeepDto.equipmentid != ''"> and p.equipmentid = #{cmmsUpkeepDto.equipmentid}</if>
+            <if test="cmmsUpkeepDto.status != null and cmmsUpkeepDto.status != ''"> and c.status = #{cmmsUpkeepDto.status}</if>
+            <if test="cmmsUpkeepDto.status == null or cmmsUpkeepDto.status == ''"> and c.status in ('0','1')</if>
         </where>
         order by c.create_time desc
     </select>
 
     <!-- 查询我的相关 -->
-    <select id="selectMyRelateList" parameterType="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep" resultMap="CmmsUpkeepResult">
+    <select id="selectMyRelateList" parameterType="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepDto" resultMap="CmmsUpkeepResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark, c.upkeepcode,
         c.upkeepplanid, c.upkeepprojid, c.projectname, c.planname, c.address, c.supplier, c.suppliertel,
-        c.linker, c.linkertel, c.chargeruser, c.upkeepname, c.upkeepdesc, c.status, c.opinion
-        from cmms_upkeep as c
+        c.linker, c.linkertel, c.chargeruser, c.upkeepname, c.upkeepdesc, c.status, c.opinion, p.equipmentid
+        from cmms_upkeep as c left join cmms_upkeep_plan as p on p.id=c.upkeepplanid
         <where>
-            <if test="cmmsUpkeep.upkeepcode != null and cmmsUpkeep.upkeepcode != ''"> and c.upkeepcode like concat('%', #{cmmsUpkeep.upkeepcode}, '%')</if>
-            <if test="cmmsUpkeep.upkeepname != null and cmmsUpkeep.upkeepname != ''"> and c.upkeepname like concat('%', #{cmmsUpkeep.upkeepname}, '%')</if>
-            <if test="cmmsUpkeep.chargeruser != null and cmmsUpkeep.chargeruser != ''"> and (concat(c.chargeruser,',') like concat('%', #{cmmsUpkeep.chargeruser}, ',%') or exists (select nodeid from cmms_order_node where relid=c.upkeepid and create_by=#{cmmsUpkeep.chargeruser}))</if>
-            <if test="cmmsUpkeep.status != null and cmmsUpkeep.status != ''"> and c.status = #{cmmsUpkeep.status}</if>
+            <if test="cmmsUpkeepDto.upkeepcode != null and cmmsUpkeepDto.upkeepcode != ''"> and c.upkeepcode like concat('%', #{cmmsUpkeepDto.upkeepcode}, '%')</if>
+            <if test="cmmsUpkeepDto.planname != null and cmmsUpkeepDto.planname != ''"> and c.planname like concat('%', #{cmmsUpkeepDto.planname}, '%')</if>
+            <if test="cmmsUpkeepDto.address != null and cmmsUpkeepDto.address != ''"> and c.address = #{cmmsUpkeepDto.address}</if>
+            <if test="cmmsUpkeepDto.chargeruser != null and cmmsUpkeepDto.chargeruser != ''"> and c.chargeruser = #{cmmsUpkeepDto.chargeruser}</if>
+            <if test="cmmsUpkeepDto.equipmentid != null and cmmsUpkeepDto.equipmentid != ''"> and p.equipmentid = #{cmmsUpkeepDto.equipmentid}</if>
+            <if test="cmmsUpkeepDto.status != null and cmmsUpkeepDto.status != ''"> and c.status = #{cmmsUpkeepDto.status}</if>
         </where>
-        from cmms_upkeep as c
+        order by c.create_time desc
     </select>
 
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/service/ICmmsUpkeepService.java

@@ -1,8 +1,10 @@
 package org.jeecg.modules.cmmsUpkeep.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepDto;
+import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlanDto;
 
 import java.util.List;
 
@@ -25,18 +27,18 @@ public interface ICmmsUpkeepService extends IService<CmmsUpkeep> {
     /**
      * 查询保养工单列表-我的代办
      *
-     * @param cmmsUpkeep 保养工单
+     * @param cmmsUpkeepDto 保养工单
      * @return 保养工单集合
      */
-    public List<CmmsUpkeep> selectMyChargeList(CmmsUpkeep cmmsUpkeep);
+    public List<CmmsUpkeepDto> selectMyChargeList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
 
     /**
      * 查询保养工单列表-我的相关
      *
-     * @param cmmsUpkeep 保养工单
+     * @param cmmsUpkeepDto 保养工单
      * @return 保养工单集合
      */
-    public List<CmmsUpkeep> selectMyRelateList(CmmsUpkeep cmmsUpkeep);
+    public List<CmmsUpkeepDto> selectMyRelateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
 
     /**
      * 新增保养工单

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.cmmsUpkeep.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
 import org.jeecg.modules.cmmsOrderNode.service.ICmmsOrderNodeService;
 import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
@@ -102,21 +103,21 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
     /**
      * 查询保养工单列表-我的代办
      *
-     * @param cmmsUpkeep 保养工单
+     * @param cmmsUpkeepDto 保养工单
      * @return 保养工单集合
      */
-    public List<CmmsUpkeep> selectMyChargeList(CmmsUpkeep cmmsUpkeep){
-        return cmmsUpkeepMapper.selectMyChargeList(cmmsUpkeep);
+    public List<CmmsUpkeepDto> selectMyChargeList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto){
+        return cmmsUpkeepMapper.selectMyChargeList(page, cmmsUpkeepDto);
     }
 
     /**
      * 查询保养工单列表-我的相关
      *
-     * @param cmmsUpkeep 保养工单
+     * @param cmmsUpkeepDto 保养工单
      * @return 保养工单集合
      */
-    public List<CmmsUpkeep> selectMyRelateList(CmmsUpkeep cmmsUpkeep){
-        return cmmsUpkeepMapper.selectMyRelateList(cmmsUpkeep);
+    public List<CmmsUpkeepDto> selectMyRelateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto){
+        return cmmsUpkeepMapper.selectMyRelateList(page, cmmsUpkeepDto);
     }
 
     /**
@@ -190,7 +191,10 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
         cmmsUpkeep.setOpinion(cmmsUpkeepDto.getOpinion());
 
         // 附件
-        if(cmmsUpkeepDto.getFiles()!=null && cmmsUpkeepDto.getFiles().size()>0) sysUploadFileService.batchSave(cmmsUpkeepDto.getFiles(), cmmsUpkeepDto.getId(), "");//增加附件
+        if(cmmsUpkeepDto.getFiles()!=null && cmmsUpkeepDto.getFiles().size()>0) {
+            sysUploadFileService.deleteFileByRelId(cmmsUpkeepDto.getId());//删除之前的附件
+            sysUploadFileService.batchSave(cmmsUpkeepDto.getFiles(), cmmsUpkeepDto.getId(), "");//新增附件
+        }
 
         //需要增加的工单操作记录
         CmmsOrderNode node = cmmsUpkeepDto.getNodeList().get(0);