Merge branch 'develop' into FOTON

src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java

@@ -102,6 +102,9 @@ public interface LawsUserInfoService {
     @PostMapping("slrs/sar-public-idea/addSarPublicIdea")
     public com.ydw.bat.wkflow.util.http.ResponseMessage addSarPublicIdea(@RequestBody SarPublicIdea sarPublicIdea);
 
+    @PostMapping("slrs/sar-public-idea-all/saveBatch")
+    public com.ydw.bat.wkflow.util.http.ResponseMessage savePublicIdeaBatch(@RequestBody List<SarPublicIdeaAll> sarPublicIdea);
+
 
 
     @PostMapping("/SarStandItems/sar-stand-items/saveBatch")

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

@@ -27,6 +27,18 @@ public class BusProcessModelHisController {
     @Autowired
     private IBusProcessModelHisService busProcessModelHisService;
 
+    @GetMapping("/processModelHisOneUpdStatus")
+    public BusProcessModelHis modelHisOneUpdStatus(String pid,String taskId) {
+        BusProcessModelHis modelHisOne = busProcessModelHisService.modelHisOneUpdStatus(pid,taskId);
+        return modelHisOne;
+    }
+
+    @GetMapping("/processModelHisOneCount")
+    public BusProcessModelHis modelHisOneCount(String pid) {
+        BusProcessModelHis modelHisOne = busProcessModelHisService.modelHisOneCount(pid);
+        return modelHisOne;
+    }
+
     @GetMapping("/processModelHisOne")
     public BusProcessModelHis modelHisOne(String pid,String taskId) {
         BusProcessModelHis modelHisOne = busProcessModelHisService.modelHisOne(pid,taskId);

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

@@ -17,6 +17,10 @@ import java.util.List;
  */
 public interface IBusProcessModelHisService extends IService<BusProcessModelHis> {
 
+    BusProcessModelHis modelHisOneUpdStatus(String pid,String taskId);
+
+    BusProcessModelHis modelHisOneCount(String pid);
+
     BusProcessModelHis modelHisOne(String pid,String taskId);
 
     List<BusProcessModelHis> modelHisList(String pid);

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

@@ -130,6 +130,37 @@ public class BusProcessModelHisServiceImpl extends ServiceImpl<BusProcessModelHi
         return builder.toString();
     }
 
+    @Override
+    public BusProcessModelHis modelHisOneUpdStatus(String pid,String taskId){
+        BusProcessModelHis modelHis = new BusProcessModelHis();
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.eq("P_ID",pid);
+        wrapper.eq("TASK_ID",taskId);
+        List<BusProcessModelHis> hisList = this.baseMapper.selectList(wrapper);
+        if(!hisList.isEmpty()){
+            modelHis = hisList.get(0);
+            modelHis.setEditStatus("1");
+            this.baseMapper.updateById(modelHis);
+        }
+        return modelHis;
+    }
+
+    @Override
+    public BusProcessModelHis modelHisOneCount(String pid){
+        BusProcessModelHis modelHis = new BusProcessModelHis();
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.eq("P_ID",pid);
+        wrapper.eq("EDIT_TYPE","count");
+        List<BusProcessModelHis> hisList = this.baseMapper.selectList(wrapper);
+        if(!hisList.isEmpty()){
+            modelHis = hisList.get(0);
+            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/business_slrs/dao/SarPublicIdea.java

@@ -34,5 +34,7 @@ public class SarPublicIdea{
 
     private String filesName;
 
+    private String wkfiles;
+
 
 }

src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SarPublicIdeaAll.java

@@ -0,0 +1,72 @@
+package com.ydw.bat.wkflow.business_slrs.dao;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-06-02
+ */
+@Data
+@Accessors(chain = true)
+@TableName("sar_public_idea_all")
+@ApiModel(value="SarPublicIdeaAll对象", description="")
+public class SarPublicIdeaAll  {
+
+    @TableId
+    private String id;
+
+    @TableField("cid")
+    private String cid;
+
+    @TableField("part_code")
+    private String partCode;
+
+    @TableField("content")
+    private String content;
+
+    @TableField("user_id")
+    private String userId;
+
+    @TableField("user_name")
+    private String userName;
+
+    @TableField("dept_id")
+    private String deptId;
+
+    @TableField("dept_name")
+    private String deptName;
+
+    @TableField("reason")
+    private String reason;
+
+    @TableField("old_text")
+    private String oldText;
+
+    @TableField("new_text")
+    private String newText;
+
+    @TableField("idea_id")
+    private String ideaId;
+
+    public static final String CID = "cid";
+
+    @TableField("chapter_name")
+    private String chapterName;
+
+    @TableField(exist = false)
+    private String department;
+
+    @TableField("wk_flag")
+    private String wkFlag;
+
+}

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/StartSurveyAfter.java

@@ -143,7 +143,9 @@ public class StartSurveyAfter implements TaskListener {
                 .uniques(uniques)
                 .files(object.getString("filesId"))
                 .filesName(object.getString("filesName"))
+                .wkfiles(object.getJSONArray("modelList").toJSONString())
                 .build();
+        delegateTask.setVariable("YJID",sarPublicIdea.getId());
         ResponseMessage result = lawsUserInfoService.addSarPublicIdea(sarPublicIdea);
         if(!result.isOk()){
             throw new ActivitiException("发起公开征求意见失败");

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10After.java

@@ -1,5 +1,6 @@
 package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
@@ -9,6 +10,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.business_slrs.dao.SarPublicIdeaAll;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -17,6 +19,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
 //新征求意见流程!!!!!
 public class Step10After implements TaskListener {
@@ -40,6 +43,31 @@ public class Step10After implements TaskListener {
         String prcName ="";
         if ("0".equals(object.getString("presidentFlag"))){
             delegateTask.setVariable("presidentFlag","0");
+            //加一个入库逻辑解决一些
+            List<SarPublicIdeaAll> sarPublicIdeaAlls=new ArrayList<>();
+            JSONArray jsonArray=JSONArray.parseArray(object.getString("info"));
+            if (!jsonArray.isEmpty()){
+                jsonArray.forEach(o -> {
+                    JSONObject object1=JSONObject.parseObject(o.toString());
+                    if ("1".equals(object1.getString("state"))) {
+                        SarPublicIdeaAll sarPublicIdeaAll = new SarPublicIdeaAll();
+                        sarPublicIdeaAll.setId(String.valueOf(UUID.randomUUID()));
+                        sarPublicIdeaAll.setChapterName(object1.getString("chapterName"));
+                        sarPublicIdeaAll.setOldText(object1.getString("oldText"));
+                        sarPublicIdeaAll.setNewText(object1.getString("newText"));
+                        sarPublicIdeaAll.setReason(object1.getString("reason"));
+                        sarPublicIdeaAll.setUserId(object1.getString(""));
+                        sarPublicIdeaAll.setPartCode(object1.getString("chapterNumber"));
+                        sarPublicIdeaAll.setCid(object.getString("cid"));
+                        sarPublicIdeaAll.setUserName(object1.getString("responUserName"));
+                        sarPublicIdeaAll.setUserId(object1.getString("responUser"));
+                        sarPublicIdeaAll.setWkFlag("1");
+                        sarPublicIdeaAll.setIdeaId(delegateTask.getVariable("YJID", String.class));
+                        sarPublicIdeaAlls.add(sarPublicIdeaAll);
+                    }
+                });
+            }
+            lawsUserInfoService.savePublicIdeaBatch(sarPublicIdeaAlls);
             prcName=delegateTask.getVariable("cid")+"-标准征求意见流程-流程结束";
         }else {
             delegateTask.setVariable("presidentFlag","1");

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1After.java

@@ -51,6 +51,22 @@ public class Step1After implements TaskListener {
             strings.addAll(nextUserList);
             delegateTask.setVariable("zrList"+object.getString("onlyKey"),strings);
         }
+
+        if (null==delegateTask.getVariable("Step6")){
+            delegateTask.setVariable("Step6",nextUserList);
+        }else {
+            List<String> strings=delegateTask.getVariable("Step6",List.class);
+            List<String> middle=new ArrayList<>();
+            nextUserList.forEach(s -> {
+                if (!strings.contains(s)){
+                    middle.add(s);
+                }
+            });
+            delegateTask.getVariable("Step6",List.class).addAll(middle);
+        }
+
+
+
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
         String user = delegateTask.getVariable("user",String.class);

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step6After.java

@@ -39,8 +39,8 @@ public class Step6After implements TaskListener {
         String prcName = delegateTask.getVariable("cid")+"-标准征求意见流程-责任人会签";;
 
         //整备数据
-        nextUserList.addAll(delegateTask.getVariable("zrList",List.class));
+        nextUserList.addAll(delegateTask.getVariable("Step6",List.class));
-        delegateTask.setVariable("responUserList",delegateTask.getVariable("zrList",List.class));
+        delegateTask.setVariable("responUserList",nextUserList);
         delegateTask.setVariable("hqMark",0);
         delegateTask.setVariable("bdMark",0);
         delegateTask.setVariable("hqCount",null);

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java

@@ -147,6 +147,7 @@ public class StartSurveyAfter implements TaskListener {
                 .uniques(uniques)
                 .files(object.getString("filesId"))
                 .filesName(object.getString("filesName"))
+                .wkfiles("")
                 .build();
         ResponseMessage result = lawsUserInfoService.addSarPublicIdea(sarPublicIdea);
         if(!result.isOk()){