校核计算页面 展示平行样编号

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

@@ -6,6 +6,8 @@ import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.CapabilityManagementQuery;
 import cn.wise.sc.cement.business.service.ICapabilityManagementService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,6 +32,9 @@ public class CapabilityManagementController {
     private ICapabilityManagementService capabilityManagementService;
 
     @ApiOperation(value = "能力管理分页，可通过用户id查询能力信息")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "userId", value = "用户id", paramType = "query", dataType = "Integer")
+    })
     @GetMapping("/getPage")
     public BaseResponse getPage(PageQuery pageQuery,Integer userId) {
         try {

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

@@ -332,11 +332,9 @@ public class EntrustController {
 
 	@ApiOperation(value = "校核计算")
 	@PostMapping("/checkCount")
-	public BaseResponse checkCount(Integer teamGroupId,Integer isParallel,
-	                               @RequestBody Map<String, Object> mainResult,
-	                               @RequestBody Map<String, Object> secondaryResult) {
+	public BaseResponse checkCount(@RequestBody CheckCountQuery query) {
 		try {
-			return entrustService.checkCount(teamGroupId, isParallel, mainResult, secondaryResult);
+			return entrustService.checkCount(query);
 		}catch (Exception e) {
 			log.debug("校核计算{}",e);
 		}

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

+package cn.wise.sc.cement.business.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@RestController
+@RequestMapping("/business/plan-consumables-purchase")
+public class PlanConsumablesPurchaseController {
+
+}
+

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

+package cn.wise.sc.cement.business.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@RestController
+@RequestMapping("/business/plan-equipment-maintain")
+public class PlanEquipmentMaintainController {
+
+}
+

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

+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.TeamQuery;
+import cn.wise.sc.cement.business.service.IPlanEquipmentPurchaseService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@Api(tags="计划管理-设备采购计划")
+@RestController
+@RequestMapping("/business/plan-equipment-purchase")
+public class PlanEquipmentPurchaseController {
+
+	private static final Logger log = LoggerFactory.getLogger("PlanEquipmentPurchaseController");
+
+	@Autowired
+	private IPlanEquipmentPurchaseService equipmentPurchaseService;
+
+	@ApiOperation(value = "设备采购计划分页列表")
+	@ApiImplicitParams(value = {
+			@ApiImplicitParam(name = "name", value = "产品名称", paramType = "query", dataType = "String")
+	})
+	@GetMapping("/getPage")
+	public BaseResponse getPage(PageQuery pageQuery, String name) {
+		try {
+			return equipmentPurchaseService.getPage(pageQuery, name);
+		} catch (Exception e) {
+			log.debug("设备采购计划分页列表{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+/*
+	@ApiOperation(value = "新增检测项")
+	@PostMapping("/create")
+	public BaseResponse create(@RequestBody TeamQuery query){
+		try {
+			return teamService.create(query);
+		}catch (Exception e){
+			log.debug("新增检测项{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "更新检测项")
+	@PostMapping("/update")
+	public BaseResponse update(@RequestBody TeamQuery query){
+		try {
+			return teamService.update(query);
+		}catch (Exception e){
+			log.debug("更新检测项{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "启用禁用")
+	@PostMapping("/status")
+	public BaseResponse status(Integer status, Integer id){
+		try {
+			return teamService.status(status, id);
+		}catch (Exception e){
+			log.debug("启用禁用{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "检测项详情")
+	@GetMapping("/{id}")
+	public BaseResponse getDetail(@PathVariable Integer id){
+		try {
+			return teamService.getDetail(id);
+		}catch (Exception e){
+			log.debug("检测项详情{}",e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "检测项列表")
+	@GetMapping("/getList")
+	public BaseResponse getList() {
+		try {
+			return teamService.getList();
+		} catch (Exception e) {
+			log.debug("检测项列表{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}*/
+
+
+
+
+
+
+
+
+
+}
+

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

+package cn.wise.sc.cement.business.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@RestController
+@RequestMapping("/business/plan-equipment-repair")
+public class PlanEquipmentRepairController {
+
+}
+

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

+package cn.wise.sc.cement.business.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@RestController
+@RequestMapping("/business/plan-standard-purchase")
+public class PlanStandardPurchaseController {
+
+}
+

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

+package cn.wise.sc.cement.business.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PlanConsumablesPurchase implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("产品名称")
+    private String name;
+
+    @ApiModelProperty("规格型号")
+    private String model;
+
+    @ApiModelProperty("技术指标")
+    private String technicalIndex;
+
+    @ApiModelProperty("单价（万元）")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty("生产单位")
+    private String productionUnit;
+
+    @ApiModelProperty("采购数量")
+    private Integer purchaseNum;
+
+    @ApiModelProperty("采购日期（购买日期）")
+    private LocalDate purchaseDate;
+
+    @ApiModelProperty("采购人id")
+    private Integer userId;
+
+    @ApiModelProperty("状态（0禁用，1已启用）")
+    private Integer status;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PlanEquipmentMaintain implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("产品名称")
+    private String name;
+
+    @ApiModelProperty("规格型号")
+    private String model;
+
+    @ApiModelProperty("编号")
+    private String code;
+
+    @ApiModelProperty("xx")
+    private LocalDate maintainDate;
+
+    @ApiModelProperty("采购人id")
+    private Integer userId;
+
+    @ApiModelProperty("维护内容")
+    private String maintainContent;
+
+    @ApiModelProperty("维护结果")
+    private String maintainResult;
+
+    @ApiModelProperty("设备维护计划附件地址")
+    private String enclosureUrl;
+
+    @ApiModelProperty("附件名")
+    private String alias;
+
+    @ApiModelProperty("附件扩展名")
+    private String extName;
+
+    @ApiModelProperty("状态（0禁用，1已启用）")
+    private Integer status;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+}

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

+package cn.wise.sc.cement.business.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PlanEquipmentPurchase implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("产品名称")
+    private String name;
+
+    @ApiModelProperty("规格型号")
+    private String model;
+
+    @ApiModelProperty("技术指标")
+    private String technicalIndex;
+
+    @ApiModelProperty("单价（万元）")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty("生产单位")
+    private String productionUnit;
+
+    @ApiModelProperty("采购数量")
+    private Integer purchaseNum;
+
+    @ApiModelProperty("采购日期（购买日期）")
+    private LocalDate purchaseDate;
+
+    @ApiModelProperty("采购人id")
+    private Integer purchaserId;
+
+    @ApiModelProperty("创建人id")
+    private Integer userId;
+
+
+    @ApiModelProperty("状态（0禁用，1已启用）")
+    private Integer status;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+
+}
\ No newline at end of file

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

+package cn.wise.sc.cement.business.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PlanEquipmentRepair implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("产品名称")
+    private String name;
+
+    @ApiModelProperty("规格型号")
+    private String model;
+
+    @ApiModelProperty("技术指标")
+    private String technicalIndex;
+
+    @ApiModelProperty("单价（万元）")
+    private BigDecimal unitPrice;
+
+    @ApiModelProperty("生产单位")
+    private String productionUnit;
+
+    @ApiModelProperty("维修日期")
+    private LocalDate repairDate;
+
+    @ApiModelProperty("执行人")
+    private Integer userId;
+
+    @ApiModelProperty("状态（0禁用，1已启用）")
+    private Integer status;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

+package cn.wise.sc.cement.business.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class PlanStandardPurchase implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("标物名称")
+    private String name;
+
+    @ApiModelProperty("标物编号")
+    private String code;
+
+    @ApiModelProperty("经销单位")
+    private String distributionUnit;
+
+    @ApiModelProperty("采购数量")
+    private Integer purchaseNum;
+
+    @ApiModelProperty("采购日期（购买日期）")
+    private LocalDate purchaseDate;
+
+    @ApiModelProperty("采购人id")
+    private Integer userId;
+
+    @ApiModelProperty("规格型号")
+    private String model;
+
+    @ApiModelProperty("状态（0禁用，1已启用）")
+    private Integer status;
+
+    @ApiModelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+}

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

@@ -36,6 +36,9 @@ public class SampleCheckTeam implements Serializable {
     @ApiModelProperty("样品表d")
     private Integer sampleId;
 
+    @ApiModelProperty("平行样编号")
+    private String parallelCode;
+
     @ApiModelProperty("处理人id")
     private Integer userId;
 

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/PlanConsumablesPurchaseMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.PlanConsumablesPurchase;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+public interface PlanConsumablesPurchaseMapper extends BaseMapper<PlanConsumablesPurchase> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/PlanEquipmentMaintainMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.PlanEquipmentMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+public interface PlanEquipmentMaintainMapper extends BaseMapper<PlanEquipmentMaintain> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/PlanEquipmentPurchaseMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.PlanEquipmentPurchase;
+import cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo;
+import cn.wise.sc.cement.business.model.vo.TeamVo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+public interface PlanEquipmentPurchaseMapper extends BaseMapper<PlanEquipmentPurchase> {
+
+	IPage<PlanEquipmentPurchaseVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
+
+
+
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/PlanEquipmentRepairMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.PlanEquipmentRepair;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+public interface PlanEquipmentRepairMapper extends BaseMapper<PlanEquipmentRepair> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/PlanStandardPurchaseMapper.java

+package cn.wise.sc.cement.business.mapper;
+
+import cn.wise.sc.cement.business.entity.PlanStandardPurchase;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+public interface PlanStandardPurchaseMapper extends BaseMapper<PlanStandardPurchase> {
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml

@@ -83,7 +83,7 @@
 
 
     <select id="getSampleHandlePage" resultType="cn.wise.sc.cement.business.model.vo.EntrustVo">
-        select e.id as id, e.sample_num as sampleNum,e.entrust_date as entrustDate,
+        select e.id as id, e.entrust_code as entrustCode, e.sample_num as sampleNum,e.entrust_date as entrustDate,
         (
         CASE e.status
         WHEN 0 THEN '未评审'
@@ -118,7 +118,7 @@
 
 
     <select id="getSampleDistributionPage" resultType="cn.wise.sc.cement.business.model.vo.EntrustVo">
-        select e.id as id, e.sample_num as sampleNum,e.entrust_date as entrustDate,
+        select e.id as id, e.entrust_code as entrustCode, e.sample_num as sampleNum,e.entrust_date as entrustDate,
         (
         CASE e.status
         WHEN 0 THEN '未评审'

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanConsumablesPurchaseMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.cement.business.mapper.PlanConsumablesPurchaseMapper">
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanEquipmentMaintainMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.cement.business.mapper.PlanEquipmentMaintainMapper">
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanEquipmentPurchaseMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.cement.business.mapper.PlanEquipmentPurchaseMapper">
+
+    <sql id="where">
+        <where>
+            <if test="params.status != null">
+                and t.status = #{params.status}
+            </if>
+            <if test="params.name != null and params.name != ''">
+                and t.name like concat('%', #{params.name}, '%')
+            </if>
+        </where>
+    </sql>
+
+    <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo">
+        SELECT t.*, su.name as purchaserName
+        FROM plan_equipment_purchase t
+        left join sys_user su on su.id = t.purchaser_id
+        <include refid="where" />
+        ORDER BY t.id DESC
+    </select>
+
+
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanEquipmentRepairMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.cement.business.mapper.PlanEquipmentRepairMapper">
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanStandardPurchaseMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.wise.sc.cement.business.mapper.PlanStandardPurchaseMapper">
+
+</mapper>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionMapper.xml

@@ -54,7 +54,7 @@
         left join sys_user su on su.id = t.user_id
         left join team s on s.id = t.team_id
         left join team_group tg on tg.id = t.team_group_id
-        where t.sample_id = #{sampleId} or t.sample_id = #{sampleId2}
+        where (t.sample_id = #{sampleId} or t.sample_id = #{sampleId2})
         <if test="userId != null">
             and t.user_id = #{userId}
         </if>

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/CheckCountQuery.java

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2020-08-07 14:58
+ **/
+@Data
+@ApiModel("数据校核-校核计算接口请求")
+public class CheckCountQuery {
+
+	@ApiModelProperty("检测组表id")
+	private Integer teamGroupId;
+
+	@ApiModelProperty("是否平行样（1是，0否）")
+	private Integer isParallel;
+
+	@ApiModelProperty("主样输入信息")
+	private Map<String, Object> mainResult = new HashMap<>();
+
+	@ApiModelProperty("次样输入信息")
+	private Map<String, Object> secondaryResult = new HashMap<>();
+
+
+}

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/SampleCheckTeamQuery.java

@@ -60,6 +60,14 @@ public class SampleCheckTeamQuery {
 	@ApiModelProperty("主样-样品表d")
 	private Integer mainSampleId;
 
+	@ApiModelProperty("次样-样品表d")
+	private Integer secondarySampleId;
+
+	@ApiModelProperty("主样平行样编号")
+	private String mainParallelCode;
+
+	@ApiModelProperty("次样平行样编号")
+	private String secondaryParallelCode;
 	/**
 	 *  json串
 	 {"样重m":"40","K值":1.0274,"Vsio2":3.89,................}
@@ -67,8 +75,7 @@ public class SampleCheckTeamQuery {
 	@ApiModelProperty("主样检测结果 Map集合")
 	private Map<String, Object> mainResult;
 
-	@ApiModelProperty("次样-样品表d")
-	private Integer secondarySampleId;
+
 
 	@ApiModelProperty("次样检测结果 Map集合")
 	private Map<String, Object> secondaryResult;

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

+package cn.wise.sc.cement.business.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2020-08-07 15:09
+ **/
+
+@Data
+@ApiModel("设备采购计划Vo")
+public class PlanEquipmentPurchaseVo {
+
+	@ApiModelProperty("设备采购计划表id")
+	private Integer id;
+
+	@ApiModelProperty("产品名称")
+	private String name;
+
+	@ApiModelProperty("规格型号")
+	private String model;
+
+	@ApiModelProperty("技术指标")
+	private String technicalIndex;
+
+	@ApiModelProperty("单价（万元）")
+	private BigDecimal unitPrice;
+
+	@ApiModelProperty("生产单位")
+	private String productionUnit;
+
+	@ApiModelProperty("采购数量")
+	private Integer purchaseNum;
+
+	@ApiModelProperty("采购日期（购买日期）")
+	private LocalDate purchaseDate;
+
+	@ApiModelProperty("采购人id")
+	private Integer purchaserId;
+
+	@ApiModelProperty("采购人姓名")
+	private String purchaserName;
+
+	@ApiModelProperty("创建人id")
+	private Integer userId;
+
+	@ApiModelProperty("创建人姓名")
+	private String userName;
+
+	@ApiModelProperty("状态（0待完成，1已完成）")
+	private Integer status;
+
+	@ApiModelProperty("创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty("备注")
+	private String remark;
+
+
+}

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

@@ -16,9 +16,12 @@ public class SampleCheckTeamVo {
 	@ApiModelProperty("校核表id")
 	private Integer checkId;
 
-	@ApiModelProperty("样品表d")
+	@ApiModelProperty("样品表id")
 	private Integer sampleId;
 
+	@ApiModelProperty("平行样编号")
+	private String parallelCode;
+
 	@ApiModelProperty("检测人id")
 	private Integer userId;
 

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

@@ -53,5 +53,8 @@ public class TeamVo{
 	@ApiModelProperty("状态 0:禁用 1:激活")
 	private String status;
 
+	@ApiModelProperty("委托是否可见 0:不可见 1:可见")
+	private Integer isDisplay;
+
 
 }

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

@@ -75,9 +75,7 @@ public interface IEntrustService extends IService<Entrust> {
 
 	BaseResponse<List<SampleDistribution>> getEnclosureList(Integer sampleId, Integer teamGroupId, Integer userId);
 
-	BaseResponse<Map<String, String>> checkCount(Integer teamGroupId,Integer isParallel,
-	                                             Map<String, Object> mainResult,
-	                                             Map<String, Object> secondaryResult);
+	BaseResponse<Map<String, String>> checkCount(CheckCountQuery query);
 
 	BaseResponse<String> check(CheckQuery query);
 

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

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.PlanConsumablesPurchase;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+public interface IPlanConsumablesPurchaseService extends IService<PlanConsumablesPurchase> {
+
+}

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

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.PlanEquipmentMaintain;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+public interface IPlanEquipmentMaintainService extends IService<PlanEquipmentMaintain> {
+
+}

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

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.PlanEquipmentPurchase;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+public interface IPlanEquipmentPurchaseService extends IService<PlanEquipmentPurchase> {
+
+	BaseResponse<IPage<PlanEquipmentPurchaseVo>> getPage(PageQuery pageQuery, String name);
+
+
+
+
+}

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

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.PlanEquipmentRepair;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+public interface IPlanEquipmentRepairService extends IService<PlanEquipmentRepair> {
+
+}

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

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.PlanStandardPurchase;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+public interface IPlanStandardPurchaseService extends IService<PlanStandardPurchase> {
+
+}

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

@@ -788,15 +788,32 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 			if(sample == null){
 				return BaseResponse.errorMsg("样品信息错误");
 			}
+			entrust = entrustMapper.selectById(sample.getEntrustId());
+			if(entrust == null){
+				return BaseResponse.errorMsg("委托信息错误");
+			}
 			QueryWrapper<SampleHandle> sampleHandleWrapper = new QueryWrapper<>();
 			sampleHandleWrapper.eq("sample_id", sample.getId());
 			sampleHandleWrapper.ne("status", 2);
 			List<SampleHandle> sampleHandleIngList = sampleHandleMapper.selectList(sampleHandleWrapper);
 			if(sampleHandleIngList == null || sampleHandleIngList.size() == 0){
-				sample.setIsHandle(1); //样品处理全部完成
+				if(sample.getIsParallel() == 0){
+					sample.setIsHandle(1); //样品处理全部完成
+					sampleMapper.updateById(sample);
+				}else if(sample.getIsParallel() == 1){
+					List<Sample>  sampleList1 = sampleMapper.getByCementCode(entrust.getId(), sample.getCementCode());
+					// 如果是平行样，平行样的状态也改成已处理完成
+					if(sampleList1.size() == 2){
+						for(Sample sam : sampleList1){
+							sam.setIsHandle(1);
+							sampleMapper.updateById(sam);
+						}
+					}else{
+						sample.setIsHandle(1); //样品处理全部完成
+						sampleMapper.updateById(sample);
+					}
+				}
 			}
-			sampleMapper.updateById(sample);
-			entrust = entrustMapper.selectById(sample.getEntrustId());
 			if(entrust != null){
 				if(entrust.getStatus() != 3){
 					return BaseResponse.errorMsg("委托单状态错误");
@@ -1278,6 +1295,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 							SampleCheckTeamVo sampleCheckTeamVo = new SampleCheckTeamVo();
 							sampleCheckTeamVo.setCheckId(null);
 							sampleCheckTeamVo.setSampleId(sample.getId());
+							//本所编号 展示的是平行样编号
+							sampleCheckTeamVo.setParallelCode(sample.getParallelCode());
 							QueryWrapper<SampleDistribution> sdWrapper = new QueryWrapper<>();
 							sdWrapper.eq("sample_id", sample.getId());
 							sdWrapper.eq("team_group_id", sampleCheckGroupVo.getTeamGroupId());
@@ -1307,7 +1326,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 						sampleCheckVo.setTeamGroupName(sampleCheck.getTeamGroupName());
 						sampleCheckVo.setCountResult(sampleCheck.getCountResult());
 						sampleCheckVo.setIsParallel(sampleOne.getIsParallel());
-
 						QueryWrapper<SampleCheckTeam> sampleCheckTeamQW = new QueryWrapper<>();
 						sampleCheckTeamQW.eq("checkId", sampleCheck.getId());
 						List<SampleCheckTeam> sampleCheckTeamList = sampleCheckTeamMapper.selectList(sampleCheckTeamQW);
@@ -1317,6 +1335,9 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 								SampleCheckTeamVo sampleCheckTeamVo = new SampleCheckTeamVo();
 								sampleCheckTeamVo.setCheckId(sampleCheck.getId());
 								sampleCheckTeamVo.setSampleId(sampleCheckTeam.getSampleId());
+								sampleCheckTeamVo.setSampleId(sampleCheckTeam.getSampleId());
+								//本所编号 展示的是平行样编号
+								sampleCheckTeamVo.setParallelCode(sampleCheckTeam.getParallelCode());
 								sampleCheckTeamVo.setUserId(sampleCheckTeam.getUserId());
 								SysUser sysUser = userService.getById(sampleCheckTeam.getUserId());
 								sampleCheckTeamVo.setUserName(sysUser.getName());
@@ -1355,86 +1376,86 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 
 	/**
 	 * 校核计算
-	 * @param teamGroupId
-	 * @param mainResult
+	 * @param query
 	 * @return
 	 */
-	public BaseResponse<Map<String, String>> checkCount(Integer teamGroupId,Integer isParallel,
-	                                                    Map<String, Object> mainResult,
-	                                                    Map<String, Object> secondaryResult){
-		List<String> checkResutlList = teamMapper.getByGroup(teamGroupId);
+	public BaseResponse<Map<String, String>> checkCount(CheckCountQuery query){
+		if(query == null){
+			return  BaseResponse.errorMsg("参数错误");
+		}
+		List<String> checkResutlList = teamMapper.getByGroup(query.getTeamGroupId());
 		Map<String, String> countMap = new HashMap<>();
-		if(isParallel == 0){
-			Map<String, String>  mainMap = commonService.checkCount(checkResutlList, mainResult);
+		if(query.getIsParallel() == 0){
+			Map<String, String>  mainMap = commonService.checkCount(checkResutlList, query.getMainResult());
 			countMap = mainMap;
-		}else if(isParallel == 0){
-			Map<String, String>  mainMap = commonService.checkCount(checkResutlList, mainResult);
-			Map<String, String>  secondaryMap = commonService.checkCount(checkResutlList, mainResult);
+		}else if(query.getIsParallel()  == 1){
+			Map<String, String>  mainMap = commonService.checkCount(checkResutlList,  query.getMainResult());
+			Map<String, String>  secondaryMap = commonService.checkCount(checkResutlList, query.getSecondaryResult());
 			for(String name : checkResutlList){
 				if(name.equals("L.O.I")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("SiO2")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("Al2O3+TiO2")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("Al2O3")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("Fe2O3")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("CaO")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("MgO")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("TiO2")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("K2O")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("Na2O")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("SO3")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("Cl")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("合量")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("KH")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("SM")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else if(name.equals("AM")){
 					String parallelResult =
 							CheckCountUtil.countParallel(mainMap.get(name),secondaryMap.get(name));
-					countMap.put(name, name);
+					countMap.put(name, parallelResult);
 				}else{
 					countMap.put(name, mainMap.get(name));
 				}
@@ -1496,6 +1517,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 				SampleCheckTeam sampleCheckTeam = new SampleCheckTeam();
 				sampleCheckTeam.setCheckId(check.getId())
 						.setSampleId(sctQuery.getMainSampleId())
+						.setParallelCode(sctQuery.getMainParallelCode())
 						.setUserId(sctQuery.getMainUserId())
 						.setEquipmentId(sctQuery.getMainEquipmentId())
 						.setEquipmentName(sctQuery.getMainEquipmentName())
@@ -1520,6 +1542,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 					SampleCheckTeam sampleCheckTeam2 = new SampleCheckTeam();
 					sampleCheckTeam2.setCheckId(check.getId())
 							.setSampleId(sctQuery.getSecondarySampleId())
+							.setParallelCode(sctQuery.getSecondaryParallelCode())
 							.setUserId(sctQuery.getSecondaryUserId())
 							.setEquipmentId(sctQuery.getSecondaryEquipmentId())
 							.setEquipmentName(sctQuery.getSecondaryEquipmentName())
@@ -1531,7 +1554,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 					SysUser sysUser2 = userService.getById(sampleCheckTeam2.getUserId());
 					equipmentUse2.setEquipmentId(sampleCheckTeam2.getEquipmentId())
 							.setUserId(sampleCheckTeam2.getUserId())
-							.setUserName(sysUser.getName())
+							.setUserName(sysUser2.getName())
 							.setUseDate(LocalDate.now())
 							.setProjectId(entrust.getProjectId())
 							.setProjectName(entrust.getProjectName())

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

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.PlanConsumablesPurchase;
+import cn.wise.sc.cement.business.mapper.PlanConsumablesPurchaseMapper;
+import cn.wise.sc.cement.business.service.IPlanConsumablesPurchaseService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@Service
+public class PlanConsumablesPurchaseServiceImpl extends ServiceImpl<PlanConsumablesPurchaseMapper, PlanConsumablesPurchase> implements IPlanConsumablesPurchaseService {
+
+}

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

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.PlanEquipmentMaintain;
+import cn.wise.sc.cement.business.mapper.PlanEquipmentMaintainMapper;
+import cn.wise.sc.cement.business.service.IPlanEquipmentMaintainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@Service
+public class PlanEquipmentMaintainServiceImpl extends ServiceImpl<PlanEquipmentMaintainMapper, PlanEquipmentMaintain> implements IPlanEquipmentMaintainService {
+
+}

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

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.PlanEquipmentPurchase;
+import cn.wise.sc.cement.business.mapper.PlanEquipmentPurchaseMapper;
+import cn.wise.sc.cement.business.model.BaseResponse;
+import cn.wise.sc.cement.business.model.PageQuery;
+import cn.wise.sc.cement.business.model.vo.PlanEquipmentPurchaseVo;
+import cn.wise.sc.cement.business.model.vo.TeamVo;
+import cn.wise.sc.cement.business.service.IPlanEquipmentPurchaseService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@Service
+public class PlanEquipmentPurchaseServiceImpl extends ServiceImpl<PlanEquipmentPurchaseMapper, PlanEquipmentPurchase> implements IPlanEquipmentPurchaseService {
+
+	@Resource
+	private PlanEquipmentPurchaseMapper equipmentPurchaseMapper;
+
+	/**
+	 * 分页查询
+	 * @param pageQuery
+	 * @param name
+	 * @return
+	 */
+	@Override
+	public BaseResponse<IPage<PlanEquipmentPurchaseVo>> getPage(PageQuery pageQuery, String name) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("name", name);
+		Page<PlanEquipmentPurchaseVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+		IPage<PlanEquipmentPurchaseVo> pages = equipmentPurchaseMapper.getPage(page,params);
+		return BaseResponse.okData(pages);
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

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

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.PlanEquipmentRepair;
+import cn.wise.sc.cement.business.mapper.PlanEquipmentRepairMapper;
+import cn.wise.sc.cement.business.service.IPlanEquipmentRepairService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@Service
+public class PlanEquipmentRepairServiceImpl extends ServiceImpl<PlanEquipmentRepairMapper, PlanEquipmentRepair> implements IPlanEquipmentRepairService {
+
+}

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

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.PlanStandardPurchase;
+import cn.wise.sc.cement.business.mapper.PlanStandardPurchaseMapper;
+import cn.wise.sc.cement.business.service.IPlanStandardPurchaseService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2020-09-28
+ */
+@Service
+public class PlanStandardPurchaseServiceImpl extends ServiceImpl<PlanStandardPurchaseMapper, PlanStandardPurchase> implements IPlanStandardPurchaseService {
+
+}