矿山域-流程管理

business-modules/business-mine/src/main/java/com/sckw/mine/entity/KwBusinessMineralAggregate.java

@@ -57,6 +57,11 @@ public class KwBusinessMineralAggregate implements Serializable {
      */
     private Integer status;
 
+    /*
+    矿料价值
+     */
+    private String value;
+
     /**
      * create_by
      */

business-modules/business-mine/src/main/java/com/sckw/mine/entity/req/MineralAggPageListParam.java

@@ -1,7 +1,10 @@
 package com.sckw.mine.entity.req;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @desc:
  * @author: Lt
@@ -21,4 +24,9 @@ public class MineralAggPageListParam {
     private String name;
 
     private Integer status;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endTime;
 }

business-modules/business-mine/src/main/java/com/sckw/mine/entity/req/MineralAggregateInsertParam.java

@@ -38,6 +38,11 @@ public class MineralAggregateInsertParam {
      */
     private String weight;
 
+    /*
+    矿料价值
+     */
+    private String value;
+
 }
 
 

business-modules/business-mine/src/main/java/com/sckw/mine/entity/req/MineralAggregateUpdateParam.java

@@ -45,6 +45,11 @@ public class MineralAggregateUpdateParam {
      */
     private Integer status;
 
+    /*
+    矿料价值
+     */
+    private String value;
+
 }
 
 

business-modules/business-mine/src/main/java/com/sckw/mine/entity/res/KwBusinessMineralAggregateDetailRes.java

@@ -60,6 +60,11 @@ public class KwBusinessMineralAggregateDetailRes implements Serializable {
     private Integer status;
     private String statusStr;
 
+    /*
+    矿料价值
+     */
+    private String value;
+
     /**
      * create_by
      */

business-modules/business-mine/src/main/java/com/sckw/mine/entity/res/MineralAggregateListRes.java

@@ -57,6 +57,11 @@ public class MineralAggregateListRes {
     private Integer status;
     private String statusStr;
 
+    /*
+    矿料价值
+     */
+    private String value;
+
     /**
      * create_by
      */

business-modules/business-mine/src/main/java/com/sckw/mine/enums/MineralAggregateTypeEnum.java

@@ -12,8 +12,8 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 @Getter
 public enum MineralAggregateTypeEnum {
-    ONE(1, "矿料类型1"),
-    TWO(2, "矿料类型2")
+    ONE(1, "石灰石原料"),
+    TWO(2, "石灰石加工品")
     ;
 
     private final Integer code;

business-modules/business-mine/src/main/java/com/sckw/mine/service/MineralAggregateService.java

@@ -112,6 +112,7 @@ public class MineralAggregateService {
         businessTruckPageListRes.forEach(e -> {
             e.setTypeStr(MineralAggregateTypeEnum.getNameByCode(e.getType()));
             e.setStatusStr(e.getStatus()==1?"启用":"禁用");
+            e.setUnitStr(e.getUnit()==1?"吨":"件");
         });
         return HttpResult.ok(new PageRes<>(new PageInfo<>(businessTruckPageListRes)));
     }

business-modules/business-mine/src/main/resources/mapper/MineralAggregateMapper.xml

@@ -12,6 +12,7 @@
                 size,
                 weight,
                 `status`,
+                `value`,
                 create_by,
                 update_by,
                 create_time,
@@ -40,6 +41,12 @@
             <if test="param.status != null">
                 and `status` = #{param.status}
             </if>
+            <if test="param.startTime != '' and param.startTime != null">
+                and o.create_time  >=  #{param.startTime}
+            </if>
+            <if test="param.endTime != '' and param.endTime != null">
+                and o.create_time  &lt; #{param.endTime}
+            </if>
         </where>
         order by create_time desc
     </select>
@@ -58,6 +65,7 @@
                 <if test="null != param.size and '' != param.size">size = #{param.size},</if>
                 <if test="null != param.weight">weight = #{param.weight},</if>
                 <if test="null != param.status">`status` = #{param.status}</if>
+                <if test="null != param.value and '' != param.value">`value` = #{param.value}</if>
             </trim>
         </set>
         WHERE id = #{param.id}