From 71726a1cb05790d6841595ef7daef5173f2cddfa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 29 三月 2023 09:43:11 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/show/ApplyService.java |   46 +++++++++++++++++++++++++++-------------------
 1 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/lf/server/service/show/ApplyService.java b/src/main/java/com/lf/server/service/show/ApplyService.java
index bd98158..0e2a012 100644
--- a/src/main/java/com/lf/server/service/show/ApplyService.java
+++ b/src/main/java/com/lf/server/service/show/ApplyService.java
@@ -5,7 +5,6 @@
 import com.lf.server.entity.show.FlowEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.AesHelper;
-import com.lf.server.helper.Md5Helper;
 import com.lf.server.helper.StringHelper;
 import com.lf.server.mapper.show.ApplyMapper;
 import org.apache.commons.logging.Log;
@@ -37,14 +36,14 @@
 
     @Override
     public Integer selectCount(String uname, Integer status, Timestamp start, Timestamp end) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
 
         return applyMapper.selectCount(uname, status, start, end);
     }
 
     @Override
     public List<ApplyEntity> selectByPage(Integer userid, String uname, Integer status, Timestamp start, Timestamp end, Integer limit, Integer offset) {
-        uname = StringHelper.getLikeStr(uname);
+        uname = StringHelper.getLikeUpperStr(uname);
 
         return applyMapper.selectByPage(userid, uname, status, start, end, limit, offset);
     }
@@ -60,8 +59,8 @@
     }
 
     @Override
-    public UserEntity selectUserByDepid(Integer depid) {
-        return applyMapper.selectUserByDepid(depid);
+    public UserEntity selectUserByDepcode(String depcode) {
+        return applyMapper.selectUserByDepcode(depcode);
     }
 
     @Override
@@ -105,23 +104,23 @@
     }
 
     @Override
-    public Integer updateForDiscard(Integer id) {
-        return applyMapper.updateForDiscard(id);
+    public Integer updateForDiscard(Integer userid, Integer id) {
+        return applyMapper.updateForDiscard(userid, id);
     }
 
     @Override
-    public Integer updateForResubmit(Integer id) {
-        return applyMapper.updateForResubmit(id);
+    public Integer updateForResubmit(Integer userid, Integer id) {
+        return applyMapper.updateForResubmit(userid, id);
     }
 
     @Override
-    public Integer updateForSubmit(Integer applyid, Integer flowId) {
-        return applyMapper.updateForSubmit(applyid, flowId);
+    public Integer updateForSubmit(Integer userid, Integer applyid, Integer flowId) {
+        return applyMapper.updateForSubmit(userid, applyid, flowId);
     }
 
     @Override
-    public Integer updateForReject(Integer applyid, Integer flowId) {
-        return applyMapper.updateForReject(applyid, flowId);
+    public Integer updateForReject(Integer userid, Integer applyid, Integer flowId) {
+        return applyMapper.updateForReject(userid, applyid, flowId);
     }
 
     /**
@@ -149,13 +148,13 @@
 
         ApplyEntity apply = new ApplyEntity();
         apply.setUserid(ue.getId());
-        apply.setDepids(StringHelper.join(dr.getIds(), ","));
+        apply.setDepids(StringHelper.join(dr.getDepcodes(), ","));
         apply.setTabs(StringHelper.join(dr.getTabs(), ","));
         apply.setEntities(StringHelper.join(dr.getEntities(), ","));
         apply.setWkt(dr.getWkt());
         apply.setPwd(aesPwd);
         apply.setStatus(0);
-        apply.setCount(dr.getIds().size());
+        apply.setCount(dr.getDepcodes().size());
         apply.setDescr(dr.getDescr());
         apply.setCreateUser(ue.getId());
 
@@ -167,15 +166,15 @@
      */
     private List<FlowEntity> getFlowEntities(Integer applyId, UserEntity ue, DownloadReqEntity dr) {
         List<FlowEntity> list = new ArrayList<>();
-        for (Integer depid : dr.getIds()) {
-            UserEntity user = selectUserByDepid(depid);
+        for (String depcode : dr.getDepcodes()) {
+            UserEntity user = selectUserByDepcode(depcode);
             if (null == user) {
                 continue;
             }
 
             FlowEntity flow = new FlowEntity();
             flow.setApplyid(applyId);
-            flow.setDepid(depid);
+            flow.setDepcode(user.getDepcode());
             flow.setUserid(user.getId());
             flow.setStatus(0);
             flow.setDescr(null);
@@ -195,7 +194,16 @@
             List<String> entities = Arrays.asList(entity.getEntities().split(","));
             String pwd = AesHelper.decrypt(entity.getPwd());
 
-            dataLibService.createZipFile(ue, entities, entity.getWkt(), pwd);
+            DownloadReqEntity dr = new DownloadReqEntity();
+            dr.setEntities(entities);
+            dr.setWkt(dr.getWkt());
+            dr.setPwd(pwd);
+            dr.setIds(null);
+            dr.setDirs(null);
+            dr.setFilter(null);
+            dr.setDepcodes(null);
+
+            dataLibService.downloadDbReq4Wkt(ue, dr);
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
         }

--
Gitblit v1.9.3