设备-点检功能。数据库用的设备点检记录表(T_Equipment_check)和

   设备点检内容表，(T_Equipment_check_Content)。APP端只维护设备点检记录表即可，
   设备点检内容表只用于展示，不做新增和修改操作

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentCheckController.java

@@ -3,6 +3,7 @@ package cn.wise.sc.acquisition.business.controller;
 
 import cn.wise.im.common.http.R;
 import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckDetailQuery;
 import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckMainQuery;
 import cn.wise.sc.acquisition.business.service.ITEquipmentCheckService;
 import io.swagger.annotations.*;
@@ -29,7 +30,13 @@ public class TEquipmentCheckController {
 	@Autowired
 	private ITEquipmentCheckService equipmentCheckService;
 
-	@ApiOperation(value = "设备点检分页")
+	@ApiOperation(value = "新增修改-设备点检主表&设备点检详情表")
+	@PostMapping("/checking")
+	public R update(@RequestBody TEquipmentCheckMainQuery query) {
+		return equipmentCheckService.checking(query);
+	}
+
+	@ApiOperation(value = "分页-设备点检主表")
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "EquipmentName", value = "设备名称", paramType = "query", dataType = "EquipmentName")
 	})
@@ -38,18 +45,37 @@ public class TEquipmentCheckController {
 		return equipmentCheckService.getPage(pageQuery, EquipmentName, selectMonth);
 	}
 
