流程审批意见

dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/constants/SignConstants.java

@@ -69,7 +69,7 @@ public final class SignConstants {
     /**
      * 定义流程判断节点常量
      */
-    public final static List WfResultList = Arrays.asList("通过", "提交签审", "提交审阅", "提交", "提交提资审阅", "不需要总体室会签", "外协采购单位（过工程部）", "设计协同单位及其他");
+    public final static List WfResultList = Arrays.asList("通过", "同意", "提交签审", "提交审阅", "提交", "提交提资审阅", "不需要总体室会签", "外协采购单位（过工程部）", "设计协同单位及其他");
     /**
      * 定义总体室签审节点名称
      */

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/factory/ExpenditureContractUtils.java

@@ -75,13 +75,16 @@ public class ExpenditureContractUtils {
             //写入签名数据
             jsonObject.put("bz_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_PREPARED));
             jsonObject.put("bz_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_PREPARED));
+            jsonObject.put("bz_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_PREPARED));
             jsonObject.put("sh_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_SH));
             jsonObject.put("sh_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_SH));
             //总体室审核
             jsonObject.put("zts_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_ZTSSH));
             jsonObject.put("zts_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_ZTSSH));
+            jsonObject.put("zts_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_PREPARED));
             jsonObject.put("pz_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_APPROVED));
             jsonObject.put("pz_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_APPROVED));
+            jsonObject.put("pz_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_PREPARED));
         }
         //模板名称
         importWordService.getWordAllTable(jsonObject, path + file + ".docx", outFilePath + "outFile.docx");

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtExpenditureContractService.java

@@ -45,4 +45,6 @@ public interface ExtExpenditureContractService<V extends ExtExpenditureContractV
     String getEndDate(List<DxWfProcessTaskVO> dxWfProcessTaskVO, String activityName);
 
     ExtExpenditureContractVO termination(Long id);
+
+    String getComments(List<DxWfProcessTaskVO> activities, String activityName);
 }

dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtExpenditureContractServiceImpl.java

@@ -268,6 +268,19 @@ public class ExtExpenditureContractServiceImpl<V extends ExtExpenditureContractV
         return this.changeStatus(extExpenditureContractVO.getId(), Constants.TERMINATION, true);
     }
 
+    @Override
+    public String getComments(List<DxWfProcessTaskVO> activities, String activityName) {
+        for (DxWfProcessTaskVO wf : activities) {
+            if (wf.getName().equals(activityName)) {
+                List<String> comments = wf.getComments();
+                if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(comments)) {
+                    return comments.get(0);
+                }
+            }
+        }
+        return " ";
+    }
+
     /**
      * 获取用户名称及用户id(4.1新)
      */