1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/GeneralAuditInfoMapper.java

@@ -30,6 +30,13 @@ public interface GeneralAuditInfoMapper extends BaseMapper<GeneralAuditInfo> {
      * @return
      */
     List<GeneralAuditInfo> getListByCondition(Map<String, Object> pageView);
+    /**
+     * 查询通用审核总数包括已删除
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getNumByCondition(Map<String, Object> pageView);
 
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/GeneralAuditInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
+import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.entity.GeneralAuditInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.GeneralAuditInfoMapper;
@@ -11,10 +12,8 @@ import com.yh.saas.plugin.yiliangyiyun.service.INewWorkflowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * <p>
@@ -87,6 +86,39 @@ public class GeneralAuditInfoServiceImpl extends ServiceImpl<GeneralAuditInfoMap
     public String insertGeneralAuditInfo(GeneralAuditInfo generalAuditInfo) {
         //新增主键id
         generalAuditInfo.setId(IdGenerator.generateUUID());
+        //当天零点
+        SimpleDateFormat now = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
+        Calendar c = Calendar.getInstance();
+        c.setTime(new Date());
+        c.add(Calendar.YEAR, 0);
+        Date y = c.getTime();
+        String year = now.format(y);
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());
+        pageView.put("year", year);
+        //查询当天提交的数据包括已删除的
+        Integer dataCount = baseMapper.getNumByCondition(pageView);
+        SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
+        Integer num=dataCount+1;
+        String newNo="";
+        //一位数
+        if (num < 10) {
+            newNo="000" + num;
+        }
+        //两位数
+        else if (num < 100) {
+            newNo="00" + num;
+        }
+        //三位数
+        else if (num < 1000) {
+            newNo="0" + num;
+        }
+        //四位数
+        else if (num < 10000) {
+            newNo=String.valueOf(num);
+        }
+        String no = "TYSH"+df.format(new Date())+newNo;
+        generalAuditInfo.setAuditBusinessNo(no);
         // 操作主表数据
         this.insert(generalAuditInfo);
         return generalAuditInfo.getId();

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -1801,6 +1801,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
             }
             warehousingOrder1.setWarehouseName(dataList.get(0).getWarehouseName());
             warehousingOrder1.setIssuingTime(dataList.get(0).getIssuingTime());
+            warehousingOrder1.setUpdateDate(dataList.get(0).getUpdateDate());
             warehousingOrder1.setApproveStatus(dataList.get(0).getApproveStatus());
             warehousingOrder1.setRequestPerson(dataList.get(0).getRequestPerson());
             warehousingOrder1.setRequestDate(dataList.get(0).getRequestDate());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/GeneralAuditInfoMapper.xml

@@ -95,4 +95,12 @@
             LIMIT ${startRecord}, ${pageSize}
         </if>
     </select>
+    <select id="getNumByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+            COUNT(id)
+        FROM general_audit_info
+        WHERE
+            comp_id = #{compId}
+          and create_date > #{year}
+    </select>
 </mapper>

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehousingOrderMapper.xml

@@ -180,6 +180,7 @@
         w.create_user_id as createUserId,
         w.approve_status as approveStatus,
         wor.batch_id as batchId,
+        w.update_date as updateDate,
         w.issuing_time as issuingTime
         FROM warehousing_order_record wor
         left join warehousing_order w on wor.order_id = w.id and w.delete_flag = '0'