-	@ApiOperation(value = "设备点检详情")
-	@GetMapping("/getDetail/{EquipmentID}")
-	public R getDetail(@PathVariable @NotBlank String EquipmentID) {
-		return equipmentCheckService.getDetail(EquipmentID);
+	@ApiOperation(value = "详情-设备点检主表")
+	@GetMapping("/getDetail/{mainUid}")
+	public R getDetail(@PathVariable @NotBlank String mainUid) {
+		return equipmentCheckService.getDetail(mainUid);
 	}
 
-	@ApiOperation(value = "保存设备点检结果")
-	@PostMapping("/checking")
-	public R update(@RequestBody TEquipmentCheckMainQuery query) {
-		return equipmentCheckService.checking(query);
+
+	@ApiOperation(value = "列表-设备点检详情表")
+	@GetMapping("/getDetailList/{mainUid}")
+	public R getDetailList(@PathVariable @NotBlank String mainUid) {
+		return equipmentCheckService.getDetailList(mainUid);
+	}
+
+
+	@ApiOperation(value = "详情-设备点检详情表")
+	@GetMapping("/getCheckDetail/{detailUid}")
+	public R getCheckDetail(@PathVariable @NotBlank String detailUid) {
+		return equipmentCheckService.getCheckDetail(detailUid);
+	}
+
+	@ApiOperation(value = "修改-设备点检详情表")
+	@PostMapping("/updateDetail")
+	public R updateDetail(@RequestBody TEquipmentCheckDetailQuery query) {
+		return equipmentCheckService.updateDetail(query);
 	}
 
+	/*@ApiOperation(value = "删除点检信息")
+	@PostMapping("/delete")
+	public R delete(@NotBlank String mainUid) {
+		return equipmentCheckService.delete(mainUid);
+	}*/
 
 }
 

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TEquipmentCheckDetailQuery.java

+package cn.wise.sc.acquisition.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-6-2
+ */
+@Data
+@ApiModel("设备点检详情Query")
+public class TEquipmentCheckDetailQuery {
+
+
+    /**
+     * ID号
+     */
+    @ApiModelProperty("Uid")
+    private String uid;
+
+    /**
+     * 点检结果，正常、异常
+     */
+    @ApiModelProperty("点检结果，正常、异常")
+    private String Djjg;
+
+    /**
+     * 异常记录
+     */
+    @ApiModelProperty("异常记录")
+    private String Ycjl;
+
+    /**
+     * 点检人
+     */
+    @ApiModelProperty("点检人")
+    private String Djr;
+
+    /**
+     * 点检日期
+     */
+    @ApiModelProperty("点检日期")
+    private LocalDateTime Djrq;
+
+
+
+}

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentCheckService.java

 package cn.wise.sc.acquisition.business.service;
 
 import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.entity.TEquipmentCheckDetail;
 import cn.wise.sc.acquisition.business.entity.TEquipmentCheckMain;
 import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckDetailQuery;
 import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckMainQuery;
 import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckMainVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -18,11 +22,21 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITEquipmentCheckService extends IService<TEquipmentCheckMain> {
 
+	R checking(TEquipmentCheckMainQuery query);
+
 	R<IPage<TEquipmentCheckMainVo>> getPage(PageQuery pageQuery, String EquipmentName, String selectMonth);
 
-	R<TEquipmentCheckMain> getDetail(String EquipmentID);
+	R<TEquipmentCheckMain> getDetail(String mainUid);
+
+	R<List<TEquipmentCheckDetail>> getDetailList(String mainUid);
+
+	R<TEquipmentCheckDetail> getCheckDetail(String detailUid);
+
+	R updateDetail(TEquipmentCheckDetailQuery query);
+
+	R delete(String mainUid);
+
 
-	R checking(TEquipmentCheckMainQuery query);
 
 
 }

acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentCheckServiceImpl.java

@@ -3,15 +3,14 @@ package cn.wise.sc.acquisition.business.service.impl;
 import cn.wise.im.common.http.R;
 import cn.wise.im.common.http.ResponseEnum;
 import cn.wise.sc.acquisition.business.constant.Rcode;
-import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
 import cn.wise.sc.acquisition.business.entity.TEquipmentCheckContent;
 import cn.wise.sc.acquisition.business.entity.TEquipmentCheckDetail;
 import cn.wise.sc.acquisition.business.entity.TEquipmentCheckMain;
-import cn.wise.sc.acquisition.business.mapper.TEquipmentAccountMapper;
 import cn.wise.sc.acquisition.business.mapper.TEquipmentCheckContentMapper;
 import cn.wise.sc.acquisition.business.mapper.TEquipmentCheckDetailMapper;
 import cn.wise.sc.acquisition.business.mapper.TEquipmentCheckMapper;
 import cn.wise.sc.acquisition.business.model.PageQuery;
+import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckDetailQuery;
 import cn.wise.sc.acquisition.business.model.query.TEquipmentCheckMainQuery;
 import cn.wise.sc.acquisition.business.model.vo.TEquipmentCheckMainVo;
 import cn.wise.sc.acquisition.business.service.ITEquipmentCheckService;
@@ -25,7 +24,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -47,8 +45,6 @@ public class TEquipmentCheckServiceImpl extends ServiceImpl<TEquipmentCheckMappe
 	@Resource
 	private TEquipmentCheckMapper equipmentCheckMapper;
 	@Resource
-	private TEquipmentAccountMapper equipmentAccountMapper;
-	@Resource
 	private TEquipmentCheckContentMapper equipmentCheckContentMapper;
 	@Resource
 	private TEquipmentCheckDetailMapper equipmentCheckDetailMapper;
@@ -56,7 +52,7 @@ public class TEquipmentCheckServiceImpl extends ServiceImpl<TEquipmentCheckMappe
 	private ITSysDictService itSysDictService;
 
 	/**
-	 * 新增修改设备点检结果
+	 * 新增修改-设备点检主表&设备点检详情表
 	 * @param query
 	 * @return
 	 */
@@ -80,7 +76,6 @@ public class TEquipmentCheckServiceImpl extends ServiceImpl<TEquipmentCheckMappe
 			equipmentCheckMapper.insert(checkMain);
 		}
 
-
 		//根据设备id查找点检内容表信息，插入点检详情表
 		QueryWrapper<TEquipmentCheckContent> contentWrapper = new QueryWrapper<>();
 		contentWrapper.eq("EquipmentID", checkMain.getEquipmentID());
@@ -100,25 +95,6 @@ public class TEquipmentCheckServiceImpl extends ServiceImpl<TEquipmentCheckMappe
 			}
 		}
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 		return R.ok();
 	}
 
@@ -138,59 +114,80 @@ public class TEquipmentCheckServiceImpl extends ServiceImpl<TEquipmentCheckMappe
 		return R.ok(pages);
 	}
 
