计划加上实施情况

cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanConsumablesPurchaseController.java

@@ -3,6 +3,7 @@ package cn.wise.sc.cement.business.controller;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.PlanConsumablesPurchaseQuery;
+import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
 import cn.wise.sc.cement.business.model.query.PlanStandardPurchaseQuery;
 import cn.wise.sc.cement.business.service.IPlanConsumablesPurchaseService;
 import io.swagger.annotations.Api;
@@ -93,9 +94,9 @@ public class PlanConsumablesPurchaseController {
 
 	@ApiOperation(value = "采购完成")
 	@PostMapping("/finish")
-	public BaseResponse finish(Integer id) {
+	public BaseResponse finish(PlanFinishQuery query) {
 		try {
-			return consumablesPurchaseService.finish(id);
+			return consumablesPurchaseService.finish(query);
 		} catch (Exception e) {
 			log.debug("采购完成{}", e);
 		}

cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanEquipmentMaintainController.java

@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.PlanEquipmentMaintainQuery;
 import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
+import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
 import cn.wise.sc.cement.business.service.IPlanEquipmentMaintainService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -93,9 +94,9 @@ public class PlanEquipmentMaintainController {
 
 	@ApiOperation(value = "维护完成")
 	@PostMapping("/finish")
-	public BaseResponse finish(Integer id) {
+	public BaseResponse finish(PlanFinishQuery query) {
 		try {
-			return equipmentMaintainService.finish(id);
+			return equipmentMaintainService.finish(query);
 		} catch (Exception e) {
 			log.debug("维护完成{}", e);
 		}

cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanEquipmentPurchaseController.java

@@ -37,12 +37,13 @@ public class PlanEquipmentPurchaseController {
 
 	@ApiOperation(value = "设备采购计划分页列表")
 	@ApiImplicitParams(value = {
-			@ApiImplicitParam(name = "name", value = "产品名称", paramType = "query", dataType = "String")
+			@ApiImplicitParam(name = "name", value = "产品名称", paramType = "query", dataType = "String"),
+			@ApiImplicitParam(name = "status", value = "状态：0待采购，1已完成", paramType = "query", dataType = "Integer")
 	})
 	@GetMapping("/getPage")
-	public BaseResponse getPage(PageQuery pageQuery, String name) {
+	public BaseResponse getPage(PageQuery pageQuery, String name, Integer status) {
 		try {
-			return equipmentPurchaseService.getPage(pageQuery, name);
+			return equipmentPurchaseService.getPage(pageQuery, name, status);
 		} catch (Exception e) {
 			log.debug("设备采购计划分页列表{}", e);
 		}
@@ -51,9 +52,9 @@ public class PlanEquipmentPurchaseController {
 
 	@ApiOperation("设备采购计划列表导出")
 	@PostMapping("/export")
-	public void export(String name, String fileName, HttpServletResponse response) {
+	public void export(String name, String fileName, Integer status, HttpServletResponse response) {
 		try {
-			equipmentPurchaseService.export(name, fileName, response);
+			equipmentPurchaseService.export(name, fileName, status, response);
 		} catch (Exception e) {
 			log.debug("设备采购计划列表导出{}", e);
 		}

cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanEquipmentRepairController.java

@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
 import cn.wise.sc.cement.business.model.query.PlanEquipmentRepairQuery;
+import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
 import cn.wise.sc.cement.business.service.IPlanEquipmentRepairService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -93,9 +94,9 @@ public class PlanEquipmentRepairController {
 
 	@ApiOperation(value = "维修完成")
 	@PostMapping("/finish")
-	public BaseResponse finish(Integer id) {
+	public BaseResponse finish(PlanFinishQuery query) {
 		try {
-			return equipmentRepairService.finish(id);
+			return equipmentRepairService.finish(query);
 		} catch (Exception e) {
 			log.debug("维修完成{}", e);
 		}

cement-business/src/main/java/cn/wise/sc/cement/business/controller/PlanStandardPurchaseController.java

@@ -3,6 +3,7 @@ package cn.wise.sc.cement.business.controller;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
+import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
 import cn.wise.sc.cement.business.model.query.PlanStandardPurchaseQuery;
 import cn.wise.sc.cement.business.service.IPlanStandardPurchaseService;
 import io.swagger.annotations.Api;
@@ -94,9 +95,9 @@ public class PlanStandardPurchaseController {
 
 	@ApiOperation(value = "采购完成")
 	@PostMapping("/finish")
-	public BaseResponse finish(Integer id) {
+	public BaseResponse finish(PlanFinishQuery query) {
 		try {
-			return standardPurchaseService.finish(id);
+			return standardPurchaseService.finish(query);
 		} catch (Exception e) {
 			log.debug("采购完成{}", e);
 		}

cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanConsumablesPurchase.java

@@ -67,6 +67,9 @@ public class PlanConsumablesPurchase implements Serializable {
 	@ApiModelProperty("状态（0禁用，1已启用）")
 	private Integer status;
 
+	@ApiModelProperty("实施情况")
+	private String implementation;
+
 	@ApiModelProperty("创建时间")
 	private LocalDateTime createTime;
 

cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanEquipmentMaintain.java

@@ -71,6 +71,9 @@ public class PlanEquipmentMaintain implements Serializable {
 	@ApiModelProperty("状态（0待完成，1已完成）")
 	private Integer status;
 
+	@ApiModelProperty("实施情况")
+	private String implementation;
+
 	@ApiModelProperty("创建时间")
 	private LocalDateTime createTime;
 

cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanEquipmentRepair.java

@@ -64,6 +64,9 @@ public class PlanEquipmentRepair implements Serializable {
 	@ApiModelProperty("状态（0待完成，1已完成）")
 	private Integer status;
 
+	@ApiModelProperty("实施情况")
+	private String implementation;
+
 	@ApiModelProperty("创建时间")
 	private LocalDateTime createTime;
 

cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanStandardPurchase.java

@@ -62,6 +62,9 @@ public class PlanStandardPurchase implements Serializable {
 	@ApiModelProperty("状态（0禁用，1已启用）")
 	private Integer status;
 
+	@ApiModelProperty("实施情况")
+	private String implementation;
+
 	@ApiModelProperty("创建时间")
 	private LocalDateTime createTime;
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanConsumablesPurchaseVo.java

@@ -57,6 +57,9 @@ public class PlanConsumablesPurchaseVo {
 	@ApiModelProperty("状态（0禁用，1已启用）")
 	private Integer status;
 
+	@ApiModelProperty("实施情况")
+	private String implementation;
+
 	@ApiModelProperty("创建时间")
 	private LocalDateTime createTime;
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanEquipmentMaintainVo.java

@@ -63,6 +63,9 @@ public class PlanEquipmentMaintainVo {
 	@ApiModelProperty("状态（0待完成，1已完成）")
 	private Integer status;
 
+	@ApiModelProperty("实施情况")
+	private String implementation;
+
 	@ApiModelProperty("创建时间")
 	private LocalDateTime createTime;
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanEquipmentPurchaseVo.java

@@ -57,6 +57,9 @@ public class PlanEquipmentPurchaseVo {
 	@ApiModelProperty("状态（0待完成，1已完成）")
 	private Integer status;
 
+	@ApiModelProperty("实施情况")
+	private String implementation;
+
 	@ApiModelProperty("创建时间")
 	private LocalDateTime createTime;
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanEquipmentRepairVo.java

@@ -54,6 +54,9 @@ public class PlanEquipmentRepairVo {
 	@ApiModelProperty("状态（0待完成，1已完成）")
 	private Integer status;
 
+	@ApiModelProperty("实施情况")
+	private String implementation;
+
 	@ApiModelProperty("创建时间")
 	private LocalDateTime createTime;
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanStandardPurchaseVo.java

@@ -54,6 +54,9 @@ public class PlanStandardPurchaseVo {
 	@ApiModelProperty("状态（0禁用，1已启用）")
 	private Integer status;
 
+	@ApiModelProperty("实施情况")
+	private String implementation;
+
 	@ApiModelProperty("创建时间")
 	private LocalDateTime createTime;
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanConsumablesPurchaseService.java

@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.entity.PlanConsumablesPurchase;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.PlanConsumablesPurchaseQuery;
+import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
 import cn.wise.sc.cement.business.model.vo.PlanConsumablesPurchaseVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -30,7 +31,7 @@ public interface IPlanConsumablesPurchaseService extends IService<PlanConsumable
 
 	BaseResponse<PlanConsumablesPurchaseVo> getDetail(Integer id);
 
-	BaseResponse<String> finish(Integer id);
+	BaseResponse<String> finish(PlanFinishQuery query);
 
 	BaseResponse<String> delete(Integer id);
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanEquipmentMaintainService.java

@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.entity.PlanEquipmentMaintain;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.PlanEquipmentMaintainQuery;
+import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
 import cn.wise.sc.cement.business.model.vo.PlanEquipmentMaintainVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -30,7 +31,7 @@ public interface IPlanEquipmentMaintainService extends IService<PlanEquipmentMai
 
 	BaseResponse<PlanEquipmentMaintainVo> getDetail(Integer id);
 
-	BaseResponse<String> finish(Integer id);
+	BaseResponse<String> finish(PlanFinishQuery query);
 
 	BaseResponse<String> delete(Integer id);
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanEquipmentPurchaseService.java

@@ -21,9 +21,9 @@ import javax.servlet.http.HttpServletResponse;
  */
 public interface IPlanEquipmentPurchaseService extends IService<PlanEquipmentPurchase> {
 
-	BaseResponse<IPage<PlanEquipmentPurchaseVo>> getPage(PageQuery pageQuery, String name);
+	BaseResponse<IPage<PlanEquipmentPurchaseVo>> getPage(PageQuery pageQuery, String name, Integer status);
 
-	void export(String name, String fileName, HttpServletResponse response);
+	void export(String name, String fileName, Integer status, HttpServletResponse response);
 
 	BaseResponse<PlanEquipmentPurchase> create(PlanEquipmentPurchaseQuery query);
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanEquipmentRepairService.java

@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.entity.PlanEquipmentRepair;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.PlanEquipmentRepairQuery;
+import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
 import cn.wise.sc.cement.business.model.vo.PlanEquipmentRepairVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -31,7 +32,7 @@ public interface IPlanEquipmentRepairService extends IService<PlanEquipmentRepai
 
 	BaseResponse<PlanEquipmentRepairVo> getDetail(Integer id);
 
-	BaseResponse<String> finish(Integer id);
+	BaseResponse<String> finish(PlanFinishQuery query);
 
 	BaseResponse<String> delete(Integer id);
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/IPlanStandardPurchaseService.java

@@ -3,6 +3,7 @@ package cn.wise.sc.cement.business.service;
 import cn.wise.sc.cement.business.entity.PlanStandardPurchase;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
 import cn.wise.sc.cement.business.model.query.PlanStandardPurchaseQuery;
 import cn.wise.sc.cement.business.model.vo.PlanStandardPurchaseVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,7 +31,7 @@ public interface IPlanStandardPurchaseService extends IService<PlanStandardPurch
 
 	BaseResponse<PlanStandardPurchaseVo> getDetail(Integer id);
 
-	BaseResponse<String> finish(Integer id);
+	BaseResponse<String> finish(PlanFinishQuery query);
 
 	BaseResponse<String> delete(Integer id);
 

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanConsumablesPurchaseServiceImpl.java

@@ -8,6 +8,7 @@ import cn.wise.sc.cement.business.model.LoginUser;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.PlanConsumablesPurchaseQuery;
 import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
+import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
 import cn.wise.sc.cement.business.model.vo.PlanConsumablesPurchaseVo;
 import cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo;
 import cn.wise.sc.cement.business.service.IPlanConsumablesPurchaseService;
@@ -185,19 +186,20 @@ public class PlanConsumablesPurchaseServiceImpl extends ServiceImpl<PlanConsumab
 	/**
 	 * 采购完成
 	 *
-	 * @param id
+	 * @param query
 	 * @return
 	 */
 	@Transactional
 	@Override
-	public BaseResponse<String> finish(Integer id) {
-		if (id == null) {
+	public BaseResponse<String> finish(PlanFinishQuery query) {
+		if (query == null || query.getId() == null) {
 			return BaseResponse.errorMsg("参数错误!");
 		}
-		PlanConsumablesPurchase pep = consumablesPurchaseMapper.selectById(id);
+		PlanConsumablesPurchase pep = consumablesPurchaseMapper.selectById(query.getId());
 		if (pep == null) {
 			return BaseResponse.errorMsg("数据错误!");
 		}
+		pep.setTechnicalIndex(query.getImplementation());
 		pep.setStatus(1); //采购完成
 		consumablesPurchaseMapper.updateById(pep);
 		return BaseResponse.okData("采购完成");

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanEquipmentMaintainServiceImpl.java

@@ -8,6 +8,7 @@ import cn.wise.sc.cement.business.model.LoginUser;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.PlanEquipmentMaintainQuery;
 import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
+import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
 import cn.wise.sc.cement.business.model.vo.PlanEquipmentMaintainVo;
 import cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo;
 import cn.wise.sc.cement.business.service.IPlanEquipmentMaintainService;
@@ -184,19 +185,20 @@ public class PlanEquipmentMaintainServiceImpl extends ServiceImpl<PlanEquipmentM
 	/**
 	 * 维护完成
 	 *
-	 * @param id
+	 * @param query
 	 * @return
 	 */
 	@Transactional
 	@Override
-	public BaseResponse<String> finish(Integer id) {
-		if (id == null) {
+	public BaseResponse<String> finish(PlanFinishQuery query) {
+		if (query == null || query.getId() == null) {
 			return BaseResponse.errorMsg("参数错误!");
 		}
-		PlanEquipmentMaintain pep = equipmentMaintainMapper.selectById(id);
+		PlanEquipmentMaintain pep = equipmentMaintainMapper.selectById(query.getId());
 		if (pep == null) {
 			return BaseResponse.errorMsg("数据错误!");
 		}
+		pep.setImplementation(query.getImplementation());
 		pep.setStatus(1); //维护完成
 		equipmentMaintainMapper.updateById(pep);
 		return BaseResponse.okData("维护完成");

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanEquipmentPurchaseServiceImpl.java

@@ -60,9 +60,10 @@ public class PlanEquipmentPurchaseServiceImpl extends ServiceImpl<PlanEquipmentP
 	 * @return
 	 */
 	@Override
-	public BaseResponse<IPage<PlanEquipmentPurchaseVo>> getPage(PageQuery pageQuery, String name) {
+	public BaseResponse<IPage<PlanEquipmentPurchaseVo>> getPage(PageQuery pageQuery, String name, Integer status) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("name", name);
+		params.put("status", status);
 		Page<PlanEquipmentPurchaseVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
 		IPage<PlanEquipmentPurchaseVo> pages = equipmentPurchaseMapper.getPage(page, params);
 		return BaseResponse.okData(pages);
@@ -73,12 +74,14 @@ public class PlanEquipmentPurchaseServiceImpl extends ServiceImpl<PlanEquipmentP
 	 *
 	 * @param name
 	 * @param fileName
+	 * @param status
 	 * @param response
 	 */
 	@Override
-	public void export(String name, String fileName, HttpServletResponse response) {
+	public void export(String name, String fileName, Integer status, HttpServletResponse response) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("name", name);
+		params.put("status", status);
 		List<Map<String, Object>> list = equipmentPurchaseMapper.exportList(params);
 
 		if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(list)) {

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanEquipmentRepairServiceImpl.java

@@ -8,6 +8,7 @@ import cn.wise.sc.cement.business.model.LoginUser;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.PlanEquipmentPurchaseQuery;
 import cn.wise.sc.cement.business.model.query.PlanEquipmentRepairQuery;
+import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
 import cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo;
 import cn.wise.sc.cement.business.model.vo.PlanEquipmentRepairVo;
 import cn.wise.sc.cement.business.service.IPlanEquipmentRepairService;
@@ -184,19 +185,20 @@ public class PlanEquipmentRepairServiceImpl extends ServiceImpl<PlanEquipmentRep
 	/**
 	 * 维修完成
 	 *
-	 * @param id
+	 * @param query
 	 * @return
 	 */
 	@Transactional
 	@Override
-	public BaseResponse<String> finish(Integer id) {
-		if (id == null) {
+	public BaseResponse<String> finish(PlanFinishQuery query) {
+		if (query == null || query.getId() == null) {
 			return BaseResponse.errorMsg("参数错误!");
 		}
-		PlanEquipmentRepair pep = equipmentRepairMapper.selectById(id);
+		PlanEquipmentRepair pep = equipmentRepairMapper.selectById(query.getId());
 		if (pep == null) {
 			return BaseResponse.errorMsg("数据错误!");
 		}
+		pep.setImplementation(query.getImplementation());
 		pep.setStatus(1); //维修完成
 		equipmentRepairMapper.updateById(pep);
 		return BaseResponse.okData("维修完成");

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanStandardPurchaseServiceImpl.java

@@ -7,6 +7,7 @@ import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.LoginUser;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.PlanConsumablesPurchaseQuery;
+import cn.wise.sc.cement.business.model.query.PlanFinishQuery;
 import cn.wise.sc.cement.business.model.query.PlanStandardPurchaseQuery;
 import cn.wise.sc.cement.business.model.vo.PlanConsumablesPurchaseVo;
 import cn.wise.sc.cement.business.model.vo.PlanStandardPurchaseVo;
@@ -183,19 +184,20 @@ public class PlanStandardPurchaseServiceImpl extends ServiceImpl<PlanStandardPur
 	/**
 	 * 采购完成
 	 *
-	 * @param id
+	 * @param query
 	 * @return
 	 */
 	@Transactional
 	@Override
-	public BaseResponse<String> finish(Integer id) {
-		if (id == null) {
+	public BaseResponse<String> finish(PlanFinishQuery query) {
+		if (query == null || query.getId() == null) {
 			return BaseResponse.errorMsg("参数错误!");
 		}
-		PlanStandardPurchase pep = standardPurchaseMapper.selectById(id);
+		PlanStandardPurchase pep = standardPurchaseMapper.selectById(query.getId());
 		if (pep == null) {
 			return BaseResponse.errorMsg("数据错误!");
 		}
+		pep.setImplementation(query.getImplementation());
 		pep.setStatus(1); //采购完成
 		standardPurchaseMapper.updateById(pep);
 		return BaseResponse.okData("采购完成");