模块开发13

huimv-farm/src/main/java/vip/xiaonuo/production/entity/ProductionEnergyPrice.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -30,112 +32,124 @@ public class ProductionEnergyPrice implements Serializable {
     private Integer id;
 
     /**
+     * 车间id
+     */
+    @ApiModelProperty(value = "车间id",position =1 )
+    private Integer locationId;
+
+    /**
+     * 车间名称
+     */
+    @ApiModelProperty(value = "车间名称",position =2 )
+    private String locationName;
+
+    /**
      * 电量
      */
-    @ApiModelProperty(value = "电量", position =1)
+    @ApiModelProperty(value = "电量",position = 3)
     private String electricity;
 
     /**
      * 蒸汽
      */
-    @ApiModelProperty(value = "蒸汽", position =2)
+    @ApiModelProperty(value = "蒸汽", position = 4)
     private String zhengQi;
 
     /**
      * 氮气
      */
-    @ApiModelProperty(value = "氮气", position =3)
+    @ApiModelProperty(value = "氮气",position = 5)
     private String danQi;
 
     /**
      * 压缩空气
      */
-    @ApiModelProperty(value = "压缩空气", position =4)
+    @ApiModelProperty(value = "压缩空气",position = 6)
     private String yaSuo;
 
     /**
-     * ro水总量
+     * RO水总量
      */
-    @ApiModelProperty(value = "ro水总量", position =5)
+    @ApiModelProperty(value = "RO水总量",position = 7)
     private String roWater;
 
     /**
      * 自来水
      */
-    @ApiModelProperty(value = "自来水", position =6)
-    private String ziWater;
+    @ApiModelProperty(value = "自来水",position = 8)
+    private String zlWater;
 
     /**
      * 循环水
      */
-    @ApiModelProperty(value = "循环水", position =7)
-    private String xunWater;
+    @ApiModelProperty(value = "循环水",position = 9)
+    private String xhWater;
 
     /**
      * 7度水
      */
-    @ApiModelProperty(value = "7度水", position =8)
-    private String qiWater;
+    @ApiModelProperty(value = "7度水",position = 10)
+    private String qdWater;
+
+    /**
+     * 负15度水
+     */
+    @ApiModelProperty(value = "负15度水",position = 11)
+    private String swdWater;
 
     /**
-     * -15度水
+     * 负25度水
      */
-    @ApiModelProperty(value = "-15度水", position =9)
-    private String fuShiwuWater;
+    @ApiModelProperty(value = "负25度水",position = 12)
+    private String eswdWater;
 
     /**
-     * -25度水
+     * 产量
      */
-    @ApiModelProperty(value = "-25度水", position =9)
-    private String fuErshiwuWater;
+    @ApiModelProperty(value = "产量",position = 13)
+    private String produce;
 
     /**
      * 热水
      */
-    @ApiModelProperty(value = "热水", position =10)
+    @ApiModelProperty(value = "热水",position = 14)
     private String reWater;
 
     /**
      * 低温水
      */
-    @ApiModelProperty(value = "低温水", position =11)
+    @ApiModelProperty(value = "低温水",position = 15)
     private String diwenWater;
 
     /**
-     * -15度乙二醇
+     * 负15度乙二醇
      */
-    @ApiModelProperty(value = "-15度乙二醇", position =12)
-    private String fushiwuYierchun;
+    @ApiModelProperty(value = "负15度乙二醇",position =16 )
+    private String fuSwdYierchun;
 
     /**
-     * -25度乙二醇
+     * 负25度乙二醇
      */
-    @ApiModelProperty(value = "-25度乙二醇", position =13)
-    private String fuershiwuYierchun;
+    @ApiModelProperty(value = "负25度乙二醇",position = 17)
+    private String fuEswdYierchun;
 
     /**
-     * 公司id
+     * 组织id
      */
-    @ApiModelProperty(value = "公司id", position =14)
+    @ApiModelProperty(value = "组织id",position = 18)
     private String orgId;
 
     /**
-     * 公司名称
+     * 创建时间
      */
-    @ApiModelProperty(value = "公司名称", position =15)
-    private String orgName;
+    @ApiModelProperty(value = "创建时间", position =19)
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
 
-    /**
-     * 车间id
-     */
-    @ApiModelProperty(value = "车间id", position =16)
-    private String locationId;
 
     /**
-     * 车间名称
+     * 公司名称
      */
-    @ApiModelProperty(value = "车间名称", position =17)
-    private String locationName;
-
-
+    @ApiModelProperty(value = "公司名称",position = 20)
+    private String orgName;
 }

