Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -82,28 +82,28 @@ public class LoginController {
 		//update-begin--Author:scott  Date:20190805 for：暂时注释掉密码加密逻辑，有点问题
 
 		//update-begin-author:taoyan date:20190828 for:校验验证码
-        String captcha = sysLoginModel.getCaptcha();
-        if(captcha==null){
-            result.error500("验证码无效");
-            return result;
-        }
-        String lowerCaseCaptcha = captcha.toLowerCase();
-        //update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
-		// 加入密钥作为混淆，避免简单的拼接，被外部利用，用户自定义该密钥即可
-        String origin = lowerCaseCaptcha+sysLoginModel.getCheckKey()+jeecgBaseConfig.getSignatureSecret();
-		String realKey = Md5Util.md5Encode(origin, "utf-8");
-		//update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
-		Object checkCode = redisUtil.get(realKey);
-		//当进入登录页时，有一定几率出现验证码错误 #1714
-		if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) {
-            log.warn("验证码错误，key= {} , Ui checkCode= {}, Redis checkCode = {}", sysLoginModel.getCheckKey(), lowerCaseCaptcha, checkCode);
-			result.error500("验证码错误");
-			// 改成特殊的code 便于前端判断
-			result.setCode(HttpStatus.PRECONDITION_FAILED.value());
-			return result;
-		}
+//        String captcha = sysLoginModel.getCaptcha();
+//        if(captcha==null){
+//            result.error500("验证码无效");
+//            return result;
+//        }
+//        String lowerCaseCaptcha = captcha.toLowerCase();
+//        //update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
+//		// 加入密钥作为混淆，避免简单的拼接，被外部利用，用户自定义该密钥即可
+//        String origin = lowerCaseCaptcha+sysLoginModel.getCheckKey()+jeecgBaseConfig.getSignatureSecret();
+//		String realKey = Md5Util.md5Encode(origin, "utf-8");
+//		//update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
+//		Object checkCode = redisUtil.get(realKey);
+//		//当进入登录页时，有一定几率出现验证码错误 #1714
+//		if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) {
+//            log.warn("验证码错误，key= {} , Ui checkCode= {}, Redis checkCode = {}", sysLoginModel.getCheckKey(), lowerCaseCaptcha, checkCode);
+//			result.error500("验证码错误");
+//			// 改成特殊的code 便于前端判断
+//			result.setCode(HttpStatus.PRECONDITION_FAILED.value());
+//			return result;
+//		}
 		//update-end-author:taoyan date:20190828 for:校验验证码
-		
+
 		//1. 校验用户是否有效
 		//update-begin-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false
 		LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
@@ -122,11 +122,11 @@ public class LoginController {
 			result.error500("用户名或密码错误");
 			return result;
 		}
-				
+
 		//用户登录信息
 		userInfo(sysUser, result);
 		//update-begin--Author:liusq  Date:20210126  for：登录成功，删除redis中的验证码
-		redisUtil.del(realKey);
+//		redisUtil.del(realKey);
 		//update-begin--Author:liusq  Date:20210126  for：登录成功，删除redis中的验证码
 		LoginUser loginUser = new LoginUser();
 		BeanUtils.copyProperties(sysUser, loginUser);
@@ -161,7 +161,7 @@ public class LoginController {
 			}
 			//update-begin---author:liusq ---date:2022-06-29  for：接口返回值修改，同步修改这里的判断逻辑-----------
 			//update-end---author:scott ---date::2022-06-20  for：vue3前端，支持自定义首页--------------
-			
+
 			obj.put("userInfo",sysUser);
 			obj.put("sysAllDictItems", sysDictService.queryAllDictItems());
 			result.setResult(obj);
@@ -170,7 +170,7 @@ public class LoginController {
 		return result;
 
 	}
-	
+
 	/**
 	 * 退出登录
 	 * @param request
@@ -204,7 +204,7 @@ public class LoginController {
 	    	return Result.error("Token无效!");
 	    }
 	}
-	
+
 	/**
 	 * 获取访问量
 	 * @return
@@ -235,7 +235,7 @@ public class LoginController {
 		result.success("登录成功");
 		return result;
 	}
-	
+
 	/**
 	 * 获取访问量
 	 * @return
@@ -256,8 +256,8 @@ public class LoginController {
 		result.setResult(oConvertUtils.toLowerCasePageList(list));
 		return result;
 	}
-	
-	
+
+
 	/**
 	 * 登陆成功选择用户当前部门
 	 * @param user
@@ -282,7 +282,7 @@ public class LoginController {
 
 	/**
 	 * 短信登录接口
-	 * 
+	 *
 	 * @param jsonObject
 	 * @return
 	 */
@@ -298,12 +298,12 @@ public class LoginController {
 			result.setSuccess(false);
 			return result;
 		}
-		
+
 		//update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
 		String redisKey = CommonConstant.PHONE_REDIS_KEY_PRE+mobile;
 		Object object = redisUtil.get(redisKey);
 		//update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
-		
+
 		if (object != null) {
 			result.setMessage("验证码10分钟内，仍然有效！");
 			result.setSuccess(false);
@@ -337,7 +337,7 @@ public class LoginController {
 					}
 					return result;
 				}
-				
+
 				/**
 				 * smsmode 短信模板方式  0 .登录模板、1.注册模板、2.忘记密码模板
 				 */
@@ -355,12 +355,12 @@ public class LoginController {
 				result.setSuccess(false);
 				return result;
 			}
-			
+
 			//update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
 			//验证码10分钟内有效
 			redisUtil.set(redisKey, captcha, 600);
 			//update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
