箱动态

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/TCntrnoController.java

@@ -8,14 +8,7 @@ import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -24,10 +17,12 @@ import com.ruoyi.shipping.domain.TCntrno;
 import com.ruoyi.shipping.service.ITCntrnoService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
 
 /**
  * 集装箱号Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-03-22
  */
@@ -145,7 +140,7 @@ public class TCntrnoController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('shipping:cntrno:remove')")
     @Log(title = "集装箱号", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{fIds}")
+    @DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds)
     {
         return toAjax(tCntrnoService.updateTcntrnoStatus(fIds));
@@ -183,4 +178,42 @@ public class TCntrnoController extends BaseController
         List<TCntrno> list = tCntrnoService.getTCntrnoDistribute(tCntrno);
         return getDataTable(list);
     }
+    /**
+     * 导入集装箱动态数据
+     */
+    @PreAuthorize("@ss.hasPermi('shipping:cntrno:import')")
+    @Log(title = "导入集装箱动态", businessType = BusinessType.IMPORT)
+    @PostMapping("/importDataTcntrno")
+    public AjaxResult importDataTcntrno(@RequestParam("fileName") MultipartFile fileName,@RequestParam("fileName") boolean updateSupport) throws Exception
+    {
+        if (fileName.isEmpty()) {
+            return AjaxResult.error("该文件无内容！");
+        }
+        // 如果传入false为不覆盖
+        AjaxResult ajaxResult= null;
+        if(updateSupport==false){
+            ajaxResult= tCntrnoService.importTcntrnoDataExcel(fileName);
+        }else{
+            ajaxResult= tCntrnoService.importUpdateDataTcntrnoExcel(fileName);
+        }
+        return AjaxResult.success(ajaxResult);
+    }
+
+    /**
+     * 下载箱信息导入模板
+     */
+    @GetMapping("/importTCntrnoTemplate")
+    public AjaxResult importTCntrnoTemplate()
+    {
+        ExcelUtil<TCntrno> util = new ExcelUtil<TCntrno>(TCntrno.class);
+        return util.importTemplateExcel("箱信息数据模板");
+    }
+
+
+
+
 }
+
+
+
+

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/approvalFlow/AuditPathsController.java

@@ -2,10 +2,12 @@ package com.ruoyi.web.controller.warehouse.approvalFlow;
 
 import java.util.List;
 
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.approvalFlow.domain.AuditItems;
 import com.ruoyi.approvalFlow.domain.AuditPaths;
 import com.ruoyi.approvalFlow.service.IAuditPathsService;
 import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -150,6 +152,21 @@ public class AuditPathsController extends BaseController {
         return auditPathsService.selectAllAuditItems(auditItems);
     }
 
+    /** 审批条件查询 */
+    @GetMapping(value = "/selectAuditItems")
+    public AjaxResult selectAuditItems(AuditItems auditItems) {
+        startPage();
+        return auditPathsService.selectAllAuditItems(auditItems);
+    }
+
+
+    /** 审批查询条件条数*/
+    @GetMapping(value = "/selectCountAuditItems")
+    public AjaxResult selectCountAuditItems() {
+        int count = auditPathsService.selectCountAuditItems();
+        return AjaxResult.success(count);
+    }
+
     /**
      * 新增审批流配置主
      */

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/ITCntrnoService.java

@@ -3,7 +3,10 @@ package com.ruoyi.shipping.service;
 import java.util.List;
 import java.util.Map;
 
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.shipping.domain.TCntrno;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 集装箱号Service接口
@@ -105,4 +108,18 @@ public interface ITCntrnoService
      * @return
      */
     public String selectTCntrnoFNo(TCntrno tCntrno);
+
+    /**
+     * 更新箱信息数据
+     * @param fileName        更新箱信息数据列表
+     * @return 结果
+     */
+    public AjaxResult importUpdateDataTcntrnoExcel(MultipartFile fileName);
+
+    /**
+     * 导入箱信息数据Excel
+     * @param fileName        更新箱信息数据列表
+     * @return 结果
+     */
+    public AjaxResult importTcntrnoDataExcel(MultipartFile fileName);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/domain/AuditItems.java

@@ -139,6 +139,13 @@ public class AuditItems extends BaseEntity {
     @Excel(name = "O提交、N未知状态、S待审、B审核退回、A审核通过")
     private String auditStatus;
 
+    /**
+     * 业务日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date billTime;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -299,6 +306,14 @@ public class AuditItems extends BaseEntity {
         return auditStatus;
     }
 
+    public Date getBillTime() {
+        return billTime;
+    }
+
+    public void setBillTime(Date billTime) {
+        this.billTime = billTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -322,6 +337,7 @@ public class AuditItems extends BaseEntity {
                 .append("auditOpTime", getAuditOpTime())
                 .append("auditMsg", getAuditMsg())
                 .append("auditStatus", getAuditStatus())
+                .append("billTime", getBillTime())
                 .toString();
     }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/mapper/AuditItemsMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.approvalFlow.mapper;
 
 import com.ruoyi.approvalFlow.domain.AuditItems;
+import com.ruoyi.approvalFlow.domain.AuditPaths;
 import com.ruoyi.approvalFlow.domain.AuditPathsLevels;
 
 import java.util.List;
@@ -71,6 +72,14 @@ public interface AuditItemsMapper {
     List<Map<String, Object>> selectAuditItems(AuditItems auditItems);
 
     /**
+     * 查询审批流配置列表
+     *
+     * @param auditItems 审批流配置
+     * @return 审批流配置主集合
+     */
+    public List<AuditItems> selectAuditItemsByList(AuditItems auditItems);
+
+    /**
      * 删除后续审批
      * @param auditItems 条件
      * @return
@@ -97,4 +106,10 @@ public interface AuditItemsMapper {
      * @return
      */
     public int updateAuditStatus(AuditItems auditItems);
+
+    /**
+     * 查询审批流配置主
+     * @return 结果
+     */
+    public int selectCountAuditItems();
 }

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/IAuditPathsService.java