huimv-farm/src/main/java/vip/xiaonuo/production/service/impl/ProductionEnergyPriceServiceImpl.java

@@ -30,7 +30,7 @@ public class ProductionEnergyPriceServiceImpl extends ServiceImpl<ProductionEner
     @Override
     public CommonResult addAndEdit(ProductionEnergyPrice energyPrice) {
         String orgId = energyPrice.getOrgId();
-        String locationId = energyPrice.getLocationId();
+        Integer locationId = energyPrice.getLocationId();
         ProductionEnergyPrice productionEnergyPrice = priceMapper.selectOne(new QueryWrapper<ProductionEnergyPrice>().eq("location_id", locationId).eq("org_id", orgId));
         if (ObjectUtil.isEmpty(productionEnergyPrice)) {
             priceMapper.insert(energyPrice);

huimv-farm/src/main/java/vip/xiaonuo/production/service/impl/ProductionTargetServiceImpl.java

@@ -142,13 +142,57 @@ public class ProductionTargetServiceImpl extends ServiceImpl<ProductionTargetMap
                 priceQueryWrapper.eq("location_id", energy.getLocationId());
                 ProductionEnergyPrice energyPrice = priceMapper.selectOne(priceQueryWrapper);
                 if (ObjectUtil.isNotEmpty(energyPrice)) {
+                    if ("".equals(energyPrice.getElectricity())) {
+                        energyPrice.setElectricity("0");
+                    }
+                    if ("".equals(energyPrice.getZhengQi())) {
+                        energyPrice.setZhengQi("0");
+                    }
+                    if ("".equals(energyPrice.getDanQi())) {
+                        energyPrice.setDanQi("0");
+                    }
+                    if ("".equals(energyPrice.getYaSuo())) {
+                        energyPrice.setYaSuo("0");
+                    }
+                    if ("".equals(energyPrice.getRoWater())) {
+                        energyPrice.setRoWater("0");
+                    }
+                    if ("".equals(energyPrice.getZlWater())) {
+                        energyPrice.setZlWater("0");
+                    }
+                    if ("".equals(energyPrice.getXhWater())) {
+                        energyPrice.setXhWater("0");
+                    }
+                    if ("".equals(energyPrice.getQdWater())) {
+                        energyPrice.setQdWater("0");
+                    }
+                    if ("".equals(energyPrice.getSwdWater())) {
+                        energyPrice.setSwdWater("0");
+                    }
+                    if ("".equals(energyPrice.getEswdWater())) {
+                        energyPrice.setEswdWater("0");
+                    }
+                    if ("".equals(energyPrice.getReWater())) {
+                        energyPrice.setReWater("0");
+                    }
+                    if ("".equals(energyPrice.getDiwenWater())) {
+                        energyPrice.setDiwenWater("0");
+                    }
+                    if ("".equals(energyPrice.getFuSwdYierchun())) {
+                        energyPrice.setFuSwdYierchun("0");
+                    }
+                    if ("".equals(energyPrice.getFuEswdYierchun())) {
+                        energyPrice.setFuEswdYierchun("0");
+                    }
+
+
                     count = count + Double.valueOf(energy.getElectricity()) * Double.valueOf(energyPrice.getElectricity())+Double.valueOf(energy.getZhengQi()) * Double.valueOf(energyPrice.getZhengQi())
                             +Double.valueOf(energy.getDanQi()) * Double.valueOf(energyPrice.getDanQi())+Double.valueOf(energy.getYaSuo()) * Double.valueOf(energyPrice.getYaSuo())+
-                            Double.valueOf(energy.getRoWater()) * Double.valueOf(energyPrice.getRoWater())+Double.valueOf(energy.getZlWater()) * Double.valueOf(energyPrice.getZiWater())+
-                            Double.valueOf(energy.getXhWater()) * Double.valueOf(energyPrice.getXunWater())+Double.valueOf(energy.getQdWater()) * Double.valueOf(energyPrice.getQiWater())+
-                            Double.valueOf(energy.getSwdWater()) * Double.valueOf(energyPrice.getFuShiwuWater())+Double.valueOf(energy.getEswdWater()) * Double.valueOf(energyPrice.getFuErshiwuWater())+
+                            Double.valueOf(energy.getRoWater()) * Double.valueOf(energyPrice.getRoWater())+Double.valueOf(energy.getZlWater()) * Double.valueOf(energyPrice.getZlWater())+
+                            Double.valueOf(energy.getXhWater()) * Double.valueOf(energyPrice.getXhWater())+Double.valueOf(energy.getQdWater()) * Double.valueOf(energyPrice.getQdWater())+
+                            Double.valueOf(energy.getSwdWater()) * Double.valueOf(energyPrice.getSwdWater())+Double.valueOf(energy.getEswdWater()) * Double.valueOf(energyPrice.getEswdWater())+
                             Double.valueOf(energy.getReWater()) * Double.valueOf(energyPrice.getReWater())+Double.valueOf(energy.getDiwenWater()) * Double.valueOf(energyPrice.getDiwenWater())+
-                            Double.valueOf(energy.getFuSwdYierchun()) * Double.valueOf(energyPrice.getFushiwuYierchun())+Double.valueOf(energy.getFuEswdYierchun()) * Double.valueOf(energyPrice.getFuershiwuYierchun());
+                            Double.valueOf(energy.getFuSwdYierchun()) * Double.valueOf(energyPrice.getFuSwdYierchun())+Double.valueOf(energy.getFuEswdYierchun()) * Double.valueOf(energyPrice.getFuEswdYierchun());
                 }
             }
         }

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

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -47,6 +48,7 @@ public class QualityWrite implements Serializable {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间",position = 3)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -55,5 +57,7 @@ public class QualityWrite implements Serializable {
     @ApiModelProperty(value = "组织id",position =4 )
     private String orgId;
 
+    @ApiModelProperty(value = "组织名称",position =5 )
+    private String orgName;
 
 }

