Skip to content

D
dcs-plan
Commit a15529bc authored by wangqiang's avatar wangqiang
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 258ecf81 c3878359
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 105 deletions
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/constants/SignConstants.java
View file @ a15529bc
...@@ -13,16 +13,16 @@ import java.util.List; ...@@ -13,16 +13,16 @@ import java.util.List;
public final class SignConstants { public final class SignConstants {
//签名取值 //签名取值
public static final String SIGN_KEY_PREPARED = "编制"; public static final String SIGN_KEY_BZ = "编制";
public static final String SIGN_KEY_TSSH = "同室审核"; public static final String SIGN_KEY_SJX_IN_COME_CONTRACT = "设计项";
public static final String SIGN_KEY_FXTZSSH = "分系统总师审核"; public static final String SIGN_KEY_ZTS_IN_COME_CONTRACT = "总体室";
public static final String SIGN_KEY_GY = "工艺"; public static final String SIGN_KEY_ZBB_IN_COME_CONTRACT = "质保部";
public static final String SIGN_KEY_QF = "签发"; public static final String SIGN_KEY_BMB_IN_COME_CONTRACT = "保密办";
public static final String SIGN_KEY_ZTSSH = "总体室审核"; public static final String SIGN_KEY_XMBU_IN_COME_CONTRACT = "项目部";
public static final String SIGN_KEY_APPROVED = "批准"; public static final String SIGN_KEY_XMBAN_IN_COME_CONTRACT = "项目办";
public static final String SIGN_KEY_STANDARD = "标准化"; public static final String SIGN_KEY_CBBM_IN_COME_CONTRACT = "承办部门";
public static final String SIGN_KEY_ZTS = "总体室"; public static final String SIGN_KEY_XMZGYLD_IN_COME_CONTRACT = "项目主管院领导";
public static final String SIGN_KEY_ZTSQS = "总体室签审";
public static final String SIGN_KEY_TZSH = "提资审核"; public static final String SIGN_KEY_TZSH = "提资审核";
public static final String SIGN_KEY_SH = "审核"; public static final String SIGN_KEY_SH = "审核";
public static final String SIGN_KEY_CLJD = "编制不符合项处理单处理决定任务"; public static final String SIGN_KEY_CLJD = "编制不符合项处理单处理决定任务";
...@@ -70,10 +70,7 @@ public final class SignConstants { ...@@ -70,10 +70,7 @@ public final class SignConstants {
* 定义流程判断节点常量 * 定义流程判断节点常量
*/ */
public final static List WfResultList = Arrays.asList("通过", "同意", "提交签审", "提交审阅", "提交", "提交提资审阅", "不需要总体室会签", "外协采购单位（过工程部）", "设计协同单位及其他"); public final static List WfResultList = Arrays.asList("通过", "同意", "提交签审", "提交审阅", "提交", "提交提资审阅", "不需要总体室会签", "外协采购单位（过工程部）", "设计协同单位及其他");
/**
* 定义总体室签审节点名称
*/
public final static List ZTSSignTaskList = Arrays.asList(SIGN_KEY_ZTS, SIGN_ZTS, SIGN_KEY_ZTSJKSC);
/** /**
* 定义流程路由常量 * 定义流程路由常量
*/ */
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtSupplierVO.java
View file @ a15529bc
...@@ -64,7 +64,7 @@ public class ExtSupplierVO implements Serializable { ...@@ -64,7 +64,7 @@ public class ExtSupplierVO implements Serializable {
/** /**
* 资质内容 * 资质内容
*/ */
@ExcelProperty("资质内容（承制资格证书）") @ExcelProperty("资质内容（质量体系证书）")
private String qscQualificationsContent; private String qscQualificationsContent;
/** /**
...@@ -82,7 +82,7 @@ public class ExtSupplierVO implements Serializable { ...@@ -82,7 +82,7 @@ public class ExtSupplierVO implements Serializable {
/** /**
* 资质内容 * 资质内容
*/ */
@ExcelProperty("资质内容（质量体系证书）") @ExcelProperty("资质内容（承制资格证书）")
private String cqmQualificationsContent; private String cqmQualificationsContent;
/** /**
......
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/factory/ExpenditureContractUtils.java
View file @ a15529bc
...@@ -9,6 +9,7 @@ import com.yonde.dcs.plan.core.service.ExtExpenditureContractService; ...@@ -9,6 +9,7 @@ import com.yonde.dcs.plan.core.service.ExtExpenditureContractService;
import com.yonde.dcs.plan.core.word.ImportWordService; import com.yonde.dcs.plan.core.word.ImportWordService;
import com.yonde.dex.wfc.common.vo.DxWfProcessInfoVO; import com.yonde.dex.wfc.common.vo.DxWfProcessInfoVO;
import com.yonde.dex.wfc.common.vo.DxWfProcessTaskVO; import com.yonde.dex.wfc.common.vo.DxWfProcessTaskVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
...@@ -22,6 +23,7 @@ import java.util.List; ...@@ -22,6 +23,7 @@ import java.util.List;
* @createTime 2022/02/22 14:35:00 * @createTime 2022/02/22 14:35:00
*/ */
@Component @Component
@Slf4j
public class ExpenditureContractUtils { public class ExpenditureContractUtils {
@Autowired @Autowired
...@@ -29,6 +31,7 @@ public class ExpenditureContractUtils { ...@@ -29,6 +31,7 @@ public class ExpenditureContractUtils {
@Autowired @Autowired
private ImportWordService importWordService; private ImportWordService importWordService;
/** /**
* 填充评审会议资料数据 * 填充评审会议资料数据
* *
...@@ -52,20 +55,6 @@ public class ExpenditureContractUtils { ...@@ -52,20 +55,6 @@ public class ExpenditureContractUtils {
/*String projectCode = ObjectUtils.isEmpty(v.getDxDocumentExpand().getProjectCode()) ? "" : v.getDxDocumentExpand().getProjectCode(); /*String projectCode = ObjectUtils.isEmpty(v.getDxDocumentExpand().getProjectCode()) ? "" : v.getDxDocumentExpand().getProjectCode();
jsonObject.put("projectCode", extDocService.searchDictDataByDictCode(Constants.PROJECT_CODE, projectCode)); jsonObject.put("projectCode", extDocService.searchDictDataByDictCode(Constants.PROJECT_CODE, projectCode));
jsonObject.put("projectCode", projectCode);*/ jsonObject.put("projectCode", projectCode);*/
//合同名称
//合同乙方
//合同编号
//合同金额
//合同密级
//合同乙方保密资质等级
//合同类型
//学校/院归口管理部门
//合同成果形式
//成果交付地点（样机存放地方）
//起止时间
//承办部门
//经办人
//
//页数 //页数
//jsonObject.put("pages",v.getDxDocumentExpand().getAttachPages()); //jsonObject.put("pages",v.getDxDocumentExpand().getAttachPages());
...@@ -73,19 +62,12 @@ public class ExpenditureContractUtils { ...@@ -73,19 +62,12 @@ public class ExpenditureContractUtils {
List<DxWfProcessTaskVO> activities = wfProcessInfoVO.getHistoryInfo(); List<DxWfProcessTaskVO> activities = wfProcessInfoVO.getHistoryInfo();
if (!CollectionUtils.isEmpty(activities)) { if (!CollectionUtils.isEmpty(activities)) {
//写入签名数据 //写入签名数据
jsonObject.put("bz_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_PREPARED)); jsonObject.put("bz_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_BZ));
jsonObject.put("bz_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_PREPARED)); jsonObject.put("bz_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_BZ));
jsonObject.put("bz_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_PREPARED)); jsonObject.put("bz_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_BZ));
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));
} }
log.info("ExpenditureContractUtils.settingDocData.jsonObject:{}", jsonObject.toString());
//模板名称 //模板名称
importWordService.getWordAllTable(jsonObject, path + file + ".docx", outFilePath + "outFile.docx"); importWordService.getWordAllTable(jsonObject, path + file + ".docx", outFilePath + "outFile.docx");
return jsonObject; return jsonObject;
......
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/factory/InComeContractUtils.java
View file @ a15529bc
...@@ -11,6 +11,7 @@ import com.yonde.dcs.plan.core.service.ExtExpenditureContractService; ...@@ -11,6 +11,7 @@ import com.yonde.dcs.plan.core.service.ExtExpenditureContractService;
import com.yonde.dcs.plan.core.word.ImportWordService; import com.yonde.dcs.plan.core.word.ImportWordService;
import com.yonde.dex.wfc.common.vo.DxWfProcessInfoVO; import com.yonde.dex.wfc.common.vo.DxWfProcessInfoVO;
import com.yonde.dex.wfc.common.vo.DxWfProcessTaskVO; import com.yonde.dex.wfc.common.vo.DxWfProcessTaskVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
...@@ -27,6 +28,7 @@ import java.util.Objects; ...@@ -27,6 +28,7 @@ import java.util.Objects;
* @createTime 2022/02/22 14:35:00 * @createTime 2022/02/22 14:35:00
*/ */
@Component @Component
@Slf4j
public class InComeContractUtils { public class InComeContractUtils {
@Autowired @Autowired
...@@ -47,47 +49,46 @@ public class InComeContractUtils { ...@@ -47,47 +49,46 @@ public class InComeContractUtils {
+ "\\" + inComeContractVO.getNumber() + "\\"; + "\\" + inComeContractVO.getNumber() + "\\";
//生成特定的文档目录，保存生成的word文件 //生成特定的文档目录，保存生成的word文件
FileUtil.mkdir(outFilePath); 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); 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(); List<DxWfProcessTaskVO> activities = wfProcessInfoVO.getHistoryInfo();
if (!CollectionUtils.isEmpty(activities)) { if (!CollectionUtils.isEmpty(activities)) {
//写入签名数据 //写入签名数据
jsonObject.put("bz_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_PREPARED)); jsonObject.put("sjxfzr_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_SJX_IN_COME_CONTRACT));
jsonObject.put("bz_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_PREPARED)); jsonObject.put("sjxfzr_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_SJX_IN_COME_CONTRACT));
jsonObject.put("sh_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_SH)); jsonObject.put("sjxfzr_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_SJX_IN_COME_CONTRACT));
jsonObject.put("sh_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_SH));
//总体室审核 jsonObject.put("ztsfzr_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_ZTS_IN_COME_CONTRACT));
jsonObject.put("zts_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_ZTSSH)); jsonObject.put("ztsfzr_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_ZTS_IN_COME_CONTRACT));
jsonObject.put("zts_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_ZTSSH)); jsonObject.put("ztsfzr_comments", extExpenditureContractService.getComments(activities, SignConstants.SIGN_KEY_ZTS_IN_COME_CONTRACT));
jsonObject.put("pz_photo", extExpenditureContractService.getSignImage(activities, SignConstants.SIGN_KEY_APPROVED));
jsonObject.put("pz_date", extExpenditureContractService.getEndDate(activities, SignConstants.SIGN_KEY_APPROVED)); 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("InComeContractUtils.settingDocData.jsonObject:{}", jsonObject.toString());
//模板名称 //模板名称
importWordService.getWordAllTable(jsonObject, path + file + ".docx", outFilePath + "outFile.docx"); importWordService.getWordAllTable(jsonObject, path + file + ".docx", outFilePath + "outFile.docx");
return jsonObject; return jsonObject;
......
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtSupplierManageServiceImpl.java
View file @ a15529bc
...@@ -179,7 +179,9 @@ public class ExtSupplierManageServiceImpl<V extends ExtSupplierManageVO> impleme ...@@ -179,7 +179,9 @@ public class ExtSupplierManageServiceImpl<V extends ExtSupplierManageVO> impleme
BeanUtils.copyProperties(extSupplierManageVO, extSupplierVO); BeanUtils.copyProperties(extSupplierManageVO, extSupplierVO);
DictDataVO supplierType = supplierTypeMap.get(extSupplierManageVO.getSupplierType()); DictDataVO supplierType = supplierTypeMap.get(extSupplierManageVO.getSupplierType());
extSupplierVO.setSupplierType(supplierType.getDictValue()); extSupplierVO.setSupplierType(supplierType.getDictValue());
for (ExtSupplierManageLinkVO extSupplierManageLink : extSupplierManageVO.getExtSupplierManageLinks()) { List<ExtSupplierManageLinkVO> extSupplierManageLinks = extSupplierManageVO.getExtSupplierManageLinks();
if (CollectionUtils.isNotEmpty(extSupplierManageLinks)) {
for (ExtSupplierManageLinkVO extSupplierManageLink : extSupplierManageLinks) {
ExtQualificationsVO target = extSupplierManageLink.getTarget(); ExtQualificationsVO target = extSupplierManageLink.getTarget();
String qualificationsContent = target.getQualificationsContent(); String qualificationsContent = target.getQualificationsContent();
String certificateNumber = target.getCertificateNumber(); String certificateNumber = target.getCertificateNumber();
...@@ -211,6 +213,7 @@ public class ExtSupplierManageServiceImpl<V extends ExtSupplierManageVO> impleme ...@@ -211,6 +213,7 @@ public class ExtSupplierManageServiceImpl<V extends ExtSupplierManageVO> impleme
break; break;
} }
} }
}
list.add(extSupplierVO); list.add(extSupplierVO);
} }
return list; return list;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment