收入合同模板审批人签名

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

@@ -49,40 +49,44 @@ public class InComeContractUtils {
                 + "\\" + inComeContractVO.getNumber() + "\\";
         //生成特定的文档目录，保存生成的word文件
         FileUtil.mkdir(outFilePath);
-        //获取动态属性
-        /*Map<String, Object> dynamicAttrs = expenditureContractVO.getDynamicAttrs();
-        String content = Objects.isNull(dynamicAttrs.get("content")) ? "" : (String) dynamicAttrs.get("content");
-        String designPhase = Objects.isNull(dynamicAttrs.get("designPhase")) ? "" : (String) dynamicAttrs.get("designPhase");*/
 
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(inComeContractVO);
-        //项目代号
-        /*String projectCode = ObjectUtils.isEmpty(v.getDxDocumentExpand().getProjectCode()) ? "" : v.getDxDocumentExpand().getProjectCode();
-        jsonObject.put("projectCode", extDocService.searchDictDataByDictCode(Constants.PROJECT_CODE, projectCode));
-        jsonObject.put("projectCode", projectCode);*/
-        //合同名称
-        //合同乙方
-        //合同编号
-        //合同金额
-        //合同密级
-        //合同乙方保密资质等级
-        //合同类型
-        //学校/院归口管理部门
-        //合同成果形式
-        //成果交付地点（样机存放地方）
-        //起止时间
-        //承办部门
-        //经办人
-        //
 
-        //页数
-        //jsonObject.put("pages",v.getDxDocumentExpand().getAttachPages());
         //获取参与者
         List<DxWfProcessTaskVO> activities = wfProcessInfoVO.getHistoryInfo();
         if (!CollectionUtils.isEmpty(activities)) {
             //写入签名数据
-            jsonObject.put("bz_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_BZ));
-            jsonObject.put("bz_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_BZ));
-            jsonObject.put("bz_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_BZ));
+            jsonObject.put("sjxfzr_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_SJX_IN_COME_CONTRACT));
+            jsonObject.put("sjxfzr_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_SJX_IN_COME_CONTRACT));
+            jsonObject.put("sjxfzr_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_SJX_IN_COME_CONTRACT));
+
+            jsonObject.put("ztsfzr_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_ZTS_IN_COME_CONTRACT));
+            jsonObject.put("ztsfzr_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_ZTS_IN_COME_CONTRACT));
+            jsonObject.put("ztsfzr_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_ZTS_IN_COME_CONTRACT));
+
+            jsonObject.put("zbbfzr_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_ZBB_IN_COME_CONTRACT));
+            jsonObject.put("zbbfzr_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_ZBB_IN_COME_CONTRACT));
+            jsonObject.put("zbbfzr_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_ZBB_IN_COME_CONTRACT));
+
+            jsonObject.put("bmbfzr_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_BMB_IN_COME_CONTRACT));
+            jsonObject.put("bmbfzr_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_BMB_IN_COME_CONTRACT));
+            jsonObject.put("bmbfzr_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_BMB_IN_COME_CONTRACT));
+
+            jsonObject.put("xmbufzr_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_XMBU_IN_COME_CONTRACT));
+            jsonObject.put("xmbufzr_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_XMBU_IN_COME_CONTRACT));
+            jsonObject.put("xmbufzr_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_XMBU_IN_COME_CONTRACT));
+
+            jsonObject.put("xmbanfzr_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_XMBAN_IN_COME_CONTRACT));
+            jsonObject.put("xmbanfzr_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_XMBAN_IN_COME_CONTRACT));
+            jsonObject.put("xmbanfzr_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_XMBAN_IN_COME_CONTRACT));
+
+            jsonObject.put("cbbmfzr_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_CBBM_IN_COME_CONTRACT));
+            jsonObject.put("cbbmfzr_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_CBBM_IN_COME_CONTRACT));
+            jsonObject.put("cbbmfzr_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_CBBM_IN_COME_CONTRACT));
+
+            jsonObject.put("xmzgyld_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_XMZGYLD_IN_COME_CONTRACT));
+            jsonObject.put("xmzgyld_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_XMZGYLD_IN_COME_CONTRACT));
+            jsonObject.put("xmzgyld_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_XMZGYLD_IN_COME_CONTRACT));
         }
         log.info("settingDocData.jsonObject:{}", jsonObject.toString());
         //模板名称