huimv-farm/src/main/java/vip/xiaonuo/quality/param/QualityWriteAddParam.java

@@ -3,6 +3,7 @@ package vip.xiaonuo.quality.param;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -38,6 +39,7 @@ public class QualityWriteAddParam  {
      * 创建时间
      */
     @ApiModelProperty(value = "创建时间",position = 3)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -47,4 +49,7 @@ public class QualityWriteAddParam  {
     private String orgId;
 
 
+    @ApiModelProperty(value = "组织名称",position =5 )
+    private String orgName;
+
 }

huimv-farm/src/main/java/vip/xiaonuo/write/entity/WriteProduct.java

@@ -7,6 +7,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -83,12 +84,14 @@ public class WriteProduct implements Serializable {
      * 取样日期
      */
     @ApiModelProperty(value = "取样日期", position =9)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date sampleDate;
 
     /**
      * 报告日期
      */
     @ApiModelProperty(value = "报告日期", position =10)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date reportDate;
 
     /**

huimv-farm/src/main/java/vip/xiaonuo/write/param/WriteProductAddParam.java

@@ -3,6 +3,7 @@ package vip.xiaonuo.write.param;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -75,12 +76,14 @@ public class WriteProductAddParam  {
      * 取样日期
      */
     @ApiModelProperty(value = "取样日期", position =9)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date sampleDate;
 
     /**
      * 报告日期
      */
     @ApiModelProperty(value = "报告日期", position =10)
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date reportDate;
 
     /**