Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/entity/CmmsInspectContent.java

@@ -75,4 +75,9 @@ public class CmmsInspectContent implements Serializable {
     /**备注*/
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
+    /** 分类 */
+    @Excel(name = "分类", width = 15)
+    @ApiModelProperty(value = "分类")
+    @Dict(dicCode = "inspect_item_type")
+    private java.lang.String classification;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/mapper/xml/CmmsInspectContentMapper.xml

@@ -16,17 +16,12 @@
         <result property="status"    column="status"    />
         <result property="equipmentname"    column="equipmentname"    />
         <result property="sysOrgCode"    column="sys_org_code"    />
+        <result property="classification" column="classification" />
     </resultMap>
 
-    <sql id="selectCmmsSpotcheckContentVo">
-        select id, create_by, create_time, update_by, update_time, remark,
-               contentcode, contentname, equipmentid, status,sys_org_code
-        from cmms_inspect_content
-    </sql>
-
     <select id="getCmmsInspectContent" parameterType="org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent" resultMap="CmmsSpotcheckContentResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark,
-        c.contentcode, c.contentname, c.equipmentid, c.status, c.sys_org_code, e.equipmentname
+        c.contentcode, c.contentname, c.equipmentid, c.status, c.classification, c.sys_org_code, e.equipmentname
         from cmms_inspect_content as c
         left join tpm_equipment as e on c.equipmentid = e.id
         <where>
@@ -40,7 +35,7 @@
 
     <select id="getCmmsInspectContentById" parameterType="String" resultMap="CmmsSpotcheckContentResult">
         select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
-               a.contentcode, a.contentname, a.equipmentid, a.status, a.sys_org_code, e.equipmentname
+               a.contentcode, a.contentname, a.equipmentid, a.status, a.classification,a.sys_org_code, e.equipmentname
         from cmms_inspect_content a
         left join tpm_equipment as e on a.equipmentid = e.id
         where a.id = #{id}
@@ -56,7 +51,7 @@
 
     <select id="getCmmsInspectContentByEqId" parameterType="String" resultMap="CmmsSpotcheckContentResult">
         select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
-               a.contentcode, a.contentname, a.equipmentid, a.status, a.sys_org_code, e.equipmentname
+               a.contentcode, a.contentname, a.equipmentid, a.status, a.classification,a.sys_org_code, e.equipmentname
         from cmms_inspect_content a
         left join tpm_equipment as e on a.equipmentid = e.id
         where a.equipmentid = #{eqid}

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/service/impl/CmmsInspectLineServiceImpl.java

@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * @Description: 巡检路线
@@ -273,12 +274,27 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
     public List<CmmsInspectLineVo> getCmmsInspectLineListDetails(Page<CmmsInspectLineVo> page, CmmsInspectLine cmmsInspectLine) {
         List<CmmsInspectLineVo> lineList = inspectLineMapper.getCmmsInspectLineListDetails(page, cmmsInspectLine);
         ArrayList<CmmsInspectLineVo> list = new ArrayList<>();
-
-        for (CmmsInspectLineVo vo : lineList) {
-            CmmsInspectLineVo inspectLine = this.getCmmsInspectLineById(vo.getId());
-            list.add(inspectLine);
+        ArrayList<CompletableFuture<CmmsInspectLineVo>> completableFutureList = new ArrayList<>();
+
+        for (CmmsInspectLineVo vo:lineList) {
+            CompletableFuture<CmmsInspectLineVo> getInspectListFuture = CompletableFuture.supplyAsync(() -> {
+                CmmsInspectLineVo inspectLine = this.getCmmsInspectLineById(vo.getId());
+                return inspectLine;
+            });
+            completableFutureList.add(getInspectListFuture);
         }
 
+        CompletableFuture.allOf(completableFutureList.toArray(new CompletableFuture[0])).thenRun(() -> {
+            for (CompletableFuture<CmmsInspectLineVo> future:completableFutureList) {
+                CmmsInspectLineVo join = future.join();
+                list.add(join);
+            }
+        }).join();
+        //for (CmmsInspectLineVo vo : lineList) {
+        //    CmmsInspectLineVo inspectLine = this.getCmmsInspectLineById(vo.getId());
+        //    list.add(inspectLine);
+        //}
+
         return list;
     }
 

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/service/impl/CmmsInspectSpotServiceImpl.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * @Description: 巡检点
@@ -196,18 +197,35 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
     @Override
     public List<CmmsInspectSpotVo> getCmmsInspectSpotListDetails(Page<CmmsInspectSpotVo> page, CmmsInspectSpot cmmsInspectSpot) {
         List<CmmsInspectSpotVo> cmmsInspectSpotList = inspectSpotMapper.getCmmsInspectSpotList(page, cmmsInspectSpot);
-        for (int i = 0; i < cmmsInspectSpotList.size(); i++) {
-            String id = cmmsInspectSpotList.get(i).getId();
-            List<CmmsInspectSpotEquip> list = inspectSpotEquipService.getInspectSpotEquipBySprtId(id);
-            ArrayList<CmmsInspectContentVo> contentList = new ArrayList<>();
-            for (CmmsInspectSpotEquip spot:list) {
-                CmmsInspectContentVo inspectContent = iCmmsInspectContentService.getCmmsInspectContentById(spot.getInspectcontid());
-                contentList.add(inspectContent);
-            }
-            cmmsInspectSpotList.get(i).setInspectContentList(contentList);
+        ArrayList<CmmsInspectSpotVo> list = new ArrayList<>();
+        ArrayList<CompletableFuture<CmmsInspectSpotVo>> completableFutureList = new ArrayList<>();
+        for (CmmsInspectSpot vo:cmmsInspectSpotList) {
+            CompletableFuture<CmmsInspectSpotVo> getInspectSpotFuture = CompletableFuture.supplyAsync(() -> {
+                CmmsInspectSpotVo cmmsInspectSpotVo = this.getCmmsInspectSpotListById(vo.getId());
+                return cmmsInspectSpotVo;
+            });
+            completableFutureList.add(getInspectSpotFuture);
         }
+        CompletableFuture.allOf(completableFutureList.toArray(new CompletableFuture[0])).thenRun(() -> {
+            for (CompletableFuture<CmmsInspectSpotVo> future : completableFutureList) {
+                CmmsInspectSpotVo join = future.join();
+                list.add(join);
+            }
+        }).join();
+
+
+        //for (int i = 0; i < cmmsInspectSpotList.size(); i++) {
+        //    String id = cmmsInspectSpotList.get(i).getId();
+        //    List<CmmsInspectSpotEquip> list = inspectSpotEquipService.getInspectSpotEquipBySprtId(id);
+        //    ArrayList<CmmsInspectContentVo> contentList = new ArrayList<>();
+        //    for (CmmsInspectSpotEquip spot:list) {
+        //        CmmsInspectContentVo inspectContent = iCmmsInspectContentService.getCmmsInspectContentById(spot.getInspectcontid());
+        //        contentList.add(inspectContent);
+        //    }
+        //    cmmsInspectSpotList.get(i).setInspectContentList(contentList);
+        //}
 
-        return cmmsInspectSpotList;
+        return list;
     }
 
     @Override

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

@@ -15,6 +15,8 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
 import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepDto;
+import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepTypeDto;
+import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepTypeGetDto;
 import org.jeecg.modules.cmmsUpkeep.service.ICmmsUpkeepService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -54,6 +56,25 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 	private ICmmsUpkeepService cmmsUpkeepService;
 
 	 /**
+	  * 查询保养工单列表-我的相关
+	  *
+	  * @param cmmsUpkeepDto 保养工单
+	  * @return 保养工单集合
+	  */
+	 //@AutoLog(value = "查询保养工单列表-我的相关")
+	 @ApiOperation(value="查询保养工单列表-我的相关", notes="查询保养工单列表-我的相关")
+	 @GetMapping(value = "/selectMyRelateList")
+	 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 cmmsUpkeepDto 保养工单
@@ -73,28 +94,49 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 	 }
 
 	 /**
-	  * 查询保养工单列表-我的相关
+	  * 查询保养工单列表-我操作的工单
 	  *
 	  * @param cmmsUpkeepDto 保养工单
 	  * @return 保养工单集合
 	  */
-	 //@AutoLog(value = "查询保养工单列表-我的相关")
-	 @ApiOperation(value="查询保养工单列表-我的相关", notes="查询保养工单列表-我的相关")
-	 @GetMapping(value = "/selectMyRelateList")
-	 public Result<IPage<CmmsUpkeepDto>> selectMyRelateList(CmmsUpkeepDto cmmsUpkeepDto,
-													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-													   HttpServletRequest req) {
+	 //@AutoLog(value = "查询保养工单列表-我操作的工单")
+	 @ApiOperation(value="查询保养工单列表-我操作的工单", notes="查询保养工单列表-我操作的工单")
+	 @GetMapping(value = "/selectMyOperateList")
+	 public Result<IPage<CmmsUpkeepDto>> selectMyOperateList(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);
+		 List<CmmsUpkeepDto> pageList = cmmsUpkeepService.selectMyOperateList(page, cmmsUpkeepDto);
+		 page.setRecords(pageList);
+		 return Result.OK(page);
+	 }
+
+	 /**
+	  * 查询保养工单列表-我的下发
+	  *
+	  * @param cmmsUpkeepDto 保养工单
+	  * @return 保养工单集合
+	  */
+	 //@AutoLog(value = "查询保养工单列表-我的下发")
+	 @ApiOperation(value="查询保养工单列表-我的下发", notes="查询保养工单列表-我的下发")
+	 @GetMapping(value = "/selectMyArrangeList")
+	 public Result<IPage<CmmsUpkeepDto>> selectMyArrangeList(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.selectMyArrangeList(page, cmmsUpkeepDto);
 		 page.setRecords(pageList);
 		 return Result.OK(page);
 	 }
 
+
+
 	/**
 	 * 分页列表查询
 	 *
-	 * @param cmmsUpkeepDto
+	 * @param cmmsUpkeepTypeGetDto
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
@@ -103,19 +145,23 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 	//@AutoLog(value = "保养工单-分页列表查询")
 	@ApiOperation(value="保养工单-分页列表查询", notes="保养工单-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<CmmsUpkeepDto>> queryPageList(CmmsUpkeepDto cmmsUpkeepDto,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+	public Result<CmmsUpkeepTypeDto> queryPageList(CmmsUpkeepTypeGetDto cmmsUpkeepTypeGetDto,
+												   @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<CmmsUpkeepDto> page = new Page<CmmsUpkeepDto>(pageNo, pageSize);
 //		IPage<CmmsUpkeep> pageList = cmmsUpkeepService.page(page, queryWrapper);
 		List<CmmsUpkeepDto> pageList = new ArrayList<>();
+		CmmsUpkeepDto cmmsUpkeepDto = new CmmsUpkeepDto();
+		if(cmmsUpkeepTypeGetDto.getCmmsUpkeepDto() != null){
+			cmmsUpkeepDto = cmmsUpkeepTypeGetDto.getCmmsUpkeepDto();
+		}
 		//0我的相关  1我的代办
-		if(cmmsUpkeepDto.getCmmsUpkeepType()!=null && cmmsUpkeepDto.getCmmsUpkeepType().equals("0")){
+		if(cmmsUpkeepTypeGetDto.getCmmsUpkeepType()!=null && cmmsUpkeepTypeGetDto.getCmmsUpkeepType().equals("0")){
 			System.out.println("0");
 			pageList = cmmsUpkeepService.selectMyRelateList(page, cmmsUpkeepDto);
-		}else if(cmmsUpkeepDto.getCmmsUpkeepType()!=null && cmmsUpkeepDto.getCmmsUpkeepType().equals("1")){
+		}else if(cmmsUpkeepTypeGetDto.getCmmsUpkeepType()!=null && cmmsUpkeepTypeGetDto.getCmmsUpkeepType().equals("1")){
 			System.out.println("1");
 			pageList = cmmsUpkeepService.selectMyChargeList(page, cmmsUpkeepDto);
 		}else{
@@ -123,7 +169,10 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 			pageList = cmmsUpkeepService.selectMyRelateList(page, cmmsUpkeepDto);
 		}
 		page.setRecords(pageList);
-		return Result.OK(page);
+		CmmsUpkeepTypeDto cmmsUpkeepTypeDto = new CmmsUpkeepTypeDto();
+		cmmsUpkeepTypeDto.setCmmsUpkeepType(cmmsUpkeepTypeGetDto.getCmmsUpkeepType());
+		cmmsUpkeepTypeDto.setCmmsUpkeepDtoList(page);
+		return Result.OK(cmmsUpkeepTypeDto);
 	}
 
 	/**

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

@@ -34,16 +34,11 @@ public class CmmsUpkeepDto extends CmmsUpkeep{
     /**
      * 设备id
      */
+    @Dict(dicCode = "id", dictTable = "tpm_equipment", dicText = "equipmentname")
     private String equipmentid;
 
     /**
      * 保养项信息
      */
     private List<CmmsUpkeepItemDto> cmmsUpkeepItemList;
-
-    /**
-     * 0我的相关，1我的待办
-     */
-    @Dict(dicCode = "upkeep_type")
-    private String cmmsUpkeepType;
 }

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

@@ -0,0 +1,30 @@
+package org.jeecg.modules.cmmsUpkeep.entity;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+
+import java.util.List;
+
+/**
+ * ClassName: CmmsUpkeepTypeDto
+ * Package: org.jeecg.modules.cmmsUpkeep.entity
+ * Description:
+ *
+ * @Author sl
+ * @Create 2024/2/1 11:25
+ * @Version 1.0
+ */
+@Data
+public class CmmsUpkeepTypeDto {
+    /**
+     * 0我的相关，1我的待办
+     */
+    @Dict(dicCode = "upkeep_type")
+    private String cmmsUpkeepType;
+
+    /**
+     * 保养工单详情列表
+     */
+    private IPage<CmmsUpkeepDto> cmmsUpkeepDtoList;
+}

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

@@ -0,0 +1,30 @@
+package org.jeecg.modules.cmmsUpkeep.entity;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+
+/**
+ * ClassName: CmmsUpkeepTypeGetDto
+ * Package: org.jeecg.modules.cmmsUpkeep.entity
+ * Description:
+ *
+ * @Author sl
+ * @Create 2024/2/1 11:36
+ * @Version 1.0
+ */
+@Data
+public class CmmsUpkeepTypeGetDto {
+
+    /**
+     * 0我的相关，1我的待办
+     */
+    @Dict(dicCode = "upkeep_type")
+    private String cmmsUpkeepType;
+
+    /**
+     * 保养工单详情列表
+     */
+    private CmmsUpkeepDto cmmsUpkeepDto;
+
+}

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

@@ -18,6 +18,14 @@ import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlanDto;
 public interface CmmsUpkeepMapper extends BaseMapper<CmmsUpkeep> {
 
     /**
+     * 查询保养工单列表-我的相关
+     *
+     * @param cmmsUpkeepDto 保养工单
+     * @return 保养工单集合
+     */
+    public List<CmmsUpkeepDto> selectMyRelateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
+
+    /**
      * 查询保养工单列表-我的代办
      *
      * @param cmmsUpkeepDto 保养工单
@@ -26,12 +34,20 @@ public interface CmmsUpkeepMapper extends BaseMapper<CmmsUpkeep> {
     public List<CmmsUpkeepDto> selectMyChargeList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
 
     /**
-     * 查询保养工单列表-我的相关
+     * 查询保养工单列表-我下发的
      *
      * @param cmmsUpkeepDto 保养工单
      * @return 保养工单集合
      */
-    public List<CmmsUpkeepDto> selectMyRelateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
+    public List<CmmsUpkeepDto> selectMyArrangeList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
+
+    /**
+     * 查询保养工单列表-我操作的
+     *
+     * @param cmmsUpkeepDto 保养工单
+     * @return 保养工单集合
+     */
+    public List<CmmsUpkeepDto> selectMyOperateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
 
 
 

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

@@ -27,6 +27,23 @@
         <result property="equipmentid"    column="equipmentid"    />
     </resultMap>
 
+    <!-- 查询我的相关 -->
+    <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, p.equipmentid
+        from cmms_upkeep as c left join cmms_upkeep_plan as p on p.id=c.upkeepplanid
+        <where>
+            <if test="cmmsUpkeepDto.createBy != null and cmmsUpkeepDto.createBy != ''"> (c.create_by = #{cmmsUpkeepDto.createBy} or c.chargeruser = #{cmmsUpkeepDto.chargeruser})</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.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>
+        order by c.create_time desc
+    </select>
+
     <!-- 查询我的代办 -->
     <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,
@@ -45,13 +62,14 @@
         order by c.create_time desc
     </select>
 
-    <!-- 查询我的相关 -->
-    <select id="selectMyRelateList" parameterType="org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepDto" resultMap="CmmsUpkeepResult">
+    <!-- 查询我下发的 -->
+    <select id="selectMyArrangeList" 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, p.equipmentid
         from cmms_upkeep as c left join cmms_upkeep_plan as p on p.id=c.upkeepplanid
         <where>
+            <if test="cmmsUpkeepDto.createBy != null and cmmsUpkeepDto.createBy != ''"> and c.create_by = #{cmmsUpkeepDto.createBy}</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>
@@ -62,4 +80,23 @@
         order by c.create_time desc
     </select>
 
+    <!-- 查询我操作的 -->
+    <select id="selectMyOperateList" 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, p.equipmentid
+        from cmms_upkeep as c left join cmms_upkeep_plan as p on p.id=c.upkeepplanid
+        <where>
+            <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>
+        order by c.create_time desc
+    </select>
+
+
+
 </mapper>

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

@@ -25,6 +25,14 @@ public interface ICmmsUpkeepService extends IService<CmmsUpkeep> {
     public CmmsUpkeepDto selectCmmsUpkeepById(String id);
 
     /**
+     * 查询保养工单列表-我的相关
+     *
+     * @param cmmsUpkeepDto 保养工单
+     * @return 保养工单集合
+     */
+    public List<CmmsUpkeepDto> selectMyRelateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
+
+    /**
      * 查询保养工单列表-我的代办
      *
      * @param cmmsUpkeepDto 保养工单
@@ -33,12 +41,20 @@ public interface ICmmsUpkeepService extends IService<CmmsUpkeep> {
     public List<CmmsUpkeepDto> selectMyChargeList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
 
     /**
-     * 查询保养工单列表-我的相关
+     * 查询保养工单列表-我下发的
      *
      * @param cmmsUpkeepDto 保养工单
      * @return 保养工单集合
      */
-    public List<CmmsUpkeepDto> selectMyRelateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
+    public List<CmmsUpkeepDto> selectMyArrangeList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
+
+    /**
+     * 查询保养工单列表-我操作的
+     *
+     * @param cmmsUpkeepDto 保养工单
+     * @return 保养工单集合
+     */
+    public List<CmmsUpkeepDto> selectMyOperateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto);
 
     /**
      * 新增保养工单

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

@@ -2,6 +2,9 @@ package org.jeecg.modules.cmmsUpkeep.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jeecg.dingtalk.api.user.vo.User;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
 import org.jeecg.modules.cmmsOrderNode.service.ICmmsOrderNodeService;
 import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
@@ -99,6 +102,18 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
         return cmmsUpkeepDto;
     }
 
+    /**
+     * 查询保养工单列表-我的相关
+     *
+     * @param cmmsUpkeepDto 保养工单
+     * @return 保养工单集合
+     */
+    public List<CmmsUpkeepDto> selectMyRelateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto){
+        LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        cmmsUpkeepDto.setCreateBy(user.getUsername());
+        cmmsUpkeepDto.setChargeruser(user.getUsername());
+        return cmmsUpkeepMapper.selectMyRelateList(page, cmmsUpkeepDto);
+    }
 
     /**
      * 查询保养工单列表-我的代办
@@ -107,17 +122,34 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
      * @return 保养工单集合
      */
     public List<CmmsUpkeepDto> selectMyChargeList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto){
+        LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        cmmsUpkeepDto.setChargeruser(user.getUsername());
         return cmmsUpkeepMapper.selectMyChargeList(page, cmmsUpkeepDto);
     }
 
     /**
-     * 查询保养工单列表-我的相关
+     * 查询保养工单列表-我的下发
+     * 创建人是当前账户
      *
      * @param cmmsUpkeepDto 保养工单
      * @return 保养工单集合
      */
-    public List<CmmsUpkeepDto> selectMyRelateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto){
-        return cmmsUpkeepMapper.selectMyRelateList(page, cmmsUpkeepDto);
+    public List<CmmsUpkeepDto> selectMyArrangeList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto){
+        LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        cmmsUpkeepDto.setCreateBy(user.getUsername());
+        return cmmsUpkeepMapper.selectMyArrangeList(page, cmmsUpkeepDto);
+    }
+
+    /**
+     * 查询保养工单列表-我操作的
+     *
+     * @param cmmsUpkeepDto 保养工单
+     * @return 保养工单集合
+     */
+    public List<CmmsUpkeepDto> selectMyOperateList(Page<CmmsUpkeepDto> page, CmmsUpkeepDto cmmsUpkeepDto){
+        LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        cmmsUpkeepDto.setChargeruser(user.getUsername());
+        return cmmsUpkeepMapper.selectMyOperateList(page, cmmsUpkeepDto);
     }
 
     /**
@@ -191,8 +223,8 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
         cmmsUpkeep.setOpinion(cmmsUpkeepDto.getOpinion());
 
         // 附件
+        sysUploadFileService.deleteFileByRelId(cmmsUpkeepDto.getId());//删除之前的附件
         if(cmmsUpkeepDto.getFiles()!=null && cmmsUpkeepDto.getFiles().size()>0) {
-            sysUploadFileService.deleteFileByRelId(cmmsUpkeepDto.getId());//删除之前的附件
             sysUploadFileService.batchSave(cmmsUpkeepDto.getFiles(), cmmsUpkeepDto.getId(), "");//新增附件
         }