1

huimv-farm/src/main/java/vip/xiaonuo/quality/entity/QualityManufacturer.java

@@ -60,7 +60,7 @@ public class QualityManufacturer implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间", position =5)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date createTime;
 
     /**

huimv-farm/src/main/java/vip/xiaonuo/quality/entity/QualityReagent.java

@@ -48,7 +48,7 @@ public class QualityReagent implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间", position =3)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date createTime;
 
     /**

huimv-farm/src/main/java/vip/xiaonuo/quality/service/impl/QualityReagentServiceImpl.java

@@ -39,11 +39,11 @@ public class QualityReagentServiceImpl extends ServiceImpl<QualityReagentMapper,
         Integer timeType = reagentParam.getTimeType();
         QueryWrapper<QualityReagent> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(orgId), "org_id", orgId);
-        queryWrapper.eq(StringUtils.isNotBlank(produce), "regent_name", produce);
+        queryWrapper.eq(StringUtils.isNotBlank(produce), "reagent_name", produce);
         if (0 == timeType) {
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y')");
         } else {
-            queryWrapper.ge("create_time", DateUtil.beginOfYear(new Date()));
+//            queryWrapper.ge("create_time", DateUtil.beginOfYear(new Date()));
             queryWrapper.groupBy("DATE_FORMAT(create_time,'%Y-m')");
         }
         queryWrapper.orderByAsc("create_time");