-			
+
 			//update-begin--Author:scott  Date:20190812 for：issues#391
 			//result.setResult(captcha);
 			//update-end--Author:scott  Date:20190812 for：issues#391
@@ -373,11 +373,11 @@ public class LoginController {
 		}
 		return result;
 	}
-	
+
 
 	/**
 	 * 手机号登录接口
-	 * 
+	 *
 	 * @param jsonObject
 	 * @return
 	 */
@@ -386,14 +386,14 @@ public class LoginController {
 	public Result<JSONObject> phoneLogin(@RequestBody JSONObject jsonObject) {
 		Result<JSONObject> result = new Result<JSONObject>();
 		String phone = jsonObject.getString("mobile");
-		
+
 		//校验用户有效性
 		SysUser sysUser = sysUserService.getUserByPhone(phone);
 		result = sysUserService.checkUserIsEffective(sysUser);
 		if(!result.isSuccess()) {
 			return result;
 		}
-		
+
 		String smscode = jsonObject.getString("captcha");
 
 		//update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
@@ -505,13 +505,13 @@ public class LoginController {
 			String code = RandomUtil.randomString(BASE_CHECK_CODES,4);
 			//存到redis中
 			String lowerCaseCode = code.toLowerCase();
-			
+
 			//update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
 			// 加入密钥作为混淆，避免简单的拼接，被外部利用，用户自定义该密钥即可
 			String origin = lowerCaseCode+key+jeecgBaseConfig.getSignatureSecret();
 			String realKey = Md5Util.md5Encode(origin, "utf-8");
 			//update-end-author:taoyan date:2022-9-13 for: VUEN-2245 【漏洞】发现新漏洞待处理20220906
-            
+
 			redisUtil.set(realKey, lowerCaseCode, 60);
 			log.info("获取验证码，Redis key = {}，checkCode = {}", realKey, code);
 			//返回前端
@@ -535,7 +535,7 @@ public class LoginController {
 		sysPermissionService.switchVue3Menu();
 		return res;
 	}
-	
+
 	/**
 	 * app登录
 	 * @param sysLoginModel
@@ -547,14 +547,14 @@ public class LoginController {
 		Result<JSONObject> result = new Result<JSONObject>();
 		String username = sysLoginModel.getUsername();
 		String password = sysLoginModel.getPassword();
-		
+
 		//1. 校验用户是否有效
 		SysUser sysUser = sysUserService.getUserByName(username);
 		result = sysUserService.checkUserIsEffective(sysUser);
 		if(!result.isSuccess()) {
 			return result;
 		}
-		
+
 		//2. 校验用户名或密码是否正确
 		String userpassword = PasswordUtil.encrypt(username, password, sysUser.getSalt());
 		String syspassword = sysUser.getPassword();
@@ -562,7 +562,7 @@ public class LoginController {
 			result.error500("用户名或密码错误");
 			return result;
 		}
-		
+
 		String orgCode = sysUser.getOrgCode();
 		if(oConvertUtils.isEmpty(orgCode)) {
 			//如果当前用户无选择部门 查看部门关联信息
@@ -581,7 +581,7 @@ public class LoginController {
 		JSONObject obj = new JSONObject();
 		//用户登录信息
 		obj.put("userInfo", sysUser);
-		
+
 		// 生成token
 		String token = JwtUtil.sign(username, syspassword);
 		// 设置超时时间
@@ -671,4 +671,4 @@ public class LoginController {
 		return Result.OK(result);
 	}
 
-}
+}

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/controller/CmmsInspectLineController.java

@@ -168,8 +168,9 @@ public class CmmsInspectLineController extends JeecgController<CmmsInspectLine,
 	//@AutoLog(value = "巡检路线-通过id查询")
 	@ApiOperation(value="巡检路线-通过id查询", notes="巡检路线-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<CmmsInspectLine> queryById(@RequestParam(name="id",required=true) String id) {
-		CmmsInspectLine cmmsInspectLine = cmmsInspectLineService.getById(id);
+	public Result<CmmsInspectLineVo> queryById(@RequestParam(name="id",required=true) String id) {
+		//CmmsInspectLine cmmsInspectLine = cmmsInspectLineService.getById(id);
+		CmmsInspectLineVo cmmsInspectLine = cmmsInspectLineService.getCmmsInspectLineById(id);
 		if(cmmsInspectLine==null) {
 			return Result.error("未找到对应数据");
 		}

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/convert/CmmsInspectLineConvert.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.cmmsInspectLine.convert;
+
+import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLine;
+import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLineVo;
+import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlan;
+import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlanVo;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.stream.Collectors;
+
+/**
+ * @author dzc
+ * @date 2024/1/24 14:49
+ * @package org.jeecg.modules.cmmsInspectPlan.convert
+ * @project EMS_server
+ * @des
+ */
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface CmmsInspectLineConvert {
+
+    CmmsInspectLineConvert INSTANCE = Mappers.getMapper(CmmsInspectLineConvert.class);
+
+    CmmsInspectLineVo convert(CmmsInspectLine inspectPlan);
+}

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/service/ICmmsInspectLineService.java

@@ -27,4 +27,12 @@ public interface ICmmsInspectLineService extends IService<CmmsInspectLine> {
     *   date: 2024/1/22
     */
     boolean updateCmmsInspectLine(CmmsInspectLineVo cmmsInspectLine);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 根据id查询详情
+    *   date: 2024/1/24
+    */
+    CmmsInspectLineVo getCmmsInspectLineById(String id);
 }

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

@@ -2,6 +2,9 @@ package org.jeecg.modules.cmmsInspectLine.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo;
+import org.jeecg.modules.cmmsInspectContent.service.ICmmsInspectContentService;
+import org.jeecg.modules.cmmsInspectLine.convert.CmmsInspectLineConvert;
 import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLine;
 import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLineVo;
 import org.jeecg.modules.cmmsInspectLine.mapper.CmmsInspectLineMapper;
@@ -9,7 +12,10 @@ import org.jeecg.modules.cmmsInspectLine.service.ICmmsInspectLineService;
 import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetail;
 import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetailVo;
 import org.jeecg.modules.cmmsInspectLineDetail.service.ICmmsInspectLineDetailService;
+import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
+import org.jeecg.modules.cmmsInspectSpot.service.ICmmsInspectSpotService;
 import org.jeecg.modules.cmmsInspectSpotEquip.entity.CmmsInspectSpotEquip;
+import org.jeecg.modules.cmmsInspectSpotEquip.service.ICmmsInspectSpotEquipService;
 import org.jeecg.modules.util.AutoCodeUtil;
 import org.jeecg.modules.util.UserConstants;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +44,15 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
     @Autowired
     @SuppressWarnings("all")
     private ICmmsInspectLineDetailService inspectLineDetailService;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectSpotEquipService inspectSpotEquipService;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectContentService inspectContentService;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectSpotService inspectSpotService;
 
     /**
     *   author: dzc
@@ -75,6 +90,43 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
         return this.updateById(cmmsInspectLine);
     }
 
+    @Override
+    public CmmsInspectLineVo getCmmsInspectLineById(String id) {
+        // 查询巡检路线
+        CmmsInspectLine cmmsInspectLine = this.getById(id);
+        CmmsInspectLineVo inspectLineVo = CmmsInspectLineConvert.INSTANCE.convert(cmmsInspectLine);
+
+        // 查询巡检路线详情
+        List<CmmsInspectLineDetailVo> list = inspectLineDetailService.selectCmmsInspectLineDetailList(id);
+
+        if (list != null && list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                // 查询出每个巡检的下的巡检内容
+                List<CmmsInspectSpotEquip> spotcountList = inspectSpotEquipService.getInspectSpotEquipBySprtId(list.get(i).getInspectspotid());
+                ArrayList<CmmsInspectContentVo> contentList = new ArrayList<>();
+                if (spotcountList != null && spotcountList.size() > 0) {
+                    for (int j = 0; j < spotcountList.size(); j++) {
+                        CmmsInspectContentVo cmmsInspectContent = inspectContentService.getCmmsInspectContentById(spotcountList.get(j).getInspectcontid());
+                        contentList.add(cmmsInspectContent);
+                    }
+                }
+                list.get(i).setInspectContentList(contentList);
+            }
+        }
+
+        inspectLineVo.setDetailList(list);
+
+        return inspectLineVo;
+    }
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 根据id查询巡检路线详情
+    *   date: 2024/1/24
+    */
+
+
     private void batchSaveSub(CmmsInspectLineVo cmmsInspectLine) {
         List<CmmsInspectLineDetailVo> detailList = cmmsInspectLine.getDetailList();
         ArrayList<CmmsInspectLineDetail> list = new ArrayList<>();

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLineDetail/entity/CmmsInspectLineDetailVo.java

@@ -1,8 +1,12 @@
 package org.jeecg.modules.cmmsInspectLineDetail.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo;
 import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
 import org.jeecg.modules.cmmsInspectSpotEquip.entity.CmmsInspectSpotEquip;
+import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.util.List;
 
@@ -16,5 +20,13 @@ import java.util.List;
 @Data
 public class CmmsInspectLineDetailVo extends CmmsInspectLineDetail{
 
-    private List<CmmsInspectSpotVo> inspectSpotList;
+
+    /**巡检点编号*/
+    @ApiModelProperty(value = "巡检点编号")
+    private java.lang.String contentcode;
+    /**巡检点名称*/
+    @ApiModelProperty(value = "巡检点名称")
+    private java.lang.String contentname;
+
+    private List<CmmsInspectContentVo> inspectContentList;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLineDetail/mapper/CmmsInspectLineDetailMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetailVo;
 
 /**
  * @Description: 巡检路线详情
@@ -14,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CmmsInspectLineDetailMapper extends BaseMapper<CmmsInspectLineDetail> {
 
+    List<CmmsInspectLineDetailVo> selectCmmsInspectLineDetailList(String id);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLineDetail/mapper/xml/CmmsInspectLineDetailMapper.xml

@@ -2,4 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.cmmsInspectLineDetail.mapper.CmmsInspectLineDetailMapper">
 
+
+    <resultMap type="org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetailVo" id="CmmsInspectLineDetailResult">
+        <result property="id"    column="id"    />
+        <result property="inspectlineid"    column="inspectlineid"    />
+        <result property="inspectspotid"    column="inspectspotid"    />
+        <result property="contentcode"    column="contentcode"    />
+        <result property="contentname"    column="contentname"    />
+    </resultMap>
+
+    <sql id="selectCmmsInspectLineDetailVo">
+        select id, inspectlineid, inspectspotid
+        from cmms_inspect_line_detail
+    </sql>
+
+    <select id="selectCmmsInspectLineDetailList" parameterType="String" resultMap="CmmsInspectLineDetailResult">
+        select d.id, d.inspectlineid, d.inspectspotid, c.contentcode as contentcode,
+        c.contentname as contentname
+        from cmms_inspect_line_detail as d
+        left join cmms_inspect_spot as c on d.inspectspotid=c.id
+        <where>
+            <if test="inspectlineid != null"> and d.inspectlineid = #{id}</if>
+        </where>
+    </select>
+
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLineDetail/service/ICmmsInspectLineDetailService.java

@@ -2,6 +2,9 @@ package org.jeecg.modules.cmmsInspectLineDetail.service;
 
 import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetailVo;
+
+import java.util.List;
 
 /**
  * @Description: 巡检路线详情
@@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICmmsInspectLineDetailService extends IService<CmmsInspectLineDetail> {
 
+    List<CmmsInspectLineDetailVo> selectCmmsInspectLineDetailList(String id);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLineDetail/service/impl/CmmsInspectLineDetailServiceImpl.java

@@ -1,12 +1,16 @@
 package org.jeecg.modules.cmmsInspectLineDetail.service.impl;
 
 import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetail;
+import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetailVo;
 import org.jeecg.modules.cmmsInspectLineDetail.mapper.CmmsInspectLineDetailMapper;
 import org.jeecg.modules.cmmsInspectLineDetail.service.ICmmsInspectLineDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 巡检路线详情
  * @Author: jeecg-boot
@@ -16,4 +20,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class CmmsInspectLineDetailServiceImpl extends ServiceImpl<CmmsInspectLineDetailMapper, CmmsInspectLineDetail> implements ICmmsInspectLineDetailService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private CmmsInspectLineDetailMapper inspectLineDetailMapper;
+
+    @Override
+    public List<CmmsInspectLineDetailVo> selectCmmsInspectLineDetailList(String id) {
+        return inspectLineDetailMapper.selectCmmsInspectLineDetailList(id);
+    }
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/controller/CmmsInspectPlanController.java

@@ -158,8 +158,9 @@ public class CmmsInspectPlanController extends JeecgController<CmmsInspectPlan,
 	//@AutoLog(value = "巡检计划-通过id查询")
 	@ApiOperation(value="巡检计划-通过id查询", notes="巡检计划-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<CmmsInspectPlan> queryById(@RequestParam(name="id",required=true) String id) {
-		CmmsInspectPlan cmmsInspectPlan = cmmsInspectPlanService.getById(id);
+	public Result<CmmsInspectPlanVo> queryById(@RequestParam(name="id",required=true) String id) {
+		//CmmsInspectPlan cmmsInspectPlan = cmmsInspectPlanService.getById(id);
+		CmmsInspectPlanVo cmmsInspectPlan = cmmsInspectPlanService.getCmmsInspectPlanById(id);
 		if(cmmsInspectPlan==null) {
 			return Result.error("未找到对应数据");
 		}

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/convert/CmmsInspectPlanConvert.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.cmmsInspectPlan.convert;
+
+import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlan;
+import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlanVo;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+import org.springframework.util.CollectionUtils;
+
+import java.util.stream.Collectors;
+
+/**
+ * @author dzc
+ * @date 2024/1/24 14:49
+ * @package org.jeecg.modules.cmmsInspectPlan.convert
+ * @project EMS_server
+ * @des
+ */
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE,imports ={ CollectionUtils.class, Collectors.class})
+public interface CmmsInspectPlanConvert {
+
+    CmmsInspectPlanConvert INSTANCE = Mappers.getMapper(CmmsInspectPlanConvert.class);
+
+    CmmsInspectPlanVo convert(CmmsInspectPlan inspectPlan);
+}

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/entity/CmmsInspectPlan.java

@@ -40,16 +40,16 @@ public class CmmsInspectPlan implements Serializable {
     @ApiModelProperty(value = "创建者")
     private java.lang.String createBy;
 	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;
 	/**更新者*/
     @ApiModelProperty(value = "更新者")
     private java.lang.String updateBy;
 	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
 	/**备注*/
@@ -69,9 +69,9 @@ public class CmmsInspectPlan implements Serializable {
     @ApiModelProperty(value = "是否开启时间设置：Y是、N否")
     private java.lang.String iftimeset;
 	/**开始时间*/
-	@Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
     private java.util.Date begintime;
 	/**重复*/
@@ -99,9 +99,9 @@ public class CmmsInspectPlan implements Serializable {
     @ApiModelProperty(value = "待办人")
     private java.lang.String chargeruser;
 	/**下次执行时间*/
-	@Excel(name = "下次执行时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "下次执行时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "下次执行时间")
     private java.util.Date nexttime;
 	/**任务数量*/
@@ -109,9 +109,9 @@ public class CmmsInspectPlan implements Serializable {
     @ApiModelProperty(value = "任务数量")
     private java.lang.Integer tasknum;
 	/**下次通知时间*/
-	@Excel(name = "下次通知时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+	@Excel(name = "下次通知时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "下次通知时间")
     private java.util.Date noticetime;
 	/**是否已通知：是/否*/

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/entity/CmmsInspectPlanVo.java

@@ -17,7 +17,7 @@ import java.util.List;
 @Data
 public class CmmsInspectPlanVo extends CmmsInspectPlan{
 
-    @ApiModelProperty(value = "任务数量")
+    @ApiModelProperty(value = "任务")
     private List<CmmsInspectPlanTaskVo> taskList;
 
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/service/ICmmsInspectPlanService.java

@@ -51,4 +51,12 @@ public interface ICmmsInspectPlanService extends IService<CmmsInspectPlan> {
     *   date: 2024/1/23
     */
     boolean updateCmmsInspectPlanStatus(CmmsInspectPlanVo cmmsInspectPlan);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 根据id查询
+    *   date: 2024/1/24
+    */
+    CmmsInspectPlanVo getCmmsInspectPlanById(String id);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/service/impl/CmmsInspectPlanServiceImpl.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.cmmsInspectPlan.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.jeecg.common.util.RedisUtil;
+import org.jeecg.modules.cmmsInspectLine.service.ICmmsInspectLineService;
+import org.jeecg.modules.cmmsInspectPlan.convert.CmmsInspectPlanConvert;
 import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlan;
 import org.jeecg.modules.cmmsInspectPlan.entity.CmmsInspectPlanVo;
 import org.jeecg.modules.cmmsInspectPlan.mapper.CmmsInspectPlanMapper;
@@ -10,6 +12,7 @@ import org.jeecg.modules.cmmsInspectPlan.service.ICmmsInspectPlanService;
 import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTask;
 import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTaskVo;
 import org.jeecg.modules.cmmsInspectPlanTask.service.ICmmsInspectPlanTaskService;
+import org.jeecg.modules.cmmsInspectSpot.service.ICmmsInspectSpotService;
 import org.jeecg.modules.util.AutoCodeUtil;
 import org.jeecg.modules.util.CacheKey;
 import org.jeecg.modules.util.PlanToOrderUtils;
@@ -43,6 +46,12 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
     @Autowired
     @SuppressWarnings("all")
     private RedisUtil redisUtil;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectSpotService inspectSpotService;
+    @Autowired
+    @SuppressWarnings("all")
+    private ICmmsInspectLineService inspectLineService;
 
 
     /**
@@ -55,34 +64,20 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
     public boolean addCmmsInspectPlan(CmmsInspectPlanVo cmmsInspectPlan) {
         CmmsInspectPlan inspectPlan = new CmmsInspectPlan();
         PlanToOrderUtils planToOrderUtils = new PlanToOrderUtils();
-        if (cmmsInspectPlan.getBegintime() != null) inspectPlan.setBegintime(cmmsInspectPlan.getBegintime());
-        if (cmmsInspectPlan.getChargeruser() != null) inspectPlan.setChargeruser(cmmsInspectPlan.getChargeruser());
-        if (cmmsInspectPlan.getIftimeset() != null) inspectPlan.setIftimeset(cmmsInspectPlan.getIftimeset());
-        if (cmmsInspectPlan.getNoticenum() != null) inspectPlan.setNoticenum(cmmsInspectPlan.getNoticenum());
-        if (cmmsInspectPlan.getNoticetype() != null) inspectPlan.setNoticetype(cmmsInspectPlan.getNoticetype());
-        if (cmmsInspectPlan.getPlanname() != null) inspectPlan.setPlanname(cmmsInspectPlan.getPlanname());
-        if (cmmsInspectPlan.getRemark() != null) inspectPlan.setRemark(cmmsInspectPlan.getRemark());
-        if (cmmsInspectPlan.getRepeatnum() != null) inspectPlan.setRepeatnum(cmmsInspectPlan.getRepeatnum());
-        if (cmmsInspectPlan.getRepeattype() != null) inspectPlan.setRepeattype(cmmsInspectPlan.getRepeattype());
-        if (cmmsInspectPlan.getStatus() != null) inspectPlan.setStatus(cmmsInspectPlan.getStatus());
-
-
-
-
         // 下次执行时间
-        inspectPlan.setNexttime(cmmsInspectPlan.getBegintime());
+        cmmsInspectPlan.setNexttime(cmmsInspectPlan.getBegintime());
         // 是否已经通知
-        inspectPlan.setIfnotice("否");
+        cmmsInspectPlan.setIfnotice("否");
         // 下次通知时间
-        inspectPlan.setNoticetime(planToOrderUtils.generateNoticeTime(cmmsInspectPlan.getBegintime(),cmmsInspectPlan.getNoticenum(),cmmsInspectPlan.getNoticetype()));
+        cmmsInspectPlan.setNoticetime(planToOrderUtils.generateNoticeTime(cmmsInspectPlan.getBegintime(),cmmsInspectPlan.getNoticenum(),cmmsInspectPlan.getNoticetype()));
         // 巡检计划编码
         if (cmmsInspectPlan.getPlancode() == null || "".equals(cmmsInspectPlan.getPlancode())){
-            inspectPlan.setPlancode(autoCodeUtil.genSerialCode(UserConstants.CMMSINSPECTPLAN_CODE, null));
+            cmmsInspectPlan.setPlancode(autoCodeUtil.genSerialCode(UserConstants.CMMSINSPECTPLAN_CODE, null));
         }
         // 任务数量
-        inspectPlan.setTasknum(cmmsInspectPlan.getTaskList().size());
+        cmmsInspectPlan.setTasknum(cmmsInspectPlan.getTaskList().size());
         // 添加巡检计划
-        boolean b = this.save(inspectPlan);
+        boolean b = this.save(cmmsInspectPlan);
         // 保存巡检计划-任务
         batchSaveSub(cmmsInspectPlan);
         // 放入缓存中
@@ -170,6 +165,35 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
     /**
     *   author: dzc
     *   version: 1.0
+    *   des: 根据id查询
+    *   date: 2024/1/24
+    */
+    @Override
+    public CmmsInspectPlanVo getCmmsInspectPlanById(String id) {
+        CmmsInspectPlan cmmsInspectPlan = this.getById(id);
+        CmmsInspectPlanVo cmmsInspectPlanVo = CmmsInspectPlanConvert.INSTANCE.convert(cmmsInspectPlan);
+
+        List<CmmsInspectPlanTaskVo> taskList = inspectPlanTaskService.getTaskByPlanId(id);
+
+        if (taskList != null && taskList.size() > 0) {
+            for (int i = 0; i < taskList.size(); i++) {
+                String relid = taskList.get(i).getRelid();
+                if ("巡检点".equals(taskList.get(i).getTasktype())){
+                    taskList.get(i).setInspectSpotVo(inspectSpotService.getCmmsInspectSpotListById(relid));
+                }else {
+                    taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineById(relid));
+                }
+            }
+        }
+
+        cmmsInspectPlanVo.setTaskList(taskList);
+
+        return cmmsInspectPlanVo;
+    }
+
+    /**
+    *   author: dzc
+    *   version: 1.0
     *   des: 批量添加 巡检计划 - 任务
     *   date: 2024/1/23
     */

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlanTask/mapper/CmmsInspectPlanTaskMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTask;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTaskVo;
 
 /**
  * @Description: 巡检计划-任务
@@ -14,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CmmsInspectPlanTaskMapper extends BaseMapper<CmmsInspectPlanTask> {
 
+    List<CmmsInspectPlanTaskVo> getTaskByPlanId(@Param("id") String id);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlanTask/mapper/xml/CmmsInspectPlanTaskMapper.xml

@@ -2,4 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.cmmsInspectPlanTask.mapper.CmmsInspectPlanTaskMapper">
 
+
+    <resultMap type="org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTaskVo" id="CmmsInspectPlanTaskResult">
+        <result property="id"    column="id"    />
+        <result property="inspectplanid"    column="inspectplanid"    />
+        <result property="tasktype"    column="tasktype"    />
+        <result property="relid"    column="relid"    />
+        <result property="ifmustexec"    column="ifmustexec"    />
+
+        <result property="linecode"    column="linecode"    />
+        <result property="linename"    column="linename"    />
+
+        <result property="contentcode"    column="contentcode"    />
+        <result property="contentname"    column="contentname"    />
+        <result property="equipdefid"    column="equipdefid"    />
+        <result property="equipdefname"    column="equipdefname"    />
+    </resultMap>
+
+    <sql id="selectCmmsInspectPlanTaskVo">
+        select id, inspectplanid, tasktype, relid, ifmustexec
+        from cmms_inspect_plan_task
+    </sql>
+
+    <select id="getTaskByPlanId" parameterType="String" resultMap="CmmsInspectPlanTaskResult">
+        <include refid="selectCmmsInspectPlanTaskVo"/>
+        where inspectplanid = #{id}
+    </select>
 </mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlanTask/service/ICmmsInspectPlanTaskService.java

@@ -2,6 +2,9 @@ package org.jeecg.modules.cmmsInspectPlanTask.service;
 
 import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTask;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTaskVo;
+
+import java.util.List;
 
 /**
  * @Description: 巡检计划-任务
@@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICmmsInspectPlanTaskService extends IService<CmmsInspectPlanTask> {
 
+    List<CmmsInspectPlanTaskVo> getTaskByPlanId(String id);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlanTask/service/impl/CmmsInspectPlanTaskServiceImpl.java

@@ -1,12 +1,16 @@
 package org.jeecg.modules.cmmsInspectPlanTask.service.impl;
 
 import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTask;
+import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTaskVo;
 import org.jeecg.modules.cmmsInspectPlanTask.mapper.CmmsInspectPlanTaskMapper;
 import org.jeecg.modules.cmmsInspectPlanTask.service.ICmmsInspectPlanTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 巡检计划-任务
  * @Author: jeecg-boot
@@ -16,4 +20,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class CmmsInspectPlanTaskServiceImpl extends ServiceImpl<CmmsInspectPlanTaskMapper, CmmsInspectPlanTask> implements ICmmsInspectPlanTaskService {
 
+    @Autowired
+    @SuppressWarnings("all")
+    private CmmsInspectPlanTaskMapper inspectPlanTaskMapper;
+
+    @Override
+    public List<CmmsInspectPlanTaskVo> getTaskByPlanId(String id) {
+        return inspectPlanTaskMapper.getTaskByPlanId(id);
+    }
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/entity/CmmsInspectSpotVo.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.cmmsInspectSpot.entity;
 
 import lombok.Data;
 import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContent;
+import org.jeecg.modules.cmmsInspectContent.entity.CmmsInspectContentVo;
 import org.jeecg.modules.cmmsInspectSpotEquip.entity.CmmsInspectSpotEquip;
 
 import java.util.List;
@@ -17,5 +18,5 @@ import java.util.List;
 public class CmmsInspectSpotVo extends CmmsInspectSpot{
     private String equipdefname;
 
-    private List<CmmsInspectContent> inspectContentList;
+    private List<CmmsInspectContentVo> inspectContentList;
 }

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

@@ -94,7 +94,7 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
 
         // 根据 巡检点的id 查询出巡检点-巡检内容的信息
         List<CmmsInspectSpotEquip> list = inspectSpotEquipService.getInspectSpotEquipBySprtId(cmmsInspectSport.getId());
-        ArrayList<CmmsInspectContent> contList = new ArrayList<>();
+        ArrayList<CmmsInspectContentVo> contList = new ArrayList<>();
         for (CmmsInspectSpotEquip eq:list) {
             String equipmentid = eq.getInspectcontid();
             CmmsInspectContentVo cmmsInspectContent = iCmmsInspectContentService.getCmmsInspectContentById(equipmentid);
@@ -116,7 +116,7 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
     }
 
     private void insertCmmsInspectcheckContentItem(CmmsInspectSpotVo cmmsInspectSpot) {
-        List<CmmsInspectContent> list = cmmsInspectSpot.getInspectContentList();
+        List<CmmsInspectContentVo> list = cmmsInspectSpot.getInspectContentList();
         String id = cmmsInspectSpot.getId();
         if (ObjectUtil.isNotNull(list)){
             ArrayList<CmmsInspectSpotEquip> list1 = new ArrayList<>();

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContent/controller/CmmsSpotcheckContentController.java

@@ -17,6 +17,7 @@ import org.jeecg.modules.cmmsSpotcheckContent.service.ICmmsSpotcheckContentServi
 import org.jeecg.modules.cmmsSpotcheckContent.vo.CmmsSpotcheckContentQueryVO;
 import org.jeecg.modules.cmmsSpotcheckContentItem.entity.CmmsSpotcheckContentItem;
 import org.jeecg.modules.cmmsSpotcheckContentItem.service.ICmmsSpotcheckContentItemService;
+import org.jeecg.modules.cmmsSpotcheckContentItem.vo.CmmsSpotcheckContentItemVO;
 import org.jeecg.modules.util.AutoCodeUtil;
 import org.jeecg.modules.util.UserConstants;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,10 +60,10 @@ public class CmmsSpotcheckContentController extends JeecgController<CmmsSpotchec
 		if(cmmsSpotcheckContent==null) {
 			return Result.error("未找到对应数据");
 		}
-		Map<String, Object> columnMap = new HashMap<>();
-		columnMap.put("spotcheckcontid",cmmsSpotcheckContent.getId());
-		List<CmmsSpotcheckContentItem> spotcheckContentItemList = spotcheckContentItemService.listByMap(columnMap);
-		CmmsSpotcheckContentQueryVO vo = CmmsSpotcheckContentConvert.INSTANCE.convertVo(cmmsSpotcheckContent,spotcheckContentItemList);
+		CmmsSpotcheckContentItem contentItem = new CmmsSpotcheckContentItem();
+		contentItem.setSpotcheckcontid(id);
+		List<CmmsSpotcheckContentItemVO> contentItemVOList = spotcheckContentItemService.selectCmmsSpotcheckContentItemList(contentItem);
+		CmmsSpotcheckContentQueryVO vo = CmmsSpotcheckContentConvert.INSTANCE.convertVo(cmmsSpotcheckContent,contentItemVOList);
 		return Result.OK(vo);
 	}
 

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContent/convert/CmmsSpotcheckContentConvert.java

@@ -7,6 +7,7 @@ import org.jeecg.modules.cmmsSpotcheckContent.dto.CmmsSpotcheckContentAddDTO;
 import org.jeecg.modules.cmmsSpotcheckContent.entity.CmmsSpotcheckContent;
 import org.jeecg.modules.cmmsSpotcheckContent.vo.CmmsSpotcheckContentQueryVO;
 import org.jeecg.modules.cmmsSpotcheckContentItem.entity.CmmsSpotcheckContentItem;
+import org.jeecg.modules.cmmsSpotcheckContentItem.vo.CmmsSpotcheckContentItemVO;
 import org.jeecg.modules.cmmsSpotcheckTitem.entity.CmmsSpotcheckTitem;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 import org.mapstruct.Mapper;
@@ -26,7 +27,7 @@ public interface CmmsSpotcheckContentConvert {
 
     CmmsSpotcheckContent convert(CmmsSpotcheckContentAddDTO dto);
 
-    CmmsSpotcheckContentQueryVO convertVo(CmmsSpotcheckContent cmmsSpotcheckContent, List<CmmsSpotcheckContentItem> spotcheckContentItemList);
+    CmmsSpotcheckContentQueryVO convertVo(CmmsSpotcheckContent cmmsSpotcheckContent, List<CmmsSpotcheckContentItemVO> spotcheckContentItemList);
 
     @Mapping(target = "cmmsSpotcheckTitemList",source = "titemList")
     @Mapping(target = "files",source = "files")

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContent/vo/CmmsSpotcheckContentQueryVO.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecg.modules.cmmsSpotcheckContentItem.entity.CmmsSpotcheckContentItem;
+import org.jeecg.modules.cmmsSpotcheckContentItem.vo.CmmsSpotcheckContentItemVO;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -64,5 +64,5 @@ public class CmmsSpotcheckContentQueryVO  implements Serializable {
     private java.lang.String remark;
 
     /**点检内容-点检项集合*/
-    private List<CmmsSpotcheckContentItem> spotcheckContentItemList ;
+    private List<CmmsSpotcheckContentItemVO> spotcheckContentItemList ;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContentItem/mapper/CmmsSpotcheckContentItemMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cmmsSpotcheckContentItem.entity.CmmsSpotcheckContentItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsSpotcheckContentItem.vo.CmmsSpotcheckContentItemVO;
 
 /**
  * @Description: 点检内容-点检项
@@ -14,4 +15,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CmmsSpotcheckContentItemMapper extends BaseMapper<CmmsSpotcheckContentItem> {
 
+    /**
+     * 查询点检内容-点检项列表
+     *
+     * @param cmmsSpotcheckContentItem 点检内容-点检项
+     * @return 点检内容-点检项集合
+     */
+    public List<CmmsSpotcheckContentItemVO> selectCmmsSpotcheckContentItemList(CmmsSpotcheckContentItem cmmsSpotcheckContentItem);
+
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContentItem/mapper/xml/CmmsSpotcheckContentItemMapper.xml

@@ -2,4 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.cmmsSpotcheckContentItem.mapper.CmmsSpotcheckContentItemMapper">
 
-</mapper>
+
+    <resultMap type="org.jeecg.modules.cmmsSpotcheckContentItem.vo.CmmsSpotcheckContentItemVO" id="CmmsSpotcheckContentItemVOResult">
+        <result property="id"    column="id"    />
+        <result property="spotcheckcontid"    column="spotcheckcontid"    />
+        <result property="spotcheckitemid"    column="spotcheckitemid"    />
+        <result property="itemcode"    column="itemcode"    />
+        <result property="itemname"    column="itemname"    />
+        <result property="equipmenttreeid"    column="equipmenttreeid"    />
+        <result property="conditions"    column="conditions"    />
+        <result property="itemtype"    column="itemtype"    />
+        <result property="tag"    column="tag"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <select id="selectCmmsSpotcheckContentItemList" parameterType="org.jeecg.modules.cmmsSpotcheckContentItem.entity.CmmsSpotcheckContentItem" resultMap="CmmsSpotcheckContentItemVOResult">
+        select b.id, b.spotcheckcontid, b.spotcheckitemid, i.itemcode, i.itemname,
+        i.equipmenttreeid, i.conditions, i.itemtype, i.tag, i.remark
+        from cmms_spotcheck_content_item as b
+        left join cmms_spotcheck_item as i on b.spotcheckitemid = i.id
+        <where>
+            <if test="spotcheckcontid != null "> and b.spotcheckcontid = #{spotcheckcontid}</if>
+        </where>
+    </select>
+
+
+</mapper>

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContentItem/service/ICmmsSpotcheckContentItemService.java

@@ -2,6 +2,9 @@ package org.jeecg.modules.cmmsSpotcheckContentItem.service;
 
 import org.jeecg.modules.cmmsSpotcheckContentItem.entity.CmmsSpotcheckContentItem;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsSpotcheckContentItem.vo.CmmsSpotcheckContentItemVO;
+
+import java.util.List;
 
 /**
  * @Description: 点检内容-点检项
@@ -11,4 +14,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICmmsSpotcheckContentItemService extends IService<CmmsSpotcheckContentItem> {
 
+    /**
+     * 查询点检内容-点检项列表
+     *
+     * @param cmmsSpotcheckContentItem 点检内容-点检项
+     * @return 点检内容-点检项
+     */
+    public List<CmmsSpotcheckContentItemVO> selectCmmsSpotcheckContentItemList(CmmsSpotcheckContentItem cmmsSpotcheckContentItem);
+
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContentItem/service/impl/CmmsSpotcheckContentItemServiceImpl.java

@@ -3,10 +3,14 @@ package org.jeecg.modules.cmmsSpotcheckContentItem.service.impl;
 import org.jeecg.modules.cmmsSpotcheckContentItem.entity.CmmsSpotcheckContentItem;
 import org.jeecg.modules.cmmsSpotcheckContentItem.mapper.CmmsSpotcheckContentItemMapper;
 import org.jeecg.modules.cmmsSpotcheckContentItem.service.ICmmsSpotcheckContentItemService;
+import org.jeecg.modules.cmmsSpotcheckContentItem.vo.CmmsSpotcheckContentItemVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 点检内容-点检项
  * @Author: jeecg-boot
@@ -16,4 +20,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class CmmsSpotcheckContentItemServiceImpl extends ServiceImpl<CmmsSpotcheckContentItemMapper, CmmsSpotcheckContentItem> implements ICmmsSpotcheckContentItemService {
 
+    @Autowired
+    private CmmsSpotcheckContentItemMapper cmmsSpotcheckContentItemMapper;
+
+    /**
+     * 查询点检内容-点检项列表
+     *
+     * @param cmmsSpotcheckContentItem 点检内容-点检项
+     * @return 点检内容-点检项
+     */
+    @Override
+    public List<CmmsSpotcheckContentItemVO> selectCmmsSpotcheckContentItemList(CmmsSpotcheckContentItem cmmsSpotcheckContentItem)
+    {
+        return cmmsSpotcheckContentItemMapper.selectCmmsSpotcheckContentItemList(cmmsSpotcheckContentItem);
+    }
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsSpotcheckContentItem/vo/CmmsSpotcheckContentItemVO.java

@@ -0,0 +1,63 @@
+package org.jeecg.modules.cmmsSpotcheckContentItem.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+
+@Data
+public class CmmsSpotcheckContentItemVO  implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+    /**点检内容id*/
+    @Excel(name = "点检内容id", width = 15)
+    @ApiModelProperty(value = "点检内容id")
+    private java.lang.String spotcheckcontid;
+    /**点检项id*/
+    @Excel(name = "点检项id", width = 15)
+    @ApiModelProperty(value = "点检项id")
+    private java.lang.String spotcheckitemid;
+
+
+    /**
+     * 点检项的内容
+     */
+    /**名称*/
+    @Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private java.lang.String itemname;
+    /**设备类型ID*/
+    @Excel(name = "设备类型ID", width = 15, dictTable = "tpm_equipment_tree", dicText = "name", dicCode = "id")
+    @Dict(dictTable = "tpm_equipment_tree", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "设备类型ID")
+    private java.lang.String equipmenttreeid;
+    /**点检项编号*/
+    @Excel(name = "点检项编号", width = 15)
+    @ApiModelProperty(value = "点检项编号")
+    private java.lang.String itemcode;
+    /**标准*/
+    @Excel(name = "标准", width = 15)
+    @ApiModelProperty(value = "标准")
+    private java.lang.String conditions;
+    /**点检项分类*/
+    @Excel(name = "点检项分类", width = 15, dicCode = "spotcheck_item_type")
+    @Dict(dicCode = "spotcheck_item_type")
+    @ApiModelProperty(value = "点检项分类")
+    private java.lang.String itemtype;
+    /**标签*/
+    @Excel(name = "标签", width = 15)
+    @ApiModelProperty(value = "标签")
+    private java.lang.String tag;
+    /**备注*/
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+
+}