Merge branch 'develop' into FOTON

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

@@ -160,6 +160,8 @@ public interface LawsUserInfoService {
     public ResponseMessage<Object> updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO);
 
 
+    @PostMapping("/sarStandUnqualified/sar-stand-unqualified/updateBatch")
+    public ResponseMessage<Object> updateBatch(@RequestBody List<SarStandUnqualified> sarStandUnqualified);
 
 
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/dto/PCA/PCAdataList.java

@@ -31,8 +31,8 @@ public class PCAdataList {
     private String kccvppsbm;
     private String kccvppscn;
     private String standName;
-    private String xcxssrqgj;
+    private String xcxssrq;
-    private String zccssrqgj;
+    private String zccssrq;
     private String standEnName;
     private String liablePeople;
     private String liablePeopleId;

src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalAfter.java

@@ -3,6 +3,8 @@ package com.ydw.bat.wkflow.listener.NonConformanceRectification;
 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;
+import com.ydw.bat.wkflow.business_main.datas.dto.SarStandUnqualified;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
@@ -25,6 +27,7 @@ public class DockingApprovalAfter implements TaskListener {
         IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
         IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
 
         QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
@@ -88,7 +91,16 @@ public class DockingApprovalAfter implements TaskListener {
         if(delegateTask.getVariable("actionFlag",Integer.class)==0){
 
             if(count>=responUserList.size()){
-
+                //入库 联动1？
+                List<SarStandUnqualified> sarStandUnqualifieds=new ArrayList<>();
+                for (Object j:object.getJSONObject("info").getJSONArray("fileDataList")) {
+                    JSONObject object1=JSONObject.parseObject(j.toString());
+                    SarStandUnqualified sarStandUnqualified=new SarStandUnqualified();
+                    sarStandUnqualified.setId(object1.getString("id"));
+                    sarStandUnqualified.setCloseState(2);
+                    sarStandUnqualifieds.add(sarStandUnqualified);
+                }
+                lawsUserInfoService.updateBatch(sarStandUnqualifieds);
             }
 
         }else{

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveAfter.java

@@ -131,7 +131,7 @@ public class PCAdlApproveAfter implements TaskListener {
 
                 //遍历条目
                 for (PCAchildren pcAchildren : pcAdataList.getChildren()) {
-                    if (null != pcAchildren.getNoCompliance() && !"".equals(pcAdataList.getNoCompliance())) {
+                    if (null != pcAchildren.getNoCompliance() && !"".equals(pcAchildren.getNoCompliance())) {
                         SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
                         //少一个standId 不合格原因 在研在产！
                         sarStandUnqualified.setStandId(pcAchildren.getStandId());
@@ -152,7 +152,7 @@ public class PCAdlApproveAfter implements TaskListener {
                         standUnqualifieds.add(sarStandUnqualified);
                     }
 
-                    if (null != pcAdataList.getZcNoCompliance() && !"".equals(pcAdataList.getZcNoCompliance())) {
+                    if (null != pcAdataList.getZcNoCompliance() && !"".equals(pcAchildren.getZcNoCompliance())) {
                         SarStandUnqualified sarStandUnqualified = new SarStandUnqualified();
                         //少一个standId 不合格原因 在研在产！
                         sarStandUnqualified.setStandId(pcAchildren.getStandId());

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

@@ -0,0 +1,140 @@
+package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+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.SarPublicIdea;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import com.ydw.bat.wkflow.util.http.ResponseMessage;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+//新征求意见流程!!!!!
+public class StartSurveyAfter implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class);
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
+        Datas datas = datasService.getOne(queryWrapper);
+
+        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
+        delegateTask.setVariable("objectJson",object);
+
+        List<String> nextUserList = new ArrayList();
+        //整备数据
+        //责任部门对接人集合==》
+        if (object.getString("zrUserIdList").contains(",")){
+            nextUserList.addAll(new ArrayList<>(Arrays.asList(object.getString("zrUserIdList").split(","))));
+        }else {
+            nextUserList.add(object.getString("zrUserIdList"));
+        }
+        delegateTask.setVariable("zrUserIdList",nextUserList);
+
+        //为新生成的公开征求意见建立id
+        String uniques= String.valueOf(UUID.randomUUID());
+        object.put("uniques",uniques);
+        delegateTask.setVariable("uniqueMark",uniques);
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("startUser");
+        String username = object.getString("startUserName");
+        String standName = object.getString("cid");
+        delegateTask.setVariable("cid",standName);
+        String prcName = standName+"-标准征求意见流程";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+            one1.setPrcType("3");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setUserId(delegateTask.getAssignee());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }else{
+            BusProcessNew busProcessNewNext = new BusProcessNew();
+            busProcessNewNext.setMsgType("clause");
+            busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+            busProcessNewNext.setMesg(object.toJSONString());
+            busProcessNewNext.setFinishFlag("0");
+            busProcessNewNext.setTaskInfo("责任对接人选择责任人");
+            busProcessNewNext.setPrcName(prcName);
+            busProcessNewNext.setUserId(delegateTask.getVariable("dockUser",String.class));
+            busBean.save(busProcessNewNext);
+        }
+        Date time=new Date();
+        String dateTime=object.getString("endTime");
+        dateTime = dateTime.replace("Z", " UTC");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS Z");
+        SimpleDateFormat defaultFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+             time= format.parse(dateTime);
+            String result = defaultFormat.format(time);
+            System.out.println(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //发起公开征求意见
+        SarPublicIdea sarPublicIdea  = SarPublicIdea.builder()
+                .id(UUID.randomUUID().toString())
+                .category("标准")
+                .cid(object.getString("cid"))
+                .cname(object.getString("cname"))
+                .startTime(new Date())
+                .endTime(time)
+                .standType(object.getString("standType"))
+                .standId(object.getString("standId"))
+                .uniques(uniques)
+                .files(object.getString("filesId"))
+                .filesName(object.getString("filesName"))
+                .build();
+        ResponseMessage result = lawsUserInfoService.addSarPublicIdea(sarPublicIdea);
+        if(!result.isOk()){
+            throw new ActivitiException("发起公开征求意见失败");
+        }
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.ydw.bat.wkflow.listener.StandardCommentNewProcess;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+
+import java.util.List;
+
+public class StartSurveyBefore implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        QueryWrapper queryWrapper1 = new QueryWrapper();
+        queryWrapper1.isNull("TASK_ID");
+        queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+        }
+    }
+}

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

@@ -35,7 +35,7 @@ public class ProcessStep5After implements TaskListener {
         delegateTask.setVariable("objectJson", object);
         //标准法规部业务经理Id
         List<String> nextUserList = new ArrayList();
-        String prcName = "";
+        String prcName = "企标制修订计划-部门高级经理审批";
        //根据意见选择 企标状态并对企标信息进行修改 bzfgId
         nextUserList.add(delegateTask.getVariable("topmanagerId",String.class));
 

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java

@@ -54,34 +54,34 @@ public class PGREPresidentApprovalAfter implements TaskListener {
         if ("1".equals(object.getString("gsfz"))) {
             delegateTask.setVariable("gsfz", "1");
 
-            JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList"));
+//            JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList"));
-            List<WgDept> wgDept=new ArrayList<>();
+//            List<WgDept> wgDept=new ArrayList<>();
-            jsonArray.forEach(o -> {
+//            jsonArray.forEach(o -> {
-                JSONObject os=JSONObject.parseObject(o.toString());
+//                JSONObject os=JSONObject.parseObject(o.toString());
-                WgDept wgDept1=new WgDept();
+//                WgDept wgDept1=new WgDept();
-                wgDept1.setWgId(object.getString("standId"));
+//                wgDept1.setWgId(object.getString("standId"));
-                wgDept1.setDeptOrder(os.getString("itemsNum"));
+//                wgDept1.setDeptOrder(os.getString("itemsNum"));
-                wgDept1.setDeptPeopleId(os.getString("itemsName"));
+//                wgDept1.setDeptPeopleId(os.getString("itemsName"));
-                wgDept1.setIdentity(os.getString("responsibleUnitShow"));
+//                wgDept1.setIdentity(os.getString("responsibleUnitShow"));
-                wgDept1.setJoinfile(os.getString("zxUserIdName"));
+//                wgDept1.setJoinfile(os.getString("zxUserIdName"));
-                wgDept1.setJoinId(os.getString("itermsConditions"));
+//                wgDept1.setJoinId(os.getString("itermsConditions"));
-                wgDept.add(wgDept1);
+//                wgDept.add(wgDept1);
-            });
+//            });
+//
+//            JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
+//            jsonArray1.forEach(obj ->{
+//                JSONObject object1 = JSONObject.parseObject(obj.toString());
+//                WgDept wgDept1=new WgDept();
+//                wgDept1.setWgId(object.getString("standId"));
+//                wgDept1.setDeptOrder(object1.getString("itemsNum"));
+//                wgDept1.setDeptPeopleId(object1.getString("itemsName"));
+//                wgDept1.setIdentity(object1.getString("responsibleUnitShow"));
+//                wgDept1.setJoinfile(object1.getString("zxUserIdName"));
+//                wgDept1.setJoinId(object1.getString("itermsConditions"));
+//                wgDept.add(wgDept1);
+//            });
 
-            JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class));
+//            lawsUserInfoService.wgDeptSaveBatch(wgDept);
-            jsonArray1.forEach(obj ->{
-                JSONObject object1 = JSONObject.parseObject(obj.toString());
-                WgDept wgDept1=new WgDept();
-                wgDept1.setWgId(object.getString("standId"));
-                wgDept1.setDeptOrder(object1.getString("itemsNum"));
-                wgDept1.setDeptPeopleId(object1.getString("itemsName"));
-                wgDept1.setIdentity(object1.getString("responsibleUnitShow"));
-                wgDept1.setJoinfile(object1.getString("zxUserIdName"));
-                wgDept1.setJoinId(object1.getString("itermsConditions"));
-                wgDept.add(wgDept1);
-            });
-
-            lawsUserInfoService.wgDeptSaveBatch(wgDept);
 
             prcName = "政策课题组入会流程";
         } else {

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderAfter.java

@@ -75,9 +75,9 @@ public class PEPDepartLeaderAfter implements TaskListener {
                 sarStandUnqualified.setCloseState(1);
                 sarStandUnqualified.setCreateTime(new Date());
                 sarStandUnqualified.setProductName(o.getProjectName());
-                sarStandUnqualified.setQaEngineer(o.getQualityEngineerName());
+                sarStandUnqualified.setQaEngineer(delegateTask.getVariable("qualityEngineerName",String.class));
-                sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineerName());
+                sarStandUnqualified.setAuthEngineer(delegateTask.getVariable("certifiedEngineerName",String.class));
-                sarStandUnqualified.setDutyEngineer(o.getResponsibleEngineer());
+                sarStandUnqualified.setDutyEngineer(o.getImplementerId());
                 sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
                 sarStandUnqualified.setProductType("research");
                 sarStandUnqualified.setReason(object1.getString("noCompliance"));
@@ -99,9 +99,9 @@ public class PEPDepartLeaderAfter implements TaskListener {
                 sarStandUnqualified.setCloseState(1);
                 sarStandUnqualified.setCreateTime(new Date());
                 sarStandUnqualified.setProductName(o.getProjectName());
-                sarStandUnqualified.setQaEngineer(o.getQualityEngineerName());
+                sarStandUnqualified.setQaEngineer(delegateTask.getVariable("qualityEngineerName",String.class));
-                sarStandUnqualified.setAuthEngineer(o.getCertifiedEngineerName());
+                sarStandUnqualified.setAuthEngineer(delegateTask.getVariable("certifiedEngineerName",String.class));
-                sarStandUnqualified.setDutyEngineer(o.getResponsibleEngineer());
+                sarStandUnqualified.setDutyEngineer(o.getImplementerId());
                 sarStandUnqualified.setResponsibleUnit(o.getResponsibleUnit());
                 sarStandUnqualified.setReason(object1.getString("zcNoCompliance"));
                 sarStandUnqualified.setProductType("product");

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonAfter.java

@@ -45,14 +45,14 @@ public class PEPffresPersonAfter implements TaskListener {
         delegateTask.setVariable("objectJson", object);
 
         String prcName = "";
-        if ("2".equals(object.getString("fenFlag")) && null == delegateTask.getVariable("PEPCount") && delegateTask.getVariable("workPeoples", List.class).size()==1){
+//        if ("2".equals(object.getString("fenFlag")) && null == delegateTask.getVariable("PEPCount") && delegateTask.getVariable("workPeoples", List.class).size()==1){
             prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批";
-        }
+//        }
-        else if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) {
+//        else if ("2".equals(object.getString("fenFlag")) && String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size())) ) {
-            prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批";
+//            prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-汇总审批";
-        } else {
+//        } else {
-            prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-合规性评估";
+//
-        }
+//        }
 
 
         List<String> nextUserList = new ArrayList();
@@ -114,7 +114,7 @@ public class PEPffresPersonAfter implements TaskListener {
             }
         }
         if (String.valueOf(delegateTask.getVariable("PEPCount")).equals(String.valueOf(delegateTask.getVariable("workPeoples", List.class).size()))) {
-
+            prcName = delegateTask.getVariable("stands",String.class)+"-标准项目合规评估-合规性评估";
             oneStep1(delegateTask, busBean, nextUserList,prcName);
         }
 

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPstartAfter.java

@@ -52,6 +52,11 @@ public class PEPstartAfter implements TaskListener {
 
         delegateTask.setVariable("certifiedEngineerName",object.getString("certifiedEngineerName"));
         delegateTask.setVariable("qualityEngineerName",object.getString("qualityEngineerName"));
+
+        //认证工程师Id
+        delegateTask.setVariable("certifiedEngineer",object.getString("certifiedEngineer"));
+        //质量工程师Id
+        delegateTask.setVariable("qualityEngineer",object.getString("qualityEngineer"));
         //截止时间 流程描述 创建人
         String user = object.getString("prcCreateUser");
         String username = object.getString("prcCreateUserName");

src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveAfter.java

@@ -46,7 +46,7 @@ public class SRPManagerApproveAfter implements TaskListener{
 
         if("1".equalsIgnoreCase(approvalOpinion)){
             delegateTask.setVariable("jlFlag",1);
-            delegateTask.setVariable("applyUserId",object.getString("applyUpdUserId"));
+            delegateTask.setVariable("applyUserId",delegateTask.getVariable("createUser",String.class));
             BusProcessNew busProcessNew = new BusProcessNew();
             busProcessNew.setMsgType("clause");
             busProcessNew.setPId(delegateTask.getProcessInstanceId());
@@ -54,7 +54,7 @@ public class SRPManagerApproveAfter implements TaskListener{
             busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
             busProcessNew.setFinishFlag("0");
             busProcessNew.setTaskInfo(delegateTask.getName());
-            busProcessNew.setUserId(object.getString("applyUpdUserId"));
+            busProcessNew.setUserId(delegateTask.getVariable("createUser",String.class));
             busProcessNew.setPrcName(delegateTask.getVariable("listName",String.class)+"-标准法规清单-修订");
             busBean.save(busProcessNew);