Merge remote-tracking branch 'origin/develop' into FOTON

# Conflicts:
#	src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java

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

@@ -89,5 +89,8 @@ public class SarInterpretationNationalStandard {
     @ApiModelProperty(value = "风险程度")
     private String riskDegree;
 
+    @ApiModelProperty(value = "流程编号")
+    private String prcNum;
+
 
 }

src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/Step3After.java

@@ -15,6 +15,7 @@ import com.ydw.bat.wkflow.business_slrs.dao.StandProjectRelationDto;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.rmi.activation.ActivationException;
 import java.text.SimpleDateFormat;
@@ -47,7 +48,11 @@ public class Step3After implements TaskListener {
             standProjectRelationDto.setStandId(object1.getString("standId"));
             dtoList.add(standProjectRelationDto);
         });
-
+        if(CollectionUtils.isEmpty(dtoList)){
+            StandProjectRelationDto standProjectRelationDto=new StandProjectRelationDto();
+            standProjectRelationDto.setProjectId(object.getString("projectId"));
+            dtoList.add(standProjectRelationDto);
+        }
         lawsUserInfoService.batchInsert(dtoList);
         //截止时间 流程描述 创建人
         String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());

src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java

@@ -44,7 +44,13 @@ public class DeptApplayAfter implements TaskListener{
 
         List<String> nextUserList = new ArrayList();
 
-
+        QueryWrapper queryWrapperByPrcNum = new QueryWrapper();
+        queryWrapperByPrcNum.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName onePrcNum = busProcessNameService.getOne(queryWrapperByPrcNum);
+        String prcNum = "";
+        if (null != onePrcNum) {
+            prcNum = onePrcNum.getPrcNum();
+        }
         String prcName = object.getString("itemsNum")+"-"+object.getString("itemsName")+"-"+"解读";
 
         //部长进行审批（1：通过）
@@ -53,6 +59,7 @@ public class DeptApplayAfter implements TaskListener{
             JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList"));
             List<SarStandItems> sarStandItems=new ArrayList<>();
             List<SarInterpretationNationalStandard> standards=new ArrayList<>();
+            String finalPrcNum = prcNum;
             jsonArray.forEach(o -> {
                JSONObject os=JSONObject.parseObject(o.toString());
                //分解单数据
@@ -87,6 +94,7 @@ public class DeptApplayAfter implements TaskListener{
                standard.setStandNumber(object.getString("itemsNum"));
                standard.setInterpretationTime(new Date());
                standard.setRiskDegree("0");
+                standard.setPrcNum(finalPrcNum);
                standards.add(standard);
             });