-
 	/**
-	 * 设备点检详情
-	 * @param Uid
+	 * 详情-设备点检主表
+	 * @param mainUid
 	 * @return
 	 */
 	@Override
-	public R<TEquipmentCheckMain> getDetail(String Uid) {
-		Rcode.NOT_PARAM.assertNotNull(Uid);
-		TEquipmentCheckMain checkMain = equipmentCheckMapper.selectById(Uid);
+	public R<TEquipmentCheckMain> getDetail(String mainUid) {
+		Rcode.NOT_PARAM.assertNotNull(mainUid);
+		TEquipmentCheckMain checkMain = equipmentCheckMapper.selectById(mainUid);
 		Rcode.NOT_FOUND.assertNotNull(checkMain);
 		return R.ok(checkMain);
 	}
 
-
-
-
-	//点检内容列表
-	public R getContentList(String EquipmentID) {
-		Rcode.NOT_PARAM.assertNotNull(EquipmentID);
-		QueryWrapper<TEquipmentCheckContent> contentWrapper = new QueryWrapper<>();
-		contentWrapper.eq("EquipmentID", EquipmentID);
-		List<TEquipmentCheckContent> checkList = equipmentCheckContentMapper.selectList(contentWrapper);
-		return R.ok(checkList);
-	}
-
-	//点检详情列表
-	public R getDetailList(String MainUid) {
-		Rcode.NOT_PARAM.assertNotNull(MainUid);
+	/**
+	 * 列表-设备点检详情表
+	 * @param mainUid
+	 * @return
+	 */
+	public R<List<TEquipmentCheckDetail>> getDetailList(String mainUid) {
+		Rcode.NOT_PARAM.assertNotNull(mainUid);
 		QueryWrapper<TEquipmentCheckDetail> detailWrapper = new QueryWrapper<>();
-		detailWrapper.eq("MainUid", MainUid);
+		detailWrapper.eq("MainUid", mainUid);
 		List<TEquipmentCheckDetail> checkList = equipmentCheckDetailMapper.selectList(detailWrapper);
 		return R.ok(checkList);
 	}
 
+	/**
+	 * 详情-设备点检详情表
+	 * @param detailUid
+	 * @return
+	 */
+	public R<TEquipmentCheckDetail> getCheckDetail(String detailUid) {
+		Rcode.NOT_PARAM.assertNotNull(detailUid);
+		TEquipmentCheckDetail checkDetail = equipmentCheckDetailMapper.selectById(detailUid);
+		Rcode.NOT_FOUND.assertNotNull(checkDetail);
+		return R.ok(checkDetail);
+	}
 
+	/**
+	 * 修改-设备点检详情表
+	 * @param query
+	 * @return
+	 */
+	public R updateDetail(TEquipmentCheckDetailQuery query)  {
+		Rcode.NOT_PARAM.assertNotNull(query);
+		Rcode.NOT_PARAM.assertNotNull(query.getUid());
+		Rcode.NOT_PARAM.assertNotNull(query.getDjjg());
+		Rcode.NOT_PARAM.assertNotNull(query.getDjrq());
+
+		TEquipmentCheckDetail checkDetail = equipmentCheckDetailMapper.selectById(query.getUid());
+		checkDetail.setDjjg(query.getDjjg())
+				.setYcjl(query.getYcjl())
+				.setDjr(query.getDjr())
+				.setDjrq(query.getDjrq());
+		equipmentCheckDetailMapper.updateById(checkDetail);
+		return R.ok();
+	}
 
+	/**
+	 * 删除点检信息
+	 * @param mainUid
+	 * @return
+	 */
+	public R delete(String mainUid)  {
+		Rcode.NOT_PARAM.assertNotNull(mainUid);
+		TEquipmentCheckMain checkMain = equipmentCheckMapper.selectById(mainUid);
+		Rcode.NOT_FOUND.assertNotNull(checkMain);
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+		QueryWrapper<TEquipmentCheckDetail> detailWrapper = new QueryWrapper<>();
+		detailWrapper.eq("MainUid", mainUid);
+		equipmentCheckDetailMapper.delete(detailWrapper);
+		equipmentCheckMapper.deleteById(mainUid);
+		return R.ok();
+	}
 
 
 }