矿山域-任务卡片

business-modules/business-mine/src/main/java/com/sckw/mine/controller/MineController.java

@@ -78,7 +78,7 @@ public class MineController {
     }
 
     /**
-     * @Description: 完结订单
+     * @Description: 取消订单
      * @Author: Lt
      * @Date: 2024/5/28 11:06
      */

business-modules/business-mine/src/main/java/com/sckw/mine/controller/MineralAggregateController.java

@@ -0,0 +1,79 @@
+package com.sckw.mine.controller;
+
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.mine.entity.req.MineralAggPageListParam;
+import com.sckw.mine.entity.req.MineralAggregateInsertParam;
+import com.sckw.mine.entity.req.MineralAggregateUpdateParam;
+import com.sckw.mine.service.MineralAggregateService;
+import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @desc: 矿料管理
+ * @author: Lt
+ * @date: 2024-05-30
+ */
+@RestController
+@RequestMapping("mine/aggregate")
+public class MineralAggregateController {
+
+    @Autowired
+    MineralAggregateService mineralAggregateService;
+
+
+    /**
+     * 新增
+     * @author lt
+     * @date 2024/05/30
+     **/
+    @RequestMapping("/insert")
+    public Object insert(@RequestBody @Valid MineralAggregateInsertParam mineralAggregateInsertParam){
+        return mineralAggregateService.insert(mineralAggregateInsertParam);
+    }
+
+    /**
+     * 刪除
+     * @author lt
+     * @date 2024/05/30
+     **/
+    @PostMapping("/delete")
+    public Object delete(@RequestParam("id") String id){
+        return mineralAggregateService.AggreDelete(id);
+    }
+
+    /**
+     * 更新
+     * @author lt
+     * @date 2024/05/30
+     **/
+    @RequestMapping("/update")
+    public Object update(@RequestBody @Valid MineralAggregateUpdateParam mineralAggregateUpdateParam){
+        return mineralAggregateService.update(mineralAggregateUpdateParam);
+    }
+
+    /**
+     * 查询 根据主键 id 查询
+     * @author lt
+     * @date 2024/05/30
+     **/
+    @GetMapping("/detail")
+    public Object detail(@RequestParam("id") String id){
+        return mineralAggregateService.detail(id);
+    }
+
+    /**
+     * 查询 分页查询
+     * @author lt
+     * @date 2024/05/30
+     **/
+    @RequestMapping("/pageList")
+    public HttpResult pageList(MineralAggPageListParam mineralAggPageListParam) {
+        return mineralAggregateService.pageList(mineralAggPageListParam);
+    }
+
+
+
+
+
+}

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

