Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/controller/CmmsInspectContentController.java

@@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.cmmsInspectContentItem.entity.CmmsInspectContentItem;
 import org.jeecg.modules.cmmsInspectContentItem.service.ICmmsInspectContentItemService;
+import org.jeecg.modules.cmmsSpotcheckContent.entity.CmmsSpotcheckContent;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -208,7 +209,7 @@ public class CmmsInspectContentController extends JeecgController<CmmsInspectCon
 		//QueryWrapper<CmmsInspectContent> quer = new QueryWrapper<>();
 		////quer.and(i -> i.eq("id",cmmsInspectContent.getId()).eq("status",cmmsInspectContent.getStatus()));
 		//quer.eq("id",cmmsInspectContent.getId());
-		boolean b = cmmsInspectContentService.updateStatua(cmmsInspectContent.getId(),cmmsInspectContent.getStatus());
+		boolean b = cmmsInspectContentService.updateStatua(cmmsInspectContent);
 		if (b) {
 			return Result.OK("操作成功!");
 		}

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

@@ -47,6 +47,7 @@ public class CmmsInspectContent implements Serializable {
 	/**设备id*/
 	@Excel(name = "设备id", width = 15)
     @ApiModelProperty(value = "设备id")
+    @Dict(dictTable = "tpm_equipment", dicText = "equipmentname", dicCode = "id")
     private java.lang.String equipmentid;
 	/**状态：启用：0、禁用:1*/
 	@Excel(name = "状态：启用：0、禁用:1", width = 15, dicCode = "common_status")

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

@@ -23,4 +23,6 @@ public interface CmmsInspectContentMapper extends BaseMapper<CmmsInspectContent>
     boolean updateStatua(@Param("id") String id,@Param("status") String status);
 
     CmmsInspectContentVo getCmmsInspectContentByEqId(@Param("eqid") String eqid);
+
+    boolean updateStatusIs1(@Param("equipmentid") String equipmentid);
 }

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

@@ -50,6 +50,12 @@
         where id = #{id}
     </update>
 
+    <update id="updateStatusIs1">
+        update cmms_inspect_content
+        set status = '1'
+        where equipmentid = #{equipmentid}
+    </update>
+
 
     <select id="getCmmsInspectContentByEqId" parameterType="String" resultMap="CmmsSpotcheckContentResult">
         select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/service/ICmmsInspectContentService.java

@@ -34,7 +34,7 @@ public interface ICmmsInspectContentService extends IService<CmmsInspectContent>
 
     CmmsInspectContentVo getCmmsInspectContentTreeByIdA(String id,String inspectid,String tasktype);
 
-    boolean updateStatua(String id,String status);
+    boolean updateStatua(CmmsInspectContentVo cmmsInspectContent);
 
     CmmsInspectContentVo getCmmsInspectContentByEqId(String eqid);
 

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/service/impl/CmmsInspectContentServiceImpl.java

@@ -153,8 +153,11 @@ public class CmmsInspectContentServiceImpl extends ServiceImpl<CmmsInspectConten
     }
 
     @Override
-    public boolean updateStatua(String id,String status) {
-        return inspectContentMapper.updateStatua(id,status);
+    public boolean updateStatua(CmmsInspectContentVo cmmsInspectContent) {
+        // 修改该设备其余巡检内容的状态为"停用"
+        inspectContentMapper.updateStatusIs1(cmmsInspectContent.getEquipmentid());
+
+        return inspectContentMapper.updateStatua(cmmsInspectContent.getId(),cmmsInspectContent.getStatus());
     }
 
     @Override