保养工单查询、新增、编辑以及删除

module_base/src/main/java/org/jeecg/modules/sysUploadFile/mapper/SysUploadFileMapper.java

@@ -43,7 +43,7 @@ public interface SysUploadFileMapper extends BaseMapper<SysUploadFile> {
      * @param relId 关联ID
      * @return 结果
      */
-    public int deleteFileByRelId(Long relId);
+    public int deleteFileByRelId(String relId);
 
     /**
      * 删除文件信息

module_base/src/main/java/org/jeecg/modules/sysUploadFile/mapper/xml/SysUploadFileMapper.xml

@@ -84,7 +84,7 @@
         delete from base_upload_file where fileId = #{fileId}
     </delete>
 
-    <delete id="deleteFileByRelId" parameterType="Long">
+    <delete id="deleteFileByRelId" parameterType="String">
         delete from base_upload_file where relId = #{relId}
     </delete>
 
@@ -99,11 +99,11 @@
         </foreach>
     </delete>
 
-    <delete id="deleteFileByRelIds" parameterType="Long">
+    <delete id="deleteFileByRelIds" parameterType="String">
         delete from base_upload_file where relid in
         <foreach item="relid" collection="array" open="(" separator="," close=")">
             #{relid}
         </foreach>
     </delete>
 
-</mapper>
+</mapper>

module_base/src/main/java/org/jeecg/modules/sysUploadFile/service/ISysUploadFileService.java

@@ -68,7 +68,7 @@ public interface ISysUploadFileService extends IService<SysUploadFile> {
      * @param relId 文件ID
      * @return 结果
      */
-    public int deleteFileByRelId(Long relId);
+    public int deleteFileByRelId(String relId);
 
     /**
      * 删除文件信息

module_base/src/main/java/org/jeecg/modules/sysUploadFile/service/impl/SysUploadFileServiceImpl.java

@@ -128,9 +128,9 @@ public class SysUploadFileServiceImpl extends ServiceImpl<SysUploadFileMapper, S
      * @return 结果
      */
     @Override
-    public int deleteFileByRelId(Long relId)
+    public int deleteFileByRelId(String relId)
     {
-        return fileMapper.deleteFileById(relId);
+        return fileMapper.deleteFileByRelId(relId);
     }
 
     /**

module_cmms/src/main/java/org/jeecg/modules/cmmsOrderNode/mapper/CmmsOrderNodeMapper.java

@@ -15,4 +15,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface CmmsOrderNodeMapper extends BaseMapper<CmmsOrderNode> {
 
     List<CmmsOrderNode> selectCmmsOrderNodeList(CmmsOrderNode node);
+
+    /**
+     *通过工单id删除操作记录
+     */
+    public boolean deleteCmmsOrderNodeByRelid(@Param("relid") String relid);
+
+    /**
+     *通过工单id批量删除操作记录
+     */
+    public boolean deleteCmmsOrderNodeByRelids(@Param("relids") List<String> relids);
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsOrderNode/mapper/xml/CmmsOrderNodeMapper.xml

@@ -27,4 +27,16 @@
         </where>
     </select>
 
-</mapper>
+
+    <delete id="deleteCmmsOrderNodeByRelid" parameterType="String">
+        delete from cmms_order_node where relid = #{relid}
+    </delete>
+
+    <delete id="deleteCmmsOrderNodeByRelids" parameterType="String">
+        delete from cmms_order_node where relid in
+        <foreach item="item" collection="relids" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+</mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsOrderNode/service/ICmmsOrderNodeService.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.cmmsOrderNode.service;
 
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -14,4 +15,14 @@ import java.util.List;
 public interface ICmmsOrderNodeService extends IService<CmmsOrderNode> {
 
     List<CmmsOrderNode> selectCmmsOrderNodeList(CmmsOrderNode node);
+
+    /**
+     *通过工单id删除操作记录
+     */
+    public boolean deleteCmmsOrderNodeByRelid(String relid);
+
+    /**
+     *通过工单id批量删除操作记录
+     */
+    public boolean deleteCmmsOrderNodeByRelids(List<String> relids);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsOrderNode/service/impl/CmmsOrderNodeServiceImpl.java

@@ -27,4 +27,18 @@ public class CmmsOrderNodeServiceImpl extends ServiceImpl<CmmsOrderNodeMapper, C
     public List<CmmsOrderNode> selectCmmsOrderNodeList(CmmsOrderNode node) {
         return cmmsOrderNodeMapper.selectCmmsOrderNodeList(node);
     }
+
+    /**
+     *通过工单id删除操作记录
+     */
+    public boolean deleteCmmsOrderNodeByRelid(String relid){
+        return cmmsOrderNodeMapper.deleteCmmsOrderNodeByRelid(relid);
+    }
+
+    /**
+     *通过工单id批量删除操作记录
+     */
+    public boolean deleteCmmsOrderNodeByRelids(List<String> relids){
+        return cmmsOrderNodeMapper.deleteCmmsOrderNodeByRelids(relids);
+    }
 }

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

@@ -13,6 +13,7 @@ import org.jeecg.common.api.vo.Result;
 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.service.ICmmsUpkeepService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -49,7 +50,33 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkeepService> {
 	@Autowired
 	private ICmmsUpkeepService cmmsUpkeepService;
-	
+
+	 /**
+	  * 查询保养工单列表-我的代办
+	  *
+	  * @param cmmsUpkeep 保养工单
+	  * @return 保养工单集合
+	  */
+	 //@AutoLog(value = "查询保养工单列表-我的代办")
+	 @ApiOperation(value="查询保养工单列表-我的代办", notes="查询保养工单列表-我的代办")
+	 @GetMapping(value = "/selectMyChargeList")
+	 public Result<List<CmmsUpkeep>> selectMyChargeList(CmmsUpkeep cmmsUpkeep) {
+		 return Result.OK(cmmsUpkeepService.selectMyChargeList(cmmsUpkeep));
+	 }
+
+	 /**
+	  * 查询保养工单列表-我的相关
+	  *
+	  * @param cmmsUpkeep 保养工单
+	  * @return 保养工单集合
+	  */
+	 //@AutoLog(value = "查询保养工单列表-我的相关")
+	 @ApiOperation(value="查询保养工单列表-我的相关", notes="查询保养工单列表-我的相关")
+	 @GetMapping(value = "/selectMyRelateList")
+	 public Result<List<CmmsUpkeep>> selectMyRelateList(CmmsUpkeep cmmsUpkeep) {
+		 return Result.OK(cmmsUpkeepService.selectMyRelateList(cmmsUpkeep));
+	 }
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,37 +98,39 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 		IPage<CmmsUpkeep> pageList = cmmsUpkeepService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
-	 * @param cmmsUpkeep
+	 * @param cmmsUpkeepDto
 	 * @return
 	 */
 	@AutoLog(value = "保养工单-添加")
 	@ApiOperation(value="保养工单-添加", notes="保养工单-添加")
 	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody CmmsUpkeep cmmsUpkeep) {
-		cmmsUpkeepService.save(cmmsUpkeep);
+	public Result<String> add(@RequestBody CmmsUpkeepDto cmmsUpkeepDto) {
+		cmmsUpkeepService.insertCmmsUpkeep(cmmsUpkeepDto);
+//		cmmsUpkeepService.save(cmmsUpkeep);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
-	 * @param cmmsUpkeep
+	 * @param cmmsUpkeepDto
 	 * @return
 	 */
 	@AutoLog(value = "保养工单-编辑")
 	@ApiOperation(value="保养工单-编辑", notes="保养工单-编辑")
 	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CmmsUpkeep cmmsUpkeep) {
-		cmmsUpkeepService.updateById(cmmsUpkeep);
+	public Result<String> edit(@RequestBody CmmsUpkeepDto cmmsUpkeepDto) {
+		cmmsUpkeepService.cmmsUpkeepFeedback(cmmsUpkeepDto);
+//		cmmsUpkeepService.updateById(cmmsUpkeep);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -113,10 +142,11 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		cmmsUpkeepService.removeById(id);
+		cmmsUpkeepService.deleteCmmsUpkeepById(id);
+//		cmmsUpkeepService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -128,10 +158,11 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 	//@RequiresPermissions("org.jeecg.modules:ems_cmms_upkeep:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.cmmsUpkeepService.removeByIds(Arrays.asList(ids.split(",")));
+		cmmsUpkeepService.deleteCmmsUpkeepByIds(Arrays.asList(ids.split(",")));
+//		this.cmmsUpkeepService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -141,12 +172,13 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 	//@AutoLog(value = "保养工单-通过id查询")
 	@ApiOperation(value="保养工单-通过id查询", notes="保养工单-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<CmmsUpkeep> queryById(@RequestParam(name="id",required=true) String id) {
-		CmmsUpkeep cmmsUpkeep = cmmsUpkeepService.getById(id);
-		if(cmmsUpkeep==null) {
+	public Result<CmmsUpkeepDto> queryById(@RequestParam(name="id",required=true) String id) {
+		CmmsUpkeepDto cmmsUpkeepDto = cmmsUpkeepService.selectCmmsUpkeepById(id);
+//		CmmsUpkeep cmmsUpkeep = cmmsUpkeepService.getById(id);
+		if(cmmsUpkeepDto==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(cmmsUpkeep);
+		return Result.OK(cmmsUpkeepDto);
 	}
 
     /**

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

@@ -57,23 +57,23 @@ public class CmmsUpkeep implements Serializable {
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
 	/**保养工单编号*/
-	@Excel(name = "保养工单编号", width = 15)
+//	@Excel(name = "保养工单编号", width = 15)
     @ApiModelProperty(value = "保养工单编号")
     private java.lang.String upkeepcode;
 	/**保养名称(标题)*/
-	@Excel(name = "保养名称(标题)", width = 15)
+	@Excel(name = "保养名称", width = 15)
     @ApiModelProperty(value = "保养名称(标题)")
     private java.lang.String upkeepname;
 	/**保养计划ID*/
-	@Excel(name = "保养计划ID", width = 15)
+//	@Excel(name = "保养计划ID", width = 15)
     @ApiModelProperty(value = "保养计划ID")
     private java.lang.String upkeepplanid;
 	/**保养工作项目ID*/
-	@Excel(name = "保养工作项目ID", width = 15)
+//	@Excel(name = "保养工作项目ID", width = 15)
     @ApiModelProperty(value = "保养工作项目ID")
     private java.lang.String upkeepprojid;
 	/**工作项目名称*/
-	@Excel(name = "工作项目名称", width = 15)
+//	@Excel(name = "工作项目名称", width = 15)
     @ApiModelProperty(value = "工作项目名称")
     private java.lang.String projectname;
 	/**计划名称*/
@@ -85,19 +85,19 @@ public class CmmsUpkeep implements Serializable {
     @ApiModelProperty(value = "地点")
     private java.lang.String address;
 	/**厂商名称*/
-	@Excel(name = "厂商名称", width = 15)
+//	@Excel(name = "厂商名称", width = 15)
     @ApiModelProperty(value = "厂商名称")
     private java.lang.String supplier;
 	/**厂商电话*/
-	@Excel(name = "厂商电话", width = 15)
+//	@Excel(name = "厂商电话", width = 15)
     @ApiModelProperty(value = "厂商电话")
     private java.lang.String suppliertel;
 	/**联系人*/
-	@Excel(name = "联系人", width = 15)
+//	@Excel(name = "联系人", width = 15)
     @ApiModelProperty(value = "联系人")
     private java.lang.String linker;
 	/**联系人电话*/
-	@Excel(name = "联系人电话", width = 15)
+//	@Excel(name = "联系人电话", width = 15)
     @ApiModelProperty(value = "联系人电话")
     private java.lang.String linkertel;
 	/**负责人*/
@@ -105,7 +105,7 @@ public class CmmsUpkeep implements Serializable {
     @ApiModelProperty(value = "负责人")
     private java.lang.String chargeruser;
 	/**描述*/
-	@Excel(name = "描述", width = 15)
+//	@Excel(name = "描述", width = 15)
     @ApiModelProperty(value = "描述")
     private java.lang.String upkeepdesc;
 	/**状态：0待处理、1已通知、2未执行、3未完成、4已完成*/
@@ -113,7 +113,7 @@ public class CmmsUpkeep implements Serializable {
     @ApiModelProperty(value = "状态：0待处理、1已通知、2未执行、3未完成、4已完成")
     private java.lang.String status;
 	/**处理意见*/
-	@Excel(name = "处理意见", width = 15)
+//	@Excel(name = "处理意见", width = 15)
     @ApiModelProperty(value = "处理意见")
     private java.lang.String opinion;
 }

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

@@ -0,0 +1,30 @@
+package org.jeecg.modules.cmmsUpkeep.entity;
+
+import lombok.Data;
+import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
+import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
+
+import java.util.List;
+
+/**
+ * ClassName: CmmsUpkeepDto
+ * Package: org.jeecg.modules.cmmsUpkeep.entity
+ * Description:
+ *
+ * @Author sl
+ * @Create 2024/1/24 11:39
+ * @Version 1.0
+ */
+@Data
+public class CmmsUpkeepDto extends CmmsUpkeep{
+
+    /**
+     * 节点信息
+     */
+    private List<CmmsOrderNode> nodeList;
+
+    /**
+     * 图片
+     */
+    private List<SysUploadFile> files;
+}

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

@@ -20,7 +20,7 @@ public interface CmmsUpkeepMapper extends BaseMapper<CmmsUpkeep> {
      * @param cmmsUpkeep 保养工单
      * @return 保养工单集合
      */
-    public List<CmmsUpkeep> selectMyChargeList(CmmsUpkeep cmmsUpkeep);
+    public List<CmmsUpkeep> selectMyChargeList(@Param("cmmsUpkeep") CmmsUpkeep cmmsUpkeep);
 
     /**
      * 查询保养工单列表-我的相关
@@ -28,7 +28,7 @@ public interface CmmsUpkeepMapper extends BaseMapper<CmmsUpkeep> {
      * @param cmmsUpkeep 保养工单
      * @return 保养工单集合
      */
-    public List<CmmsUpkeep> selectMyRelateList(CmmsUpkeep cmmsUpkeep);
+    public List<CmmsUpkeep> selectMyRelateList(@Param("cmmsUpkeep") CmmsUpkeep cmmsUpkeep);
 
 
 

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

@@ -33,10 +33,10 @@
         c.linker, c.linkertel, c.chargeruser, c.upkeepname, c.upkeepdesc, c.status, c.opinion
         from cmms_upkeep as c
         <where>
-            <if test="upkeepcode != null and upkeepcode != ''"> and (c.upkeepcode like concat('%', #{upkeepcode}, '%') or c.upkeepname like concat('%', #{upkeepcode}, '%'))</if>
-            <if test="chargeruser != null and chargeruser != ''"> and concat(chargeruser,',') like concat('%', #{chargeruser}, ',%')</if>
-            <if test="status != null and status != ''"> and status = #{status}</if>
-            <if test="status == null or status == ''"> and status in ('0','1')</if>
+            <if test="cmmsUpkeep.upkeepcode != null and cmmsUpkeep.upkeepcode != ''"> and (c.upkeepcode like concat('%', #{cmmsUpkeep.upkeepcode}, '%') or c.upkeepname like concat('%', #{cmmsUpkeep.upkeepcode}, '%'))</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>
         </where>
     </select>
 
@@ -47,9 +47,9 @@
         c.linker, c.linkertel, c.chargeruser, c.upkeepname, c.upkeepdesc, c.status, c.opinion
         from cmms_upkeep as c
         <where>
-            <if test="upkeepcode != null and upkeepcode != ''"> and (c.upkeepcode like concat('%', #{upkeepcode}, '%') or c.upkeepname like concat('%', #{upkeepcode}, '%'))</if>
-            <if test="chargeruser != null and chargeruser != ''"> and (concat(c.chargeruser,',') like concat('%', #{chargeruser}, ',%') or exists (select nodeid from cmms_order_node where relid=c.upkeepid and create_by=#{chargeruser}))</if>
-            <if test="status != null and status != ''"> and c.status = #{status}</if>
+            <if test="cmmsUpkeep.upkeepcode != null and cmmsUpkeep.upkeepcode != ''"> and (c.upkeepcode like concat('%', #{cmmsUpkeep.upkeepcode}, '%') or c.upkeepname like concat('%', #{cmmsUpkeep.upkeepcode}, '%'))</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>
         </where>
     </select>
 

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

@@ -2,6 +2,9 @@ package org.jeecg.modules.cmmsUpkeep.service;
 
 import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepDto;
+
+import java.util.List;
 
 /**
  * @Description: 保养工单
@@ -11,4 +14,60 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICmmsUpkeepService extends IService<CmmsUpkeep> {
 
+    /**
+     * 通过id查询保养工单
+     *
+     * @param id 保养工单主键
+     * @return 保养工单
+     */
+    public CmmsUpkeepDto selectCmmsUpkeepById(String id);
+
+    /**
+     * 查询保养工单列表-我的代办
+     *
+     * @param cmmsUpkeep 保养工单
+     * @return 保养工单集合
+     */
+    public List<CmmsUpkeep> selectMyChargeList(CmmsUpkeep cmmsUpkeep);
+
+    /**
+     * 查询保养工单列表-我的相关
+     *
+     * @param cmmsUpkeep 保养工单
+     * @return 保养工单集合
+     */
+    public List<CmmsUpkeep> selectMyRelateList(CmmsUpkeep cmmsUpkeep);
+
+    /**
+     * 新增保养工单
+     *
+     * @param cmmsUpkeepDto 保养工单
+     * @return 结果
+     */
+    public boolean insertCmmsUpkeep(CmmsUpkeepDto cmmsUpkeepDto);
+
+    /**
+     * 修改保养工单(其实是保养工单反馈）
+     *
+     * @param cmmsUpkeepDto 保养工单
+     * @return 结果
+     */
+    public boolean cmmsUpkeepFeedback(CmmsUpkeepDto cmmsUpkeepDto);
+
+    /**
+     * 批量删除保养工单
+     *
+     * @param ids 需要删除的保养工单主键
+     * @return 结果
+     */
+    public boolean deleteCmmsUpkeepByIds(List<String> ids);
+
+    /**
+     * 删除保养工单信息
+     *
+     * @param id 保养工单主键
+     * @return 结果
+     */
+    public boolean deleteCmmsUpkeepById(String id);
+
 }

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

@@ -1,11 +1,24 @@
 package org.jeecg.modules.cmmsUpkeep.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import org.jeecg.modules.cmmsOrderNode.entity.CmmsOrderNode;
+import org.jeecg.modules.cmmsOrderNode.service.ICmmsOrderNodeService;
 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.sysUploadFile.entity.SysUploadFile;
+import org.jeecg.modules.sysUploadFile.service.ISysUploadFileService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * @Description: 保养工单
@@ -16,4 +29,211 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpkeep> implements ICmmsUpkeepService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private CmmsUpkeepMapper cmmsUpkeepMapper;
+
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsOrderNodeService cmmsOrderNodeService;
+
+    @Autowired
+    @SuppressWarnings("all")
+    private ISysUploadFileService sysUploadFileService;
+
+    /**
+     * 通过id查询保养工单
+     *
+     * @param id 保养工单主键
+     * @return 保养工单
+     */
+    public CmmsUpkeepDto selectCmmsUpkeepById(String id)
+    {
+        CmmsUpkeepDto cmmsUpkeepDto = new CmmsUpkeepDto();
+        cmmsUpkeepDto.setId(id);
+        // 保养工单
+        CmmsUpkeep cmmsUpkeep = this.getById(id);
+        cmmsUpkeepDto.setCreateBy(cmmsUpkeep.getCreateBy());
+        cmmsUpkeepDto.setCreateTime(cmmsUpkeep.getCreateTime());
+        cmmsUpkeepDto.setUpdateBy(cmmsUpkeep.getUpdateBy());
+        cmmsUpkeepDto.setUpdateTime(cmmsUpkeep.getUpdateTime());
+        cmmsUpkeepDto.setRemark(cmmsUpkeep.getRemark());
+        cmmsUpkeepDto.setUpkeepcode(cmmsUpkeep.getUpkeepcode());
+        cmmsUpkeepDto.setUpkeepname(cmmsUpkeep.getUpkeepname());
+        cmmsUpkeepDto.setUpkeepplanid(cmmsUpkeep.getUpkeepplanid());
+        cmmsUpkeepDto.setUpkeepprojid(cmmsUpkeep.getUpkeepprojid());
+        cmmsUpkeepDto.setProjectname(cmmsUpkeep.getProjectname());
+        cmmsUpkeepDto.setPlanname(cmmsUpkeep.getPlanname());
+        cmmsUpkeepDto.setAddress(cmmsUpkeep.getAddress());
+        cmmsUpkeepDto.setSupplier(cmmsUpkeep.getSupplier());
+        cmmsUpkeepDto.setSuppliertel(cmmsUpkeep.getSuppliertel());
+        cmmsUpkeepDto.setLinker(cmmsUpkeep.getLinker());
+        cmmsUpkeepDto.setLinkertel(cmmsUpkeep.getLinkertel());
+        cmmsUpkeepDto.setChargeruser(cmmsUpkeep.getChargeruser());
+        cmmsUpkeepDto.setUpkeepdesc(cmmsUpkeep.getUpkeepdesc());
+        cmmsUpkeepDto.setStatus(cmmsUpkeep.getStatus());
+        cmmsUpkeepDto.setOpinion(cmmsUpkeep.getOpinion());
+
+
+        // 保养操作记录
+        CmmsOrderNode node = new CmmsOrderNode();
+        node.setRelid(id);
+        List<CmmsOrderNode> nodeList = cmmsOrderNodeService.selectCmmsOrderNodeList(node);
+        cmmsUpkeepDto.setNodeList(nodeList);
+
+        // 附件
+        cmmsUpkeepDto.setFiles(sysUploadFileService.selectFileList(new SysUploadFile(id, "")));
+
+        return cmmsUpkeepDto;
+    }
+
+
+    /**
+     * 查询保养工单列表-我的代办
+     *
+     * @param cmmsUpkeep 保养工单
+     * @return 保养工单集合
+     */
+    public List<CmmsUpkeep> selectMyChargeList(CmmsUpkeep cmmsUpkeep){
+        return cmmsUpkeepMapper.selectMyChargeList(cmmsUpkeep);
+    }
+
+    /**
+     * 查询保养工单列表-我的相关
+     *
+     * @param cmmsUpkeep 保养工单
+     * @return 保养工单集合
+     */
+    public List<CmmsUpkeep> selectMyRelateList(CmmsUpkeep cmmsUpkeep){
+        return cmmsUpkeepMapper.selectMyRelateList(cmmsUpkeep);
+    }
+
+    /**
+     * 新增保养工单
+     *
+     * @param cmmsUpkeepDto 保养工单
+     * @return 结果
+     */
+    public boolean insertCmmsUpkeep(CmmsUpkeepDto cmmsUpkeepDto)
+    {
+        //需要插入的保养工单
+        CmmsUpkeep cmmsUpkeep = new CmmsUpkeep();
+        cmmsUpkeep.setId(IdWorker.getIdStr());
+        cmmsUpkeep.setRemark(cmmsUpkeepDto.getRemark());
+        cmmsUpkeep.setUpkeepcode(cmmsUpkeepDto.getUpkeepcode());
+        cmmsUpkeep.setUpkeepname(cmmsUpkeepDto.getUpkeepname());
+        cmmsUpkeep.setUpkeepplanid(cmmsUpkeepDto.getUpkeepplanid());
+        cmmsUpkeep.setUpkeepprojid(cmmsUpkeepDto.getUpkeepprojid());
+        cmmsUpkeep.setProjectname(cmmsUpkeepDto.getProjectname());
+        cmmsUpkeep.setPlanname(cmmsUpkeepDto.getPlanname());
+        cmmsUpkeep.setAddress(cmmsUpkeepDto.getAddress());
+        cmmsUpkeep.setSupplier(cmmsUpkeepDto.getSupplier());
+        cmmsUpkeep.setSuppliertel(cmmsUpkeepDto.getSuppliertel());
+        cmmsUpkeep.setLinker(cmmsUpkeepDto.getLinker());
+        cmmsUpkeep.setLinkertel(cmmsUpkeepDto.getLinkertel());
+        cmmsUpkeep.setChargeruser(cmmsUpkeepDto.getChargeruser());
+        cmmsUpkeep.setUpkeepdesc(cmmsUpkeepDto.getUpkeepdesc());
+        cmmsUpkeep.setStatus(cmmsUpkeepDto.getStatus());
+        cmmsUpkeep.setOpinion(cmmsUpkeepDto.getOpinion());
+
+        // 操作记录
+        CmmsOrderNode node = new CmmsOrderNode();
+        node.setNodename("0");
+        node.setRelid(cmmsUpkeep.getId());
+        node.setHandledate(new Date());
+        node.setOpinion("——");
+        cmmsOrderNodeService.save(node);
+
+        // 附件   保存图片
+        sysUploadFileService.batchSave(cmmsUpkeepDto.getFiles(), cmmsUpkeepDto.getId(), "");
+
+        return this.save(cmmsUpkeep);//保存保养工单
+    }
+
+    /**
+     * 修改保养工单(其实是保养工单反馈）
+     *
+     * @param cmmsUpkeepDto 保养工单
+     * @return 结果
+     */
+    public boolean cmmsUpkeepFeedback(CmmsUpkeepDto cmmsUpkeepDto)
+    {
+        //需要更新的保养工单
+        CmmsUpkeep cmmsUpkeep = new CmmsUpkeep();
+        cmmsUpkeep.setId(cmmsUpkeepDto.getId());
+        cmmsUpkeep.setRemark(cmmsUpkeepDto.getRemark());
+        cmmsUpkeep.setUpkeepcode(cmmsUpkeepDto.getUpkeepcode());
+        cmmsUpkeep.setUpkeepname(cmmsUpkeepDto.getUpkeepname());
+        cmmsUpkeep.setUpkeepplanid(cmmsUpkeepDto.getUpkeepplanid());
+        cmmsUpkeep.setUpkeepprojid(cmmsUpkeepDto.getUpkeepprojid());
+        cmmsUpkeep.setProjectname(cmmsUpkeepDto.getProjectname());
+        cmmsUpkeep.setPlanname(cmmsUpkeepDto.getPlanname());
+        cmmsUpkeep.setAddress(cmmsUpkeepDto.getAddress());
+        cmmsUpkeep.setSupplier(cmmsUpkeepDto.getSupplier());
+        cmmsUpkeep.setSuppliertel(cmmsUpkeepDto.getSuppliertel());
+        cmmsUpkeep.setLinker(cmmsUpkeepDto.getLinker());
+        cmmsUpkeep.setLinkertel(cmmsUpkeepDto.getLinkertel());
+        cmmsUpkeep.setChargeruser(cmmsUpkeepDto.getChargeruser());
+        cmmsUpkeep.setUpkeepdesc(cmmsUpkeepDto.getUpkeepdesc());
+        cmmsUpkeep.setStatus(cmmsUpkeepDto.getStatus());
+        cmmsUpkeep.setOpinion(cmmsUpkeepDto.getOpinion());
+
+        // 附件
+        sysUploadFileService.batchSave(cmmsUpkeepDto.getFiles(), cmmsUpkeepDto.getId(), "");
+
+        //需要增加的工单操作记录
+        CmmsOrderNode node = cmmsUpkeepDto.getNodeList().get(0);
+//        node.setNodename(String.valueOf(Integer.parseInt(node.getNodename())+1));
+        node.setRelid(cmmsUpkeepDto.getId());
+        node.setHandledate(new Date());
+        cmmsOrderNodeService.save(node);
+
+        return this.updateById(cmmsUpkeep);
+
+    }
+
+    /**
+     * 批量删除保养工单
+     *
+     * @param ids 需要删除的保养工单主键
+     * @return 结果
+     */
+    public boolean deleteCmmsUpkeepByIds(List<String> ids)
+    {
+        // 删除操作记录表数据
+        cmmsOrderNodeService.deleteCmmsOrderNodeByRelids(ids);
+
+        // 删除附件
+        List<String> idsNew = new ArrayList<>();
+        sysUploadFileService.deleteFileByRelIds(ids.toArray(new String[0]));
+//        for(String id:ids){
+//            List<SysUploadFile> sysUploadFileList = sysUploadFileService.selectFileList(new SysUploadFile(id, ""));
+//            System.out.println(sysUploadFileList);
+//            if(sysUploadFileList!=null || sysUploadFileList.size()>0) idsNew.add(id);
+//        }
+//        if(idsNew.size()>0) sysUploadFileService.removeByIds(idsNew);
+
+        return this.removeByIds(ids);
+    }
+
+    /**
+     * 删除保养工单信息
+     *
+     * @param id 保养工单主键
+     * @return 结果
+     */
+    public boolean deleteCmmsUpkeepById(String id)
+    {
+        // 删除操作记录表数据
+        cmmsOrderNodeService.deleteCmmsOrderNodeByRelid(id);
+
+        // 删除附件
+        sysUploadFileService.deleteFileByRelId(id);
+//        List<SysUploadFile> sysUploadFileList = sysUploadFileService.selectFileList(new SysUploadFile(id, ""));
+//        System.out.println(sysUploadFileList);
+//        if(sysUploadFileList!=null || sysUploadFileList.size()>0)  sysUploadFileService.removeById(id);
+
+        return this.removeById(id);
+    }
+
 }