@@ -20,6 +20,8 @@ public class KwBusinessMineralAggregate implements Serializable {
      */
     private Long id;
 
+    private String code;
+
     /**
      * 租户id
      */
@@ -31,7 +33,27 @@ public class KwBusinessMineralAggregate implements Serializable {
     private String name;
 
     /**
-     * 矿料状态
+     * 矿料类型
+     */
+    private Integer type;
+
+    /**
+     * 计量单位
+     */
+    private Integer unit;
+
+    /**
+     * 矿料尺寸
+     */
+    private String size;
+
+    /**
+     * 矿料重量
+     */
+    private Double weight;
+
+    /**
+     * 状态=1(正常)
      */
     private Integer status;
 
@@ -59,4 +81,5 @@ public class KwBusinessMineralAggregate implements Serializable {
      * del_flag
      */
     private Integer delFlag;
+
 }

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

@@ -0,0 +1,16 @@
+package com.sckw.mine.entity.req;
+
+import lombok.Data;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-30
+ */
+@Data
+public class MineralAggPageListParam {
+
+    private Integer page;
+
+    private Integer pageSize;
+}

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

@@ -0,0 +1,44 @@
+package com.sckw.mine.entity.req;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-30
+ */
+@Data
+public class MineralAggregateInsertParam {
+
+
+    /*
+    矿料名称
+     */
+    @NotBlank(message = "矿料名称必填")
+    private String name;
+
+    /*
+    矿料单位
+     */
+    private String unit;
+
+    /*
+    矿料类型
+     */
+    private String type;
+
+    /*
+    矿料尺寸
+     */
+    private String size;
+
+    /*
+    矿料重量
+     */
+    private String weight;
+
+}
+
+
+

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

@@ -0,0 +1,51 @@
+package com.sckw.mine.entity.req;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-30
+ */
+@Data
+public class MineralAggregateUpdateParam {
+
+    @NotBlank(message = "id必填")
+    private String id;
+
+    /*
+    矿料名称
+     */
+    @NotBlank(message = "矿料名称必填")
+    private String name;
+
+    /*
+    矿料单位
+     */
+    private String unit;
+
+    /*
+    矿料类型
+     */
+    private String type;
+
+    /*
+    矿料尺寸
+     */
+    private String size;
+
+    /*
+    矿料重量
+     */
+    private String weight;
+
+    /*
+    矿料状态
+     */
+    private Integer status;
+
+}
+
+
+

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

@@ -0,0 +1,85 @@
+package com.sckw.mine.entity.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-29
+ */
+@Data
+public class KwBusinessMineralAggregateDetailRes implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    private String code;
+
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+    /**
+     * 矿料名称
+     */
+    private String name;
+
+    /**
+     * 矿料类型
+     */
+    private Integer type;
+
+    /**
+     * 计量单位
+     */
+    private Integer unit;
+
+    /**
+     * 矿料尺寸
+     */
+    private String size;
+
+    /**
+     * 矿料重量
+     */
+    private Double weight;
+
+    /**
+     * 状态=1(正常)
+     */
+    private Integer status;
+    private String statusStr;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * update_time
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+
+}

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

@@ -0,0 +1,79 @@
+package com.sckw.mine.entity.res;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-30
+ */
+@Data
+public class MineralAggregateListRes {
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+    /**
+     * 矿料名称
+     */
+    private String name;
+
+    /**
+     * 矿料类型
+     */
+    private Integer type;
+    private String typeStr;
+
+    /**
+     * 计量单位
+     */
+    private Integer unit;
+    private String unitStr;
+
+    /**
+     * 矿料尺寸
+     */
+    private String size;
+
+    /**
+     * 矿料重量
+     */
+    private Double weight;
+
+    /**
+     * 状态=1(正常)
+     */
+    private Integer status;
+
+    /**
+     * create_by
+     */
+    private String createBy;
+
+    /**
+     * update_by
+     */
+    private String updateBy;
+
+    /**
+     * create_time
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    /**
+     * update_time
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updateTime;
+
+}

business-modules/business-mine/src/main/java/com/sckw/mine/mapper/MineralAggregateMapper.java

@@ -0,0 +1,26 @@
+package com.sckw.mine.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sckw.mine.entity.KwBusinessMineralAggregate;
+import com.sckw.mine.entity.req.MineralAggPageListParam;
+import com.sckw.mine.entity.req.MineralAggregateUpdateParam;
+import com.sckw.mine.entity.res.KwBusinessMineralAggregateDetailRes;
+import com.sckw.mine.entity.res.MineralAggregateListRes;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+@DS("mine")
+public interface MineralAggregateMapper extends BaseMapper<KwBusinessMineralAggregate> {
+
+    List<MineralAggregateListRes> mineAggregatePageList(@Param("param") MineralAggPageListParam param);
+    int aggreDelete(String id);
+
+    int aggreUpdate(@Param("param") MineralAggregateUpdateParam param);
+
+    KwBusinessMineralAggregateDetailRes load(@Param("id") String id);
+
+}

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

@@ -0,0 +1,108 @@
+package com.sckw.mine.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sckw.core.model.constant.Global;
+import com.sckw.core.model.page.PageRes;
+import com.sckw.core.utils.IdWorker;
+import com.sckw.core.utils.TenantUtil;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.mine.common.OrderServerCommon;
+import com.sckw.mine.entity.KwBusinessMineralAggregate;
+import com.sckw.mine.entity.req.MineralAggPageListParam;
+import com.sckw.mine.entity.req.MineralAggregateInsertParam;
+import com.sckw.mine.entity.req.MineralAggregateUpdateParam;
+import com.sckw.mine.entity.res.KwBusinessMineralAggregateDetailRes;
+import com.sckw.mine.entity.res.MineralAggregateListRes;
+import com.sckw.mine.mapper.MineralAggregateMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-05-30
+ */
+@Service
+public class MineralAggregateService {
+
+    @Autowired
+    MineralAggregateMapper mineralAggregateMapper;
+
+    @Autowired
+    OrderServerCommon orderServerCommon;
+
+    /*
+    矿料添加
+     */
+    public HttpResult insert(MineralAggregateInsertParam param) {
+
+        if (param == null) {
+            return HttpResult.error("必要参数缺失");
+        }
+
+        LambdaQueryWrapper<KwBusinessMineralAggregate> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(KwBusinessMineralAggregate::getName, param.getName())
+                .eq(KwBusinessMineralAggregate::getDelFlag, Global.NUMERICAL_ZERO);
+        KwBusinessMineralAggregate kwBusinessMineralAggregates = mineralAggregateMapper.selectOne(wrapper);
+        if (ObjectUtils.isNotNull(kwBusinessMineralAggregates)) {
+            throw new RuntimeException("当前矿料已存在,勿重复添加");
+        }
+
+        KwBusinessMineralAggregate kwBusinessMineralAggregate = BeanUtil.copyProperties(param, KwBusinessMineralAggregate.class);
+        String code = orderServerCommon.generatorNum("LCJD", 13);
+        String tenant = TenantUtil.getTenant();
+
+        kwBusinessMineralAggregate.setId(new IdWorker(1L).nextId());
+        kwBusinessMineralAggregate.setTenantId(tenant);
+        kwBusinessMineralAggregate.setCode(code);
+        kwBusinessMineralAggregate.setStatus(1);
+
+        mineralAggregateMapper.insert(kwBusinessMineralAggregate);
+        return HttpResult.ok();
+    }
+
+
+    public HttpResult AggreDelete(String id) {
+        System.out.println(id);
+        int ret = mineralAggregateMapper.aggreDelete(id);
+        return ret>0?HttpResult.ok():HttpResult.error();
+    }
+
+
+    public HttpResult update(MineralAggregateUpdateParam param) {
+
+        LambdaQueryWrapper<KwBusinessMineralAggregate> wrapper = new LambdaQueryWrapper<>();
+        wrapper.ne(KwBusinessMineralAggregate::getId, param.getId())
+                .eq(KwBusinessMineralAggregate::getName, param.getName())
+                .eq(KwBusinessMineralAggregate::getDelFlag, Global.NUMERICAL_ZERO);
+        KwBusinessMineralAggregate kwBusinessMineralAggregates = mineralAggregateMapper.selectOne(wrapper);
+        if (ObjectUtils.isNotNull(kwBusinessMineralAggregates)){
+            throw new RuntimeException("当前名称已存在");
+        }
+
+
+        int ret = mineralAggregateMapper.aggreUpdate(param);
+        return ret>0?HttpResult.ok():HttpResult.error();
+    }
+
+
+    public KwBusinessMineralAggregateDetailRes detail(String id) {
+        return mineralAggregateMapper.load(id);
+    }
+
+
+    public HttpResult pageList(MineralAggPageListParam param) {
+
+        PageHelper.startPage(param.getPage(), param.getPageSize());
+        List<MineralAggregateListRes> businessTruckPageListRes = mineralAggregateMapper.mineAggregatePageList(param);
+        return HttpResult.ok(new PageRes<>(new PageInfo<>(businessTruckPageListRes)));
+    }
+
+}

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sckw.mine.mapper.MineralAggregateMapper">
+
+    <sql id="Base_Column_List">
+        id,
+                tenant_id,
+                `code`,
+                `name`,
+                type,
+                unit,
+                size,
+                weight,
+                `status`,
+                create_by,
+                update_by,
+                create_time,
+                update_time,
+                del_flag
+    </sql>
+
+    <update id="aggreDelete">
+        update kw_business_mineral_aggregate set del_flag = 1 where id = #{id}
+    </update>
+
+    <select id="mineAggregatePageList"
+            resultType="com.sckw.mine.entity.res.MineralAggregateListRes">
+        select <include refid="Base_Column_List" /> from kw_business_mineral_aggregate
+        <where>
+            del_flag = 0
+            <if test="param.code != '' and param.code != null">
+                and code like concat('%',#{param.code},'%')
+            </if>
+        </where>
+    </select>
+    <select id="load" resultType="com.sckw.mine.entity.res.KwBusinessMineralAggregateDetailRes">
+        select <include refid="Base_Column_List" /> from kw_business_mineral_aggregate where id = #{id}
+    </select>
+
+
+    <update id="aggreUpdate" parameterType="com.sckw.mine.entity.req.MineralAggregateUpdateParam">
+        UPDATE kw_business_mineral_aggregate
+        <set>
+            <trim suffixOverrides=",">
+                <if test="null != param.name and '' != param.name">`name` = #{param.name},</if>
+                <if test="null != param.type">type = #{param.type},</if>
+                <if test="null != param.unit">unit = #{param.unit},</if>
+                <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>
+            </trim>
+        </set>
+        WHERE id = #{param.id}
+    </update>
+
+</mapper>

business-modules/business-usual-transport/src/main/java/com/sckw/usual/mapper/OrderGeneralTransportMapper.java

@@ -30,7 +30,7 @@ public interface OrderGeneralTransportMapper extends BaseMapper<KwOrder> {
 
     LogisticsCountVo findLogisticsOrderCount(Map<String, Object> params);
 
-    List<Map<String, Object>> countByStatus();
+    List<Map<String, Object>> countByStatus(@Param("tenant") String tenant);
 
     @MapKey("waybillCount")
     int finishWaybillCount(String orderId);

business-modules/business-usual-transport/src/main/java/com/sckw/usual/service/OrderActionService.java

@@ -904,7 +904,10 @@ public class OrderActionService {
     */
     public List<Map<String, Object>> getStatusCountListInSingleQuery() {
         // 查询每个状态的计数
-        List<Map<String, Object>> statusCounts = orderGeneralTransportMapper.countByStatus();
+
+        String tenant = TenantUtil.getTenant();
+
+        List<Map<String, Object>> statusCounts = orderGeneralTransportMapper.countByStatus(tenant);
 
         // 将查询结果转换为所需的格式
         List<OrderUsualStatusEnum> sortedEnums = OrderUsualStatusEnum.getSortList();

business-modules/business-usual-transport/src/main/java/com/sckw/usual/service/WaybillOrderService.java

@@ -76,6 +76,10 @@ public class WaybillOrderService {
      */
     public PageRes<WaybillPageListRes> waybillPageList(WaybillPageListReq waybillPageListReq)
     {
+        String tenant = TenantUtil.getTenant();
+        if (StringUtils.isNotBlank(tenant)){
+            waybillPageListReq.setTenantId(tenant);
+        }
         PageHelper.startPage(waybillPageListReq.getPage(), waybillPageListReq.getPageSize());
         List<WaybillPageListRes> kwBusinessPaths = kwWaybillOrderMapper.selectPageList(waybillPageListReq);
 

business-modules/business-usual-transport/src/main/resources/mapper/OrderMapper.xml

@@ -176,7 +176,7 @@
     </select>
 
     <select id="countByStatus" resultType="java.util.Map">
-        SELECT `status`, COUNT(*) AS count FROM kw_order where del_flag = 0 GROUP BY `status`
+        SELECT `status`, COUNT(*) AS count FROM kw_order where del_flag = 0 GROUP BY `status` and tenant_id = #{tenant}
     </select>
     <select id="finishWaybillCount" resultType="Integer">
         select COALESCE(count(id), 0) from kw_waybill_order where order_id = #{#orderId} and status = 5 and del_flag = 0