Merge branch 'develop' into FOTON

src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessModelHisController.java

@@ -5,7 +5,10 @@ import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessEvaluationHis;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessModelHis;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessEvaluationHisService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessModelHisService;
+import com.ydw.bat.wkflow.util.Utils;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,8 +24,12 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Scanner;
+import java.util.UUID;
 
 /**
  * <p>
@@ -126,6 +133,17 @@ public class BusProcessModelHisController {
         }
     }
 
+    @GetMapping("/processEditFile")
+    public BusProcessModelHis processEditFile(String id) {
+        BusProcessModelHis modelHisOne = busProcessModelHisService.processEditFile(id);
+        return modelHisOne;
+    }
+
+    @GetMapping("/saveEditFile")
+    public BusProcessModelHis saveEditFile() {
+        return busProcessModelHisService.saveEditFile();
+    }
+
     @GetMapping("/processModelHisOneUpdStatus")
     public BusProcessModelHis modelHisOneUpdStatus(String pid,String taskId) {
         BusProcessModelHis modelHisOne = busProcessModelHisService.modelHisOneUpdStatus(pid,taskId);

src/main/java/com/ydw/bat/wkflow/business_main/datas/entity/EsRevisePlanDTO.java

@@ -109,4 +109,8 @@ public class EsRevisePlanDTO  {
     @ApiModelProperty(value = "企标类别")
     @TableField("buss_sort")
     private String bussSort;
+
+    @ApiModelProperty(value = "立项单")
+    @TableField("LXD")
+    private String lxd;
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessModelHisService.java

@@ -21,8 +21,12 @@ public interface IBusProcessModelHisService extends IService<BusProcessModelHis>
 
     BusProcessModelHis modelHisOneCount(String pid);
 
+    BusProcessModelHis processEditFile(String id);
+
     BusProcessModelHis modelHisOne(String pid,String taskId);
 
+    BusProcessModelHis saveEditFile();
+
     List<BusProcessModelHis> modelHisList(String pid);
 
     String saveBussModelFile(String pid, String taskId);

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessModelHisServiceImpl.java

@@ -12,6 +12,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessModelHisService
 import com.ydw.bat.wkflow.listener.bussLibrary.Utils.PoiUtil;
 import com.ydw.bat.wkflow.listener.bussLibrary.Utils.PoiWord;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,7 +20,10 @@ import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 /**
  * <p>
@@ -44,6 +48,55 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
     @Value("${buss.down.file.path}")
     private String downloadUrl;
 
+    @Override
+    public BusProcessModelHis saveEditFile(){
+        BusProcessModelHis modelHis = new BusProcessModelHis();
+        try {
+
+            String preUuid2 = UUID.randomUUID().toString();
+            String changUuid = preUuid2.substring(0,8);
+            String taskId = "task_"+changUuid;
+            String topId = "top_"+changUuid;
+
+            StringBuilder builderModel=new StringBuilder();
+            builderModel.append("model").append("/");
+            builderModel.append("model").append("/");
+
+
+            File dir = new File(filePath+builderModel.toString());
+            if (!dir.exists()) {
+                dir.mkdirs();
+            }
+            String sourcePath = builderModel.toString()+"model.docx";
+
+            StringBuilder builder=new StringBuilder();
+            builder.append("model").append("/");
+            builder.append(taskId).append("/");
+
+            File file = new File(filePath+builder.toString());
+            if (!file.exists()) {
+                file.mkdirs();
+            }
+
+            String targetPath = builder.toString()+taskId+"_"+topId+"node.docx";
+
+            File sourceFile = new File(filePath+sourcePath);
+            File targetFile =  new File(filePath+targetPath);
+            FileUtils.copyFile(sourceFile, targetFile);
+
+            SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd HH:mm:ss");
+            modelHis.setTaskId(taskId);
+            modelHis.setPId(topId);
+            modelHis.setEditFilePath(targetPath);
+            modelHis.setCreateTime(sdf.format(new Date()));
+            modelHis.setUpdateTime(sdf.format(new Date()));
+            this.baseMapper.insert(modelHis);
+        }catch (Exception e){
+            logger.error(e.getMessage());
+        }
+        return modelHis;
+    }
+
     @Override
     public String mergeModelFile(String pid, String taskId,String fileSuffix){
 
@@ -161,6 +214,17 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
         return modelHis;
     }
 
+    @Override
+    public BusProcessModelHis processEditFile(String id){
+       BusProcessModelHis modelHis = this.baseMapper.selectById(id);
+        if(StringUtils.isNotBlank(modelHis.getId())){
+            StringBuffer downloadFileUrl = new StringBuffer();
+            downloadFileUrl.append(downloadUrl).append(modelHis.getEditFilePath() == null ? "" : modelHis.getEditFilePath());
+            modelHis.setDownLoadUrl(downloadFileUrl.toString());
+        }
+        return modelHis;
+    }
+
     @Override
     public BusProcessModelHis modelHisOne(String pid,String taskId){
         BusProcessModelHis modelHis = new BusProcessModelHis();

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultBefore.java

@@ -31,7 +31,7 @@ public class UploadResearchResultBefore  implements TaskListener {
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             JSONObject object =  JSONObject.parseObject(one1.getMesg());
-            one1.setLink("bzdyStep3?prcType=2&routerType=oa");
+            one1.setLink("bzdyStep3?prcType=2");
             one1.setTaskInfo(delegateTask.getName());
             // 干活节点流程
             one1.setTaskStatus(2);

src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java

@@ -125,6 +125,7 @@ public class ProcessStep4After implements TaskListener {
                 esRevisePlanDTO.setRqbJson(object.getString("rqbJson"));
                 esRevisePlanDTO.setTechnologic(object.getString("technologic"));
                 esRevisePlanDTO.setBussSort(object.getString("bussSort"));
+                esRevisePlanDTO.setLxd(object.getString("LXD"));
                 lawsUserInfoService.addPlan(esRevisePlanDTO);
             }
         }else {