实验室驻场申请

委托上传附件功能
标样管理上传附件功能
评审时删除样品

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

@@ -121,6 +121,40 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
+	@ApiOperation(value = "单独新增委托附件")
+	@PostMapping("/addEnclosure")
+	public BaseResponse addEnclosure(Integer id, @RequestBody EnclosureQuery query) {
+		try {
+			return  entrustService.addEnclosure(id, query);
+		} catch (Exception e) {
+			log.debug("单独新增委托附件{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "查看委托附件信息")
+	@GetMapping("/getHistoryEnclosure/{id}")
+	public BaseResponse getHistoryEnclosure(@PathVariable Integer id) {
+		try {
+			return entrustService.getHistoryEnclosure(id);
+		} catch (Exception e) {
+			log.debug("查看委托附件信息{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+	@ApiOperation(value = "删除委托附件信息")
+	@PostMapping("/deleteHistoryEnclosure/{id}")
+	public BaseResponse deleteHistoryEnclosure(@PathVariable Integer id) {
+		try {
+			return  entrustService.deleteHistoryEnclosure(id);
+		} catch (Exception e) {
+			log.debug("删除委托附件信息{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
+
 	@ApiOperation(value = "委托详情")
 	@GetMapping("/{id}")
 	public BaseResponse getDtail(@PathVariable Integer id) {

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

@@ -100,6 +100,17 @@ public class StandardController {
         return BaseResponse.errorMsg("失败!");
     }
 
+    @ApiOperation(value = "删除历史标样材料信息")
+    @PostMapping("/deleteHistoryStandard/{id}")
+    public BaseResponse deleteHistoryStandard(@PathVariable Integer id) {
+        try {
+            return  standardService.deleteHistoryStandard(id);
+        } catch (Exception e) {
+            log.debug("删除历史标样材料信息{}", e);
+        }
+        return BaseResponse.errorMsg("失败!");
+    }
+
     @ApiOperation(value = "标样详情")
     @GetMapping("/{id}")
     public BaseResponse getById(@PathVariable Integer id) {

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

@@ -68,6 +68,7 @@ public class EntityEnclosure implements Serializable {
 		int EQUIPMENT_TEST = 3;
 		int STANDARD_SAMPLE = 4;
 		int ENTRUST_REPORT = 5;
+		int ENTRUST_ENCLOSURES = 6;
 
 	}
 

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

@@ -59,4 +59,10 @@ public class EntrustQuery {
 	@ApiModelProperty("样品及检测项列表")
 	private List<SampleTmpQuery> sampleTmpList;
 
+	@ApiModelProperty("委托附件信息")
+	private List<EnclosureQuery> enclosureQueryList;
+
+
+
+
 }

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

@@ -68,4 +68,8 @@ public class EntrustUpdateQuery {
 	private String auditReason;
 
 
+	@ApiModelProperty("委托附件信息 ")
+	private List<EnclosureQuery> enclosureQueryList;
+
+
 }

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

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-04-21
+ **/
+@Data
+@ApiModel("实验室入驻审批请求")
+public class SettleApprovalQuery {
+
+
+	@ApiModelProperty("入驻表id")
+	private Integer settleId;
+
+	@ApiModelProperty("审批类型（1入驻申请，2延期申请，3验收申请）")
+	private Integer type;
+
+	@ApiModelProperty("是否同意 1通过，2驳回   验收结果:1正常，2异常  ")
+	private Integer isAgree;
+
+	@ApiModelProperty("审批意见/驳回原因/验收说明")
+	private String opinion;
+
+
+}

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

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @description: 实验室延期申请请求
+ * @author: ztw
+ * @create: 2021-04-20
+ **/
+@Data
+@ApiModel("实验室延期申请请求")
+public class SettleDelayQuery {
+
+	@ApiModelProperty("入驻表id")
+	private Integer settleId;
+
+	@ApiModelProperty("延期日期")
+	private LocalDate delayDate;
+
+}

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

+package cn.wise.sc.cement.business.model.query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import javax.validation.constraints.NotEmpty;
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @description: 实验室入驻申请请求
+ * @author: ztw
+ * @create: 2021-04-20
+ **/
+@Data
+@ApiModel("实验室入驻申请请求")
+public class SettleQuery {
+
+	@ApiModelProperty("入驻表id")
+	private Integer id;
+
+	/**
+	 * 申请单位
+	 */
+	@ApiModelProperty("申请单位")
+	private String clientName;
+
+	/**
+	 * 入驻地点
+	 */
+	@ApiModelProperty("入驻地点")
+	private String position;
+
+	/**
+	 * 入驻日期
+	 */
+	@ApiModelProperty("入驻日期")
+	private LocalDate settleDate;
+
+	/**
+	 * 离开日期
+	 */
+	@ApiModelProperty("离开日期")
+	private LocalDate leaveDate;
+
+
+	/**
+	 * 是否存放样品（1是，0否）
+	 */
+	@ApiModelProperty("是否存放样品（1是，0否）")
+	private Integer isDeposit;
+
+	/**
+	 * 存放日期
+	 */
+	@ApiModelProperty("存放日期")
+	private LocalDate depositDate;
+
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty("备注")
+	private String remark;
+
+
+	@ApiModelProperty("选择设备id集合")
+	private List<Integer> equipmentIdList;
+
+}

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

+package cn.wise.sc.cement.business.model.vo;
+
+import cn.wise.sc.cement.business.entity.SettleRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: ztw
+ * @create: 2021-04-21
+ **/
+@Data
+@ApiModel("实验室入驻Vo")
+public class SettleVo {
+
+	@ApiModelProperty("入驻表id")
+	private Integer id;
+
+	/**
+	 * 申请单位
+	 */
+	@ApiModelProperty("申请单位")
+	private String clientName;
+
+	/**
+	 * 入驻地点
+	 */
+	@ApiModelProperty("入驻地点")
+	private String position;
+
+	/**
+	 * 入驻日期
+	 */
+	@ApiModelProperty("入驻日期")
+	private LocalDate settleDate;
+
+	/**
+	 * 离开日期
+	 */
+	@ApiModelProperty("离开日期")
+	private LocalDate leaveDate;
+
+	/**
+	 * 延期日期
+	 */
+	@ApiModelProperty("延期日期")
+	private LocalDate delayDate;
+
+
+	/**
+	 * 是否存放样品（1是，0否）
+	 */
+	@ApiModelProperty("是否存放样品（1是，0否）")
+	private Integer isDeposit;
+
+	/**
+	 * 存放日期
+	 */
+	@ApiModelProperty("存放日期")
+	private LocalDate depositDate;
+
+
+
+	/**
+	 * 申请用户id
+	 */
+	@ApiModelProperty("申请用户id")
+	private Integer userId;
+
+
+	@ApiModelProperty("申请用户姓名")
+	private Integer userName;
+
+
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty("创建时间")
+	private LocalDateTime createTime;
+
+	/**
+	 * 备注
+	 */
+	@ApiModelProperty("备注")
+	private String remark;
+
+
+	@ApiModelProperty("状态（0未审批，1未通过，2使用中，3验收中，4已验收,5撤销）")
+	private Integer status;
+
+
+	@ApiModelProperty("状态（0未审批，1未通过，2使用中，3验收中，4已验收,5撤销）")
+	private String statusValue;
+
+	@ApiModelProperty("设备名称（a、b、c）")
+	private String equipmentNames;
+
+	@ApiModelProperty("申请类型（实验室入驻申请、实验室延期申请、实验室验收申请）")
+	private String applyType;
+
+
+	//审批对应的结果信息
+
+	@ApiModelProperty("入驻申请说明")
+	private String settleOpinion;
+
+
+	@ApiModelProperty("入驻申请结果 通过/驳回")
+	private String settleResult;
+
+
+	@ApiModelProperty("延期说明")
+	private String delayOpinion;
+
+
+	@ApiModelProperty("延期结果 通过/驳回")
+	private String delayResult;
+
+	/**
+	 * 验收结果
+	 */
+	@ApiModelProperty("验收说明")
+	private String checkOpinion;
+
+	/**
+	 * 审批结果（0申请，1通过，2驳回）
+	 */
+	@ApiModelProperty("验收结果 正常/异常")
+	private String checkResult;
+
+
+}

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

@@ -32,8 +32,18 @@ public interface IEntrustService extends IService<Entrust> {
 
 	BaseResponse<Entrust> update(EntrustUpdateQuery query);
 
+	//******新的接口*************
 	BaseResponse<String> deleteSample(Integer sampleId);
 
+	BaseResponse<String> addEnclosure(Integer id, EnclosureQuery query);
+
+	BaseResponse<List<EntityEnclosure>> getHistoryEnclosure(Integer id);
+
+	BaseResponse<String> deleteHistoryEnclosure(Integer id);
+
+	//******新的接口*************
+
+
 	BaseResponse<EntrustVo> getDtail(Integer id);
 
 	BaseResponse<String> getMaxCementCode();

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

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionEquipment;
+import cn.wise.sc.cement.business.entity.SettleEquipment;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+public interface ISettleEquipmentService extends IService<SettleEquipment> {
+
+}

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

+package cn.wise.sc.cement.business.service;
+
+import cn.wise.sc.cement.business.entity.SettleEquipment;
+import cn.wise.sc.cement.business.entity.SettleRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+public interface ISettleRecordService extends IService<SettleRecord> {
+
+}

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

@@ -36,6 +36,8 @@ public interface IStandardService extends IService<Standard> {
 
 	BaseResponse<List<EntityEnclosure>> getHistoryStandard(Integer id);
 
+	BaseResponse<String> deleteHistoryStandard(Integer id);
+
 	BaseResponse<StandardVo> getDetail(Integer id);
 
 	BaseResponse<String> enter(ChangeStockQuery query);

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

@@ -114,13 +114,13 @@ public class CommonServiceImpl {
 
 	/**
 	 * 保存附件信息
-	 * @param entityType  实体类型（0:用户(头像),1:合同附件,3设备校核附件，4标样材料）
+	 * @param entityType  实体类型（0:用户(头像),1:合同附件,3设备校核附件，4标样材料,6委托附件）
 	 * @param entityId    关联实体类id
 	 * @param enclosureQueryList 上传的附件列表
 	 */
 	public Boolean saveEntityEnclosure(Integer entityType, Integer entityId, List<EnclosureQuery> enclosureQueryList ){
 		Boolean ref = false;
-		QueryWrapper<EntityEnclosure> wrapper = new QueryWrapper<>();
+		/*QueryWrapper<EntityEnclosure> wrapper = new QueryWrapper<>();
 		wrapper.eq("entity_type", entityType);
 		wrapper.eq("entity_id", entityId);
 		List<EntityEnclosure> entityEnclosureList = entityEnclosureMapper.selectList(wrapper);
@@ -129,7 +129,7 @@ public class CommonServiceImpl {
 				eeOld.setIsDeleted(0);
 				entityEnclosureMapper.updateById(eeOld);
 			}
-		}
+		}*/
 		if(enclosureQueryList != null && enclosureQueryList.size()>0){
 			List<EntityEnclosure> eeList = new ArrayList<>();
 			for(int i = 0; i < enclosureQueryList.size(); i++){

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

@@ -147,7 +147,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 	private ISampleDistributionService sampleDistributionService;
 	@Resource
 	private NormProductionMapper normProductionMapper;
-
+	@Autowired
+	private IEntityEnclosureService entityEnclosureService;
 	/**
 	 * 委托分页
 	 *
@@ -348,6 +349,13 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 				.setSampleNum(query.getSampleTmpList().size())
 				.setIsTop(0);
 		entrustMapper.insert(entrust);
+
+		//2021.4.21 增加委托附件功能
+		Boolean ref = commonService.saveEntityEnclosure(EntityEnclosure.EntityType.ENTRUST_ENCLOSURES, entrust.getId(), query.getEnclosureQueryList());
+		if (!ref) {
+			return BaseResponse.errorMsg("保存保存校核附件失败!");
+		}
+
 		if (query.getSampleTmpList() != null && query.getSampleTmpList().size() > 0) {
 			List<SampleTmp> sampleTmpList = new ArrayList<>();
 			for (SampleTmpQuery sampleTmpQuery : query.getSampleTmpList()) {
@@ -405,7 +413,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 			return BaseResponse.errorMsg("样品及检测项不可为空");
 		}
 
-
 		logsService.saveLog(SysLogs.ObjType.ENTRUST_LOG, entrust.getId(), "提交了委托单", null);
 		//消息推送
 		List<Integer> approvalIdList = sysApprovalMapper.getApprovalId("委托评审");
@@ -507,6 +514,11 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 		if (entrust == null) {
 			return BaseResponse.errorMsg("信息错误");
 		}
+		//2021.4.21 增加委托附件功能
+		Boolean ref = commonService.saveEntityEnclosure(EntityEnclosure.EntityType.ENTRUST_ENCLOSURES, entrust.getId(), query.getEnclosureQueryList());
+		if (!ref) {
+			return BaseResponse.errorMsg("保存保存校核附件失败!");
+		}
 
 		if (entrust.getProjectId() == null) {
 			if (query.getProjectId() == null) {
@@ -774,6 +786,77 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 		return BaseResponse.okData("删除成功");
 	}
 
+
+	/**
+	 * 单独新增委托附件  2021.4.21 增加委托附件功能
+	 * @param id
+	 * @return
+	 */
+	@Override
+	@Transactional
+	public BaseResponse<String> addEnclosure(Integer id, EnclosureQuery query) {
+		LoginUser loginUser = userService.getLoginUser();
+		if (loginUser == null) {
+			return BaseResponse.noLogin("请登录账号");
+		}
+		if (id == null) {
+			return BaseResponse.errorMsg("参数错误");
+		}
+		Entrust entrust = entrustMapper.selectById(id);
+		if (entrust == null) {
+			return BaseResponse.errorMsg("委托信息错误");
+		}
+
+		EntityEnclosure ee = new EntityEnclosure();
+		ee.setEntityId(entrust.getId());
+		ee.setEntityType(EntityEnclosure.EntityType.ENTRUST_ENCLOSURES);
+		ee.setEnclosureUrl(query.getEnclosureUrl());
+		ee.setCreateTime(LocalDateTime.now());
+		ee.setUpdateTime(ee.getCreateTime());
+		ee.setIsDeleted(1);
+		ee.setAlias(query.getAlias());
+		ee.setExtName(query.getExtName());
+		entityEnclosureService.save(ee);
+		return BaseResponse.okMsg("成功");
+	}
+
+
+	/**
+	 * 查看委托附件信息
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Override
+	public BaseResponse<List<EntityEnclosure>> getHistoryEnclosure(Integer id) {
+		QueryWrapper<EntityEnclosure> wrapper = new QueryWrapper<>();
+		wrapper.eq("is_deleted", 1);
+		wrapper.eq("entity_type", EntityEnclosure.EntityType.ENTRUST_ENCLOSURES);
+		wrapper.eq("entity_id", id);
+		List<EntityEnclosure> entityEnclosureList = entityEnclosureMapper.selectList(wrapper);
+		return BaseResponse.okData(entityEnclosureList);
+	}
+
+
+	/**
+	 * 删除委托附件信息
+	 * @param id 附件id
+	 * @return
+	 */
+	@Override
+	public BaseResponse<String> deleteHistoryEnclosure(Integer id) {
+		EntityEnclosure entityEnclosure = entityEnclosureMapper.selectById(id);
+		entityEnclosure.setIsDeleted(0);
+		entityEnclosureMapper.updateById(entityEnclosure);
+		return BaseResponse.okMsg("成功");
+	}
+
+
+
+
+
+
+
 	/**
 	 * 委托详情
 	 *

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

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.SampleDistributionEquipment;
+import cn.wise.sc.cement.business.entity.SettleEquipment;
+import cn.wise.sc.cement.business.mapper.SampleDistributionEquipmentMapper;
+import cn.wise.sc.cement.business.mapper.SettleEquipmentMapper;
+import cn.wise.sc.cement.business.service.ISampleDistributionEquipmentService;
+import cn.wise.sc.cement.business.service.ISettleEquipmentService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+@Service
+public class SettleEquipmentServiceImpl extends ServiceImpl<SettleEquipmentMapper, SettleEquipment> implements ISettleEquipmentService {
+
+}

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

+package cn.wise.sc.cement.business.service.impl;
+
+import cn.wise.sc.cement.business.entity.SettleEquipment;
+import cn.wise.sc.cement.business.entity.SettleRecord;
+import cn.wise.sc.cement.business.mapper.SettleEquipmentMapper;
+import cn.wise.sc.cement.business.mapper.SettleRecordMapper;
+import cn.wise.sc.cement.business.service.ISettleEquipmentService;
+import cn.wise.sc.cement.business.service.ISettleRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ztw
+ * @since 2021-02-04
+ */
+@Service
+public class SettleRecordServiceImpl extends ServiceImpl<SettleRecordMapper, SettleRecord> implements ISettleRecordService {
+
+}

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

@@ -350,12 +350,31 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
     @Override
     public BaseResponse<List<EntityEnclosure>> getHistoryStandard(Integer id) {
         QueryWrapper<EntityEnclosure> wrapper = new QueryWrapper<>();
+        wrapper.eq("is_deleted", 1);
         wrapper.eq("entity_type", EntityEnclosure.EntityType.STANDARD_SAMPLE);
         wrapper.eq("entity_id", id);
         List<EntityEnclosure> entityEnclosureList = entityEnclosureMapper.selectList(wrapper);
         return BaseResponse.okData(entityEnclosureList);
     }
 
+    /**
+     * 删除历史标样材料信息
+     * @param id
+     * @return
+     */
+    @Override
+    public BaseResponse<String> deleteHistoryStandard(Integer id) {
+        EntityEnclosure entityEnclosure = entityEnclosureMapper.selectById(id);
+        entityEnclosure.setIsDeleted(0);
+        entityEnclosureMapper.updateById(entityEnclosure);
+        return BaseResponse.okMsg("成功");
+    }
+
+
+
+
+
+
     /**
      * 标样详情
      *

mybatis-generator/src/main/java/cn/wise/sc/cement/mg/GeneratorApplication.java

@@ -47,7 +47,7 @@ public class GeneratorApplication {
 		AutoGenerator mpg = new AutoGenerator();
 		// 数据源配置
 		DataSourceConfig dsc = new DataSourceConfig();
-		dsc.setUrl("jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?useUnicode=true&useSSL=false&characterEncoding=utf8");
+		dsc.setUrl("jdbc:mysql://192.168.110.85:3306/sinoma_zhengshiData?useUnicode=true&useSSL=false&characterEncoding=utf8");
 		dsc.setDriverName("com.mysql.jdbc.Driver");
 		dsc.setUsername("root");
 		dsc.setPassword("admin!@#123");