设备列表 标样列表 加上过期标识 和 库存标识

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

@@ -4,6 +4,7 @@ import cn.wise.sc.cement.business.entity.Standard;
 import cn.wise.sc.cement.business.entity.StandardGroupDto;
 import cn.wise.sc.cement.business.model.vo.EquipmentVo;
 import cn.wise.sc.cement.business.model.vo.StandardValueVo;
+import cn.wise.sc.cement.business.model.vo.StandardVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,7 +24,7 @@ import java.util.Map;
 public interface StandardMapper extends BaseMapper<Standard> {
 
 
-	IPage<Standard> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
+	IPage<StandardVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
 
 	List<StandardValueVo> getStandardDetaulList();
 

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

@@ -22,7 +22,7 @@
         </where>
     </sql>
 
-    <select id="getPage" resultType="cn.wise.sc.cement.business.entity.Standard">
+    <select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.StandardVo">
         SELECT t.*, s.name as supplierName
         FROM standard t
         left join supplier s on s.id = t.supplier_id

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

@@ -96,4 +96,10 @@ public class EquipmentVo {
 
 	@ApiModelProperty("供应商名称")
 	private String supplierName;
+
+
+	@ApiModelProperty("到期状态（0展示标识：表示即将过期，1不展示标识：正常显示）")
+	private Integer isDate;
+
+
 }

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

@@ -78,4 +78,11 @@ public class StandardVo {
 	@ApiModelProperty("产地")
 	private String origin;
 
+	@ApiModelProperty("库存状态（0展示标识：表示库存数量小于最小值，1不展示标识：正常显示）")
+	private Integer isStock;
+
+	@ApiModelProperty("到期状态（0展示标识：表示即将过期，1不展示标识：正常显示）")
+	private Integer isDate;
+
+
 }

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

@@ -26,7 +26,7 @@ import java.util.List;
  */
 public interface IStandardService extends IService<Standard> {
 
-	BaseResponse<IPage<Standard>> getPage(PageQuery pageQuery, String name, String supplierName);
+	BaseResponse<IPage<StandardVo>> getPage(PageQuery pageQuery, String name, String supplierName);
 
 	void export(String name, String supplierName, String fileName, HttpServletResponse response);
 

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

@@ -90,6 +90,28 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 		params.put("type", type);
 		Page<EquipmentVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
 		IPage<EquipmentVo> pages = equipmentMapper.getPage(page, params);
+		List<EquipmentVo> equipmentList = pages.getRecords();
+
+		//当前日期
+		LocalDate nowDate = LocalDate.now();
+		for(EquipmentVo eq : equipmentList ){
+			//检定到期日期 = 上次检定日期+周期的值 - 一个月 （提前一一个月提醒）
+			if(eq.getTestDate() != null && eq.getTestCycle() != null){
+				LocalDate expireDate =  eq.getTestDate().plusYears(Long.valueOf(eq.getTestCycle())).minusMonths(1);
+				//如果当前日期等于检定到期日期 或者 当前日期大于检定到期日期，提示设备检定人员检定设备
+				if(expireDate.isEqual(nowDate) || expireDate.isBefore(nowDate)){
+					if(expireDate.isEqual(nowDate) || expireDate.isBefore(nowDate)){
+						eq.setIsDate(0); //展示期标识
+					}else{
+						eq.setIsDate(1); //不展示期标识
+					}
+				}else{
+					eq.setIsDate(1); //不展示期标识
+				}
+			}else{
+				eq.setIsDate(1); //不展示期标识
+			}
+		}
 		return BaseResponse.okData(pages);
 	}
 

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

@@ -92,7 +92,7 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
      * @return
      */
     @Override
-    public BaseResponse<IPage<Standard>> getPage(PageQuery pageQuery, String name, String supplierName) {
+    public BaseResponse<IPage<StandardVo>> getPage(PageQuery pageQuery, String name, String supplierName) {
        /* QueryWrapper<Standard> qw = new QueryWrapper<>();
         if (StringUtils.isNotEmpty(name)) {
             qw.like("name", name);
@@ -107,8 +107,37 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         Map<String, Object> params = new HashMap<>();
         params.put("name", name);
         params.put("supplierName", supplierName);
-        Page<Standard> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
-        IPage<Standard> pages = standardMapper.getPage(page, params);
+        Page<StandardVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
+        IPage<StandardVo> pages = standardMapper.getPage(page, params);
+
+        List<StandardVo> standardList = pages.getRecords();
+        //当前日期
+        LocalDate nowDate = LocalDate.now();
+        for(StandardVo st : standardList){
+            if(st.getLeastNum() != null && st.getStockNum() != null){
+                if(st.getStockNum().compareTo(st.getLeastNum())<1){
+                    st.setIsStock(0); //展示库标识
+                }else{
+                    st.setIsStock(1); //不展示库标识
+                }
+            }else{
+                st.setIsStock(1);  //不展示库标识
+            }
+
+            if(st.getValidDate() != null){
+                LocalDate expireDate =  st.getValidDate().minusDays(15);
+                if(expireDate.isEqual(nowDate) || expireDate.isBefore(nowDate)){
+
+                    st.setIsDate(0); //展示期标识
+                }else{
+                    st.setIsDate(1); //不展示期标识
+                }
+            }else{
+                st.setIsDate(1); //不展示期标识
+            }
+
+        }
+
         return BaseResponse.okData(pages);
     }
 
@@ -170,16 +199,19 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         if (StringUtils.isEmpty(query.getName())) {
             return BaseResponse.errorMsg("标样名称不能为空!");
         }
+        if (StringUtils.isEmpty(query.getCode())) {
+            return BaseResponse.errorMsg("标样代号不能为空!");
+        }
         LoginUser loginUser = userService.getLoginUser();
         if (loginUser == null) {
             return BaseResponse.noLogin("请登录账号");
         }
 
         QueryWrapper<Standard> qw = new QueryWrapper<>();
-        qw.eq("name", query.getName());
+        qw.eq("code", query.getCode());
         int count = standardMapper.selectCount(qw);
         if (count > 0) {
-            return BaseResponse.errorMsg(query.getName() + "已存在");
+            return BaseResponse.errorMsg(query.getCode() + "已存在");
         }
         if(query.getUnitStock().compareTo(new BigDecimal(0)) < 1){
             return BaseResponse.errorMsg("每瓶克数必须大于0!");
@@ -251,12 +283,15 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
         if (StringUtils.isEmpty(query.getName())) {
             return BaseResponse.errorMsg("标样名称不能为空!");
         }
+        if (StringUtils.isEmpty(query.getCode())) {
+            return BaseResponse.errorMsg("标样代号不能为空!");
+        }
         QueryWrapper<Standard> qw = new QueryWrapper<>();
-        qw.eq("name", query.getName());
+        qw.eq("code", query.getCode());
         qw.ne("id", query.getId());
         int count = standardMapper.selectCount(qw);
         if (count > 0) {
-            return BaseResponse.errorMsg(query.getName() + "已存在");
+            return BaseResponse.errorMsg(query.getCode() + "已存在");
         }
         if(query.getUnitStock().compareTo(new BigDecimal(0)) < 1){
             return BaseResponse.errorMsg("每瓶克数必须大于0!");