@@ -65,6 +65,12 @@ public interface IAuditPathsService {
     public int deleteAuditPathsById(Long id);
 
     /**
+     * 查询条数审批流配置主信息
+     * @return 结果
+     */
+    public int selectCountAuditItems();
+
+    /**
      *  根据id、actId 查询审批流
      * @param auditItems 条件
      * @return 结果

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -285,6 +285,15 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
     }
 
     /**
+     * 查询审批流配置主信息条数
+     * @return 结果
+     */
+    @Override
+    public int selectCountAuditItems(){
+        return auditItemsMapper.selectCountAuditItems();
+    }
+
+    /**
      * 审批通过
      *
      * @param auditItems 审核人、单据信息

ruoyi-warehouse/src/main/resources/mapper/approvalFlow/AuditItemsMapper.xml

@@ -25,10 +25,11 @@
         <result property="auditOpTime" column="audit_op_time"/>
         <result property="auditMsg" column="audit_msg"/>
         <result property="auditStatus" column="audit_status"/>
+        <result property="billTime" column="bill_time"/>
     </resultMap>
 
     <sql id="selectAuditItemsVo">
-        select id, bill_no, bill_id, act_id, path_id, level_id, refno1, iffinal_item, refno2, refno3, branch_id, send_user_id, send_name, send_time, send_msg, audit_user_id, audit_item,audit_op_time, audit_msg, audit_status from audit_items
+        select id, bill_no, bill_id, act_id, path_id, level_id, refno1, iffinal_item, refno2, refno3, branch_id, send_user_id, send_name, send_time, send_msg, audit_user_id, audit_item,audit_op_time, audit_msg, audit_status,bill_time from audit_items
     </sql>
 
     <select id="selectAuditItemsList" parameterType="AuditItems" resultMap="AuditItemsResult">
@@ -53,6 +54,7 @@
             <if test="auditOpTime != null ">and audit_op_time = #{auditOpTime}</if>
             <if test="auditMsg != null  and auditMsg != ''">and audit_msg = #{auditMsg}</if>
             <if test="auditStatus != null  and auditStatus != ''">and audit_status = #{auditStatus}</if>
+            <if test="billTime != null "> and bill_time = #{billTime},</if>
         </where>
     </select>
 
@@ -83,6 +85,7 @@
             <if test="auditOpTime != null ">audit_op_time,</if>
             <if test="auditMsg != null">audit_msg,</if>
             <if test="auditStatus != null">audit_status,</if>
+            <if test="billTime != null ">bill_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="billNo != null">#{billNo},</if>
@@ -104,6 +107,7 @@
             <if test="auditOpTime != null ">#{auditOpTime},</if>
             <if test="auditMsg != null">#{auditMsg},</if>
             <if test="auditStatus != null">#{auditStatus},</if>
+            <if test="billTime != null ">#{billTime},</if>
         </trim>
     </insert>
 
@@ -129,6 +133,7 @@
             <if test="auditOpTime != null ">audit_op_time = #{auditOpTime},</if>
             <if test="auditMsg != null">audit_msg = #{auditMsg},</if>
             <if test="auditStatus != null">audit_status = #{auditStatus},</if>
+            <if test="billTime != null ">bill_time = #{billTime},</if>
         </trim>
         where id = #{id}
     </update>
@@ -144,19 +149,79 @@
         </foreach>
     </delete>
 
+
+    <select id="selectCountAuditItems" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM
+        audit_items item
+        LEFT JOIN t_corps corp ON corp.f_id = item.refno1
+        LEFT JOIN audit_items_users us ON us.pid = item.id
+        LEFT JOIN sys_user usr ON usr.user_id = item.audit_user_id
+        where
+        us.audit_status = 'S'
+        AND item.audit_status = 'S'
+        <if test="billNo != null  and billNo != ''"> and item.bill_no = #{billNo}</if>
+        <if test="actId != null  and actId != ''"> and item.act_id = #{actId}</if>
+        <if test="refno2 != null  and refno2 != ''"> and item.refno2 = #{refno2}</if>
+        <if test="billId != null  and billId != ''"> and item.bill_id like concat('%', #{billId}, '%')</if>
+        <if test="refno1 != null  and refno1 != ''"> and corp.f_name like concat('%', #{refno1}, '%')</if>
+        <if test="sendUserId != null  and sendUserId != ''"> and item.send_user_id like concat('%', #{sendUserId}, '%')</if>
+        <if test="billTime != null  and billTime != ''"> and item.bill_time = #{billTime}</if>
+        <if test="auditUserId != null  and auditUserId != ''"> AND us.user_id = #{auditUserId}</if>
+        <if test='sendTime != null and sendTime[0] != null and sendTime[0]!= ""'>
+            and item.send_time &gt;= #{sendTime[0]}
+        </if>
+        <if test='sendTime != null and sendTime[1] != null and sendTime[1]!= ""'>
+            and item.send_time &lt;= #{sendTime[1]}
+        </if>
+        <if test='auditOpTime != null and auditOpTime[0] != null and auditOpTime[0]!= ""'>
+            and item.audit_op_time &gt;= #{auditOpTime[0]}
+        </if>
+        <if test='auditOpTime != null and auditOpTime[1] != null and auditOpTime[1]!= ""'>
+            and item.audit_op_time &lt;= #{auditOpTime[1]}
+        </if>
+        ORDER BY
+        item.send_time DESC
+    </select>
+
     <select id="selectAuditItems" parameterType="AuditItems" resultType="Map">
         SELECT
-            item.id,
-            item.act_id AS actId,
-            item.bill_id AS billId,
-            corp.f_name AS refno1,
-            item.refno2,
-            item.refno3,
-            usr.user_name AS auditUserName,
-            usr.nick_name AS nickName,
-            item.send_time AS auditItem,
-            item.audit_msg AS auditMsg,
-            item.audit_status AS auditStatus
+        item.id,
+        CASE
+        item.act_id
+        WHEN 410 THEN
+        '下单审批'
+        WHEN 420 THEN
+        '配船审批'
+        END actId,
+        item.bill_id AS billId,
+        corp.f_name AS refno1,
+        item.refno2,
+        item.refno3,
+        item.bill_no AS billNo,
+        us.user_id AS userId,
+        item.audit_item,
+        item.audit_user_id AS auditUserId,
+        CASE
+        item.audit_status
+        WHEN 'O' THEN
+        '提交'
+        WHEN 'N' THEN
+        '未知状态'
+        WHEN 'S' THEN
+        '待审'
+        WHEN 'B' THEN
+        '审核退回'
+        WHEN 'A' THEN
+        '审核通过'
+        END audit,
+        item.send_user_id AS sendUserId,
+        usr.user_name AS auditUserName,
+        usr.nick_name AS nickName,
+        item.send_time AS sendTime,
+        item.audit_op_time AS auditOpTime,
+        item.bill_time AS billTime,
+        item.audit_msg AS auditMsg
         FROM
             audit_items item
             LEFT JOIN t_corps corp ON corp.f_id = item.refno1
@@ -164,8 +229,27 @@
             LEFT JOIN sys_user usr ON usr.user_id = item.audit_user_id
         where
             us.audit_status = 'S'
-            AND item.audit_status = 'S'
-            AND us.user_id = #{auditUserId}
+        <if test="billNo != null  and billNo != ''"> and item.bill_no = #{billNo}</if>
+        <if test="actId != null  and actId != ''"> and item.act_id = #{actId}</if>
+        <if test="refno2 != null  and refno2 != ''"> and item.refno2 = #{refno2}</if>
+        <if test="billId != null  and billId != ''"> and item.bill_id like concat('%', #{billId}, '%')</if>
+        <if test="refno1 != null  and refno1 != ''"> and corp.f_name like concat('%', #{refno1}, '%')</if>
+        <if test="sendUserId != null  and sendUserId != ''"> and item.send_user_id like concat('%', #{sendUserId}, '%')</if>
+        <if test="billTime != null  and billTime != ''"> and item.bill_time = #{billTime}</if>
+        <if test="auditUserId != null  and auditUserId != ''"> AND us.user_id = #{auditUserId}</if>
+        <if test='sendTime != null and sendTime[0] != null and sendTime[0]!= ""'>
+            and item.send_time &gt;= #{sendTime[0]}
+        </if>
+        <if test='sendTime != null and sendTime[1] != null and sendTime[1]!= ""'>
+            and item.send_time &lt;= #{sendTime[1]}
+        </if>
+        <if test='auditOpTime != null and auditOpTime[0] != null and auditOpTime[0]!= ""'>
+            and item.audit_op_time &gt;= #{auditOpTime[0]}
+        </if>
+        <if test='auditOpTime != null and auditOpTime[1] != null and auditOpTime[1]!= ""'>
+            and item.audit_op_time &lt;= #{auditOpTime[1]}
+        </if>
+        AND item.audit_status = 'S'
         ORDER BY
             item.send_time DESC
     </select>
@@ -192,6 +276,7 @@
             aud.audit_msg AS auditMsg,
             aud.audit_item AS auditItem,
             aud.audit_op_time AS auditOpTime
+            aud.bill_time AS billTime,
         FROM
             audit_items aud
             LEFT JOIN sys_user us ON us.user_id = aud.audit_user_id