功能优化+ bug修改

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

@@ -34,6 +34,12 @@ public class Equipment implements Serializable {
 	@TableId(value = "id", type = IdType.AUTO)
 	private Integer id;
 
+	@ApiModelProperty("设备分类（A、B）")
+	private String type;
+
+	@ApiModelProperty("是否已检定（1是，0否）")
+	private Integer isChecked;
+
 	@ApiModelProperty("设备名称")
 	private String name;
 

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

@@ -20,6 +20,9 @@ public class EquipmentQuery {
 
 	private Integer id;
 
+	@ApiModelProperty("设备分类（A、B）")
+	private String type;
+
 	@ApiModelProperty("设备名称")
 	private String name;
 

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

@@ -24,6 +24,13 @@ public class EquipmentVo {
 	 */
 	private Integer id;
 
+
+	@ApiModelProperty("设备分类（A、B）")
+	private String type;
+
+	@ApiModelProperty("是否已检定（1是，0否）")
+	private Integer isChecked;
+
 	@ApiModelProperty("设备名称")
 	private String name;
 

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

@@ -2537,7 +2537,15 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             if (approvalIdList == null) {
                 return BaseResponse.errorMsg("委托评审信息错误");
             }
+
+
+
+
             String userIds = "";
+            SysUser createUser = userService.getById(entrust.getUserId());
+            if(createUser != null){
+                userIds = createUser.getWxId();
+            }
             for(Integer approvalId : approvalIdList ){
                 SysUser approvalUser = userService.getById(approvalId);
                 if(approvalUser == null){

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

@@ -198,7 +198,9 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 		}
 		Equipment equipment = new Equipment();
 		BeanUtils.copyProperties(query, equipment);
-		equipment.setStatus(1).setCreateTime(LocalDateTime.now());
+		equipment.setStatus(1)
+				.setIsChecked(1)
+				.setCreateTime(LocalDateTime.now());
 		equipmentMapper.insert(equipment);
 		return BaseResponse.okData(equipment);
 	}
@@ -277,6 +279,7 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 		equipment.setEnclosureUrl(enclosureQuery.getEnclosureUrl());
 		equipment.setAlias(enclosureQuery.getAlias());
 		equipment.setExtName(enclosureQuery.getExtName());
+		equipment.setIsChecked(1);
 		equipmentMapper.updateById(equipment);
 		return BaseResponse.okData("检定完成");
 	}
@@ -316,6 +319,8 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 				LocalDate expireDate =  eq.getTestDate().plusYears(Long.valueOf(eq.getTestCycle())).minusMonths(1);
 				//如果当前日期等于检定到期日期 或者 当前日期大于检定到期日期，提示设备检定人员检定设备
 				if(expireDate.isEqual(nowDate) || expireDate.isBefore(nowDate)){
+					eq.setIsChecked(0);
+					equipmentMapper.updateById(eq);
 					//发送企业微信消息内容
 					String content="你好！名称："+eq.getName()+"，编号："+eq.getCode()+"的设备近期需要进行设备检定，如果已经检定完毕请前往\n" +
 							systemUrl+"更新检定记录。";