diff --git a/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptCmd.java b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptCmd.java
index 732bdef942afe79d4572e6f40cd2a089be18ce10..dc4f8032ee5e17055207198c1dd2c6679a79d40a 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptCmd.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptCmd.java
@@ -28,7 +28,6 @@ public class EntrustmentExpertManuscriptCmd implements Serializable {
private Long entrustmentId;
@ApiModelProperty(value = "涓撳id", example = "")
- @NotEmpty(message = "涓撳id涓嶈兘涓虹┖锛�")
private String expertId;
@ApiModelProperty(value = "涓撳鐢佃瘽", example = "")
diff --git a/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/expertInfo/ExpertInfoDbQuery.java b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/expertInfo/ExpertInfoDbQuery.java
index 398e1280652b4cf821a4585c4b8e594fa8bfe994..7594978bb03c95a049ae0f83914fc5023015a5c4 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/expertInfo/ExpertInfoDbQuery.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/expertInfo/ExpertInfoDbQuery.java
@@ -20,6 +20,10 @@ public class ExpertInfoDbQuery implements Serializable {
@ApiModelProperty(value = "涓撳鎵嬫満鍙�", example = "")
private String expertTel;
+ @ApiModelProperty(value = "涓撳鎵嬫満鍙�--涓撳搴撶殑瀛楁", example = "")
+ private String MoblieNumber;
+
+
@ApiModelProperty(value = "涓撳濮撳悕", example = "")
private String expertName;
diff --git a/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/file/EntrustmentExpertManuscriptFileOut.java b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/file/EntrustmentExpertManuscriptFileOut.java
index 5d9c89aa77283fe3009aae955cd7debf03accdae..1b0f3d069a5b9f8156067637e86ca2bc92ed55fe 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/file/EntrustmentExpertManuscriptFileOut.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/file/EntrustmentExpertManuscriptFileOut.java
@@ -31,4 +31,5 @@ public class EntrustmentExpertManuscriptFileOut implements Serializable {
@ApiModelProperty(value = "涓撳id", example = "")
private Long expertId;
+
}
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentExpertServiceImpl.java b/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentExpertServiceImpl.java
index 081ab50e98ece7fa3ff447707a869a8d0e8a4154..5499975ba33887b2494450825557ed5346d63c12 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentExpertServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentExpertServiceImpl.java
@@ -262,7 +262,7 @@ public class EntrustmentExpertServiceImpl implements EntrustmentExpertService {
List<ExpertInfoDbOut> expertInfoDbOutList = new ArrayList<>();
ExpertInfoDbOut expertDataBaseExpertByMobile = externalDataService.getExpertDataBaseExpertByMobile(expertInfoOut.getExpertTel());
ExpertInfoDbQuery query=new ExpertInfoDbQuery();
- query.setExpertTel(expertInfoOut.getExpertTel());
+ query.setMoblieNumber(expertInfoOut.getExpertTel());
String interfaceUrl = baseConfigProperties.getExpertDataBaseInterfaceUrl() + Constant.InterfaceUrl.ShEduExpertDataBase_GET_Expert_Page;
String response = HttpUtil.post(interfaceUrl, JSON.toJSONString(query));
@@ -288,9 +288,9 @@ public class EntrustmentExpertServiceImpl implements EntrustmentExpertService {
expertInfoOut.setTitle(expertDataBaseExpertByMobile.getTitle());
expertInfoOut.setIsSelfSheet(expertDataBaseExpertByMobile.getIsSelfSheet());
- expertInfoOut.setBankName( expertInfoDbOutList.get(1).getBankName());
- expertInfoOut.setBankAccount( expertInfoDbOutList.get(1).getBankAccount());
- expertInfoOut.setIDCard( expertInfoDbOutList.get(1).getIDCard());
+ expertInfoOut.setBankName( expertInfoDbOutList.get(0).getBankName());
+ expertInfoOut.setBankAccount( expertInfoDbOutList.get(0).getBankAccount());
+ expertInfoOut.setIDCard( expertInfoDbOutList.get(0).getIDCard());
}
}
}
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentServiceImpl.java b/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentServiceImpl.java
index bb88584da6c49ad67e62efa61c1a2b50165f62af..8ae58d6a7814e9588c42a09f55c60b11bfd48171 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentServiceImpl.java
@@ -517,7 +517,7 @@ public class EntrustmentServiceImpl implements EntrustmentService {
//娈佃惤
Paragraph p = null;
Phrase ph;
- p = new Paragraph("濮旀墭璇勫娑�", titleFont);
+ p = new Paragraph("濮旀墭璇勫鍑�", titleFont);
p.setLeading(30);
p.setAlignment(Element.ALIGN_CENTER);
document.add(p);
@@ -534,7 +534,7 @@ public class EntrustmentServiceImpl implements EntrustmentService {
document.add(new Paragraph("涓婃捣甯傛暀鑲插鍛樹細璐㈠姟涓庤祫浜х鐞嗕簨鍔′腑蹇冿細", contentFont));
p = new Paragraph();
ph = new Phrase();
- ph.add(new Chunk(String.format("%s鍏瑰鎵樹綘涓績瀵� %s 骞撮」鐩紑灞曚笓椤硅瘎瀹″伐浣溿€傝浜庢敹鍒扮鍚堟娆¤瘎瀹¤姹傜殑鐢虫姤鏉愭枡鍚�20涓伐浣滄棩鍐呭畬鎴愯瘎瀹″伐浣滐紝璇蜂簣鍙楃悊銆�", emptyTable, entrustmentPO.getBudYear()), contentFont));
+ ph.add(new Chunk(String.format("%s鍏瑰鎵樹綘涓績瀵� %s 骞撮」鐩紑灞曢噸澶ч」鐩簨鍓嶇哗鏁堣瘎浼板伐浣溿€傝浜庢敹鍒扮鍚堟娆¤瘎瀹¤姹傜殑鐢虫姤鏉愭枡鍚�20涓伐浣滄棩鍐呭畬鎴愯瘎浼板伐浣滐紝璇蜂簣鍙楃悊銆�", emptyTable, entrustmentPO.getBudYear()), contentFont));
p.add(ph);
p.setLeading(30);
document.add(p);
@@ -576,7 +576,7 @@ public class EntrustmentServiceImpl implements EntrustmentService {
document.add(Chunk.NEWLINE);
- document.add(new Chunk(String.format("%s %s骞村害甯傛暀濮旀湰绾ц储鏀块」鐩敮鍑洪绠楀叆搴撹瘎瀹￠」鐩竻鍗�", entrustmentPO.getDeptName(), entrustmentPO.getBudYear()), contentFont));
+ document.add(new Chunk(String.format("%s %s骞村害閲嶅ぇ椤圭洰浜嬪墠缁╂晥璇勪及椤圭洰娓呭崟", entrustmentPO.getDeptName(), entrustmentPO.getBudYear()), contentFont));
document.add(Chunk.NEWLINE);
document.add(Chunk.NEWLINE);
document.add(Chunk.NEWLINE);
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/service/ExpertManuscriptServiceImpl.java b/ServiceSite/src/main/java/com/seasky/budget/business/service/ExpertManuscriptServiceImpl.java
index 5e56bf77b6ba45ddd9b6ece10c2b9bd205b904d5..d70537034addd7267b4b2af2550721bb13cbeed2 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/business/service/ExpertManuscriptServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/service/ExpertManuscriptServiceImpl.java
@@ -305,7 +305,7 @@ public class ExpertManuscriptServiceImpl implements ExpertManuscriptService {
}
if (ObjectUtils.isEmpty(fileCmd.getExpertId())) {
throw ExceptionUtil.getException(null, "涓撳id涓嶈兘涓虹┖锛�");
- }
+ }
QueryWrapper<EntrustmentExpertManuscriptFilePO> filePOQueryWrapper = new QueryWrapper<>();
filePOQueryWrapper.eq("plan_id", fileCmd.getPlanId()).eq("expert_id", fileCmd.getExpertId());
List<EntrustmentExpertManuscriptFilePO> entrustmentExpertManuscriptFilePOS = entrustmentExpertManuscriptFileMapper.selectList(filePOQueryWrapper);
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/service/PlanReviewServiceImpl.java b/ServiceSite/src/main/java/com/seasky/budget/business/service/PlanReviewServiceImpl.java
index 4f60abcd04ca457f39acb732cf6cdea2c5a6106c..ea1c4901124dba4f331be1cdd053f0649e828f41 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/business/service/PlanReviewServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/service/PlanReviewServiceImpl.java
@@ -465,7 +465,7 @@ public class PlanReviewServiceImpl implements PlanReviewService {
List<ExpertInfoDbOut> expertInfoDbOutList = new ArrayList<>();
ExpertInfoDbOut expertDataBaseExpertByMobile = externalDataService.getExpertDataBaseExpertByMobile(expertOut.getExpertTel());
ExpertInfoDbQuery query=new ExpertInfoDbQuery();
- query.setExpertTel(expertOut.getExpertTel());
+ query.setMoblieNumber(expertOut.getExpertTel());
String interfaceUrl = baseConfigProperties.getExpertDataBaseInterfaceUrl() + Constant.InterfaceUrl.ShEduExpertDataBase_GET_Expert_Page;
String response = HttpUtil.post(interfaceUrl, JSON.toJSONString(query));
@@ -491,9 +491,9 @@ public class PlanReviewServiceImpl implements PlanReviewService {
expertOut.setExpertName(expertOut.getExpertName());
expertOut.setExpertTel(expertOut.getExpertTel());
- expertOut.setBankName( expertInfoDbOutList.get(1).getBankName());
- expertOut.setBankAccount( expertInfoDbOutList.get(1).getBankAccount());
- expertOut.setIDCard( expertInfoDbOutList.get(1).getIDCard());
+ expertOut.setBankName( expertInfoDbOutList.get(0).getBankName());
+ expertOut.setBankAccount( expertInfoDbOutList.get(0).getBankAccount());
+ expertOut.setIDCard( expertInfoDbOutList.get(0).getIDCard());
}
}
planRelatedOut.setPlanExperts(planReviewExpertOuts.stream().distinct().collect(Collectors.toList()));
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/service/PreliminaryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/budget/business/service/PreliminaryServiceImpl.java
index fe838c07ab60b02c6d0ba5882b054c9df573e0f2..7161a265592b96a9c64f1355bf8a76c47f64a840 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/business/service/PreliminaryServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/service/PreliminaryServiceImpl.java
@@ -69,7 +69,7 @@ public class PreliminaryServiceImpl implements PreliminaryService {
//鏂板缓銆佺紪杈戞柟娉�
@Override
public Long savePreliminary(PreliminaryCmd preliminaryCmd) { //鏂板缓缂栬緫鐨勬柟娉�
- ProjectTypePO projectTypePO = projectTypeMapper.selectById(preliminaryCmd.getProjectId());
+ ProjectTypePO projectTypePO = projectTypeMapper.selectById(preliminaryCmd.getProjectId());
if (ObjectUtils.isEmpty(projectTypePO)) {
throw ExceptionUtil.getException(ResponseCode.DATA_ACCESS_NOT_FOUND, "鏈煡鍒扮敵鎶ユ暟鎹�");
}
@@ -77,11 +77,11 @@ public class PreliminaryServiceImpl implements PreliminaryService {
UserInfo loginInfo = loginService.getLoginInfo();
preliminaryCmd.setOperatorAuthorCode(loginInfo.getUserCode());
preliminaryCmd.setProjectNumber(projectTypePO.getProjectNumber());
- PreliminaryPO preliminaryPO = MapperUtils.INSTANCE.map(PreliminaryPO.class, preliminaryCmd);
+ PreliminaryPO preliminaryPO = MapperUtils.INSTANCE.map(PreliminaryPO.class, preliminaryCmd);
preliminaryMapper.insert(preliminaryPO);
preliminaryCmd.setId(preliminaryPO.getId());
- }else{
- PreliminaryPO preliminaryPO = preliminaryMapper.selectById(preliminaryCmd.getId());
+ } else {
+ PreliminaryPO preliminaryPO = preliminaryMapper.selectById(preliminaryCmd.getId());
preliminaryPO.setProjectId(preliminaryCmd.getProjectId());
preliminaryPO.setProjectNecessityApproval(preliminaryCmd.getProjectNecessityApproval());
@@ -112,10 +112,10 @@ public class PreliminaryServiceImpl implements PreliminaryService {
List<PreliminaryProjectTypeOut> preliminaryList = MapperUtils.INSTANCE.mapAsList(PreliminaryProjectTypeOut.class,
preliminaryMapper.selectList(queryWrapper));
- List<EntrustmentProjectOut> entrustmentProjectOutList =MapperUtils.INSTANCE.mapAsList(EntrustmentProjectOut.class,
+ List<EntrustmentProjectOut> entrustmentProjectOutList = MapperUtils.INSTANCE.mapAsList(EntrustmentProjectOut.class,
entrustmentProjectMapper.getEntrustmentProjectOuts(idRequest.getId()));
- for (EntrustmentProjectOut EntrustmentProjectOutModel : entrustmentProjectOutList) {
+ for (EntrustmentProjectOut EntrustmentProjectOutModel : entrustmentProjectOutList) {
ProjectTypePO projectTypePO = projectTypeMapper.selectById(EntrustmentProjectOutModel.getParentId());
@@ -124,18 +124,17 @@ public class PreliminaryServiceImpl implements PreliminaryService {
EntrustmentProjectOutModel.setDeptName(projectTypePO.getDeptName());
- Optional preliminaryProjectTypOptional= preliminaryList.stream().filter(s ->
+ Optional preliminaryProjectTypOptional = preliminaryList.stream().filter(s ->
s.getProjectId().equals(EntrustmentProjectOutModel.getParentId())).findFirst();
- if (preliminaryProjectTypOptional.isPresent())
- {
- PreliminaryProjectTypeOut preliminaryProjectTypModel= preliminaryList.stream().filter(s ->
+ if (preliminaryProjectTypOptional.isPresent()) {
+ PreliminaryProjectTypeOut preliminaryProjectTypModel = preliminaryList.stream().filter(s ->
s.getProjectId().equals(EntrustmentProjectOutModel.getParentId())).findFirst().get();
EntrustmentProjectOutModel.setIsHavePreliminary("true");
EntrustmentProjectOutModel.setPreliminaryId(preliminaryProjectTypModel.getId());
- }else{
+ } else {
EntrustmentProjectOutModel.setIsHavePreliminary("false");
}
@@ -145,10 +144,9 @@ public class PreliminaryServiceImpl implements PreliminaryService {
}
-
//鏍规嵁id鑾峰彇棰勫椤圭洰
@Override
- public PreliminaryOut getPreliminaryById(IdRequest idRequest) {
+ public PreliminaryOut getPreliminaryById(IdRequest idRequest) {
if (ObjectUtils.isEmpty(idRequest.getId())) {
throw ExceptionUtil.getException(ResponseCode.DATA_VERIFY_EMPTY_ID, "鍙傛暟涓嶆纭紝id涓虹┖");
}
@@ -168,25 +166,25 @@ public class PreliminaryServiceImpl implements PreliminaryService {
//鍙嶉棰勫鎰忚
@Override
@Transactional
- public Integer modifyByFeedbackIds(IdRequest idRequest) {
+ public Integer modifyByFeedbackIds(IdRequest idRequest) {
if (ObjectUtils.isEmpty(idRequest.getIds())) {
throw ExceptionUtil.getException(ResponseCode.DATA_VERIFY_EMPTY_ID, "鍙傛暟涓嶆纭紝id涓虹┖");
}
- int Inum=0;
- for (Long Id : idRequest.getIds()) {
- PreliminaryPO preliminaryPO = preliminaryMapper.selectById(Id);
- if (ObjectUtils.isNotEmpty(preliminaryPO) ) {
- preliminaryPO.setIsFeedback("宸插弽棣�");
- Inum+=preliminaryMapper.updateById(preliminaryPO);
- }
+ int Inum = 0;
+ for (Long Id : idRequest.getIds()) {
+ PreliminaryPO preliminaryPO = preliminaryMapper.selectById(Id);
+ if (ObjectUtils.isNotEmpty(preliminaryPO)) {
+ preliminaryPO.setIsFeedback("宸插弽棣�");
+ Inum += preliminaryMapper.updateById(preliminaryPO);
}
+ }
return Inum;
}
private void modifyPreliminaryParentId(PreliminaryCmd preliminaryCmd) {
if (ObjectUtils.isNotEmpty(preliminaryCmd.getFileIds())) {
- for (Long fileId : preliminaryCmd.getFileIds()) {
+ for (Long fileId : preliminaryCmd.getFileIds()) {
FilePO filePO = fileMapper.selectById(fileId);
if (ObjectUtils.isNotEmpty(filePO) && ObjectUtils.isEmpty(filePO.getParentId())) {
filePO.setParentId(preliminaryCmd.getId());
@@ -201,7 +199,7 @@ public class PreliminaryServiceImpl implements PreliminaryService {
* 鏍规嵁棰勫id鎵撳嵃棰勫鎰忚琛�
*/
@Override
- public void downloadPreliminaryPdf(HttpServletResponse response, Long id) throws IOException {
+ public void downloadPreliminaryPdf(HttpServletResponse response, Long id) throws IOException {
//杩欎釜鏄敓鎴恜df鐨勪綅缃互鍙婂悕绉�
String fileName = "棰勫鎰忚琛�";
response.setContentType("application/pdf");
@@ -236,53 +234,51 @@ public class PreliminaryServiceImpl implements PreliminaryService {
if (!ObjectUtils.isEmpty(preliminaryPO)) {
+ Paragraph p = null;
+ Phrase ph;
- Paragraph p = null;
- Phrase ph;
-
-
- //鍒涘缓绗簩琛�,骞惰缃浜岃涓殑琛ㄦ牸鏁�
- PdfPTable pdfPTable = new PdfPTable(4);
- pdfPTable.setWidthPercentage(100);
- pdfPTable.setTotalWidth(1.0f);
- //寰幆灏嗚〃澶存暟鎹坊鍔犲埌绗簩琛岃〃鏍间腑
- pdfPTable.addCell(PdfUtils.pdfTableStyle("甯傛暀濮旀湰閮ㄩ噸澶ч」鐩簨鍓嶈瘎浼颁簨鍔℃墍棰勫琛�", listFont, 50, 4, 1, true, true));
+ //鍒涘缓绗簩琛�,骞惰缃浜岃涓殑琛ㄦ牸鏁�
+ PdfPTable pdfPTable = new PdfPTable(4);
+ pdfPTable.setWidthPercentage(100);
+ pdfPTable.setTotalWidth(1.0f);
+ //寰幆灏嗚〃澶存暟鎹坊鍔犲埌绗簩琛岃〃鏍间腑
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("甯傛暀濮旀湰閮ㄩ噸澶ч」鐩簨鍓嶈瘎浼颁簨鍔℃墍棰勫琛�", listFont, 50, 4, 1, true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("涓€绾ф寚鏍�", listFont, 50, 1, 1, true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("浜岀骇鎸囨爣", listFont, 50, 1, 1, true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("璇勪及瑕佺偣", listFont, 50, 1, 1, true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("棰勫缁撹", listFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("涓€绾ф寚鏍�", listFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("浜岀骇鎸囨爣", listFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("璇勪及瑕佺偣", listFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("棰勫缁撹", listFont, 50, 1, 1, true, true));
- //璁剧疆琛ㄦ牸鐨勫搴�
- document.add(pdfPTable);
+ //璁剧疆琛ㄦ牸鐨勫搴�
+ document.add(pdfPTable);
- PdfPTable dataTable = new PdfPTable(4);
- dataTable.setWidthPercentage(100);
- dataTable.setTotalWidth(1.0f);
+ PdfPTable dataTable = new PdfPTable(4);
+ dataTable.setWidthPercentage(100);
+ dataTable.setTotalWidth(1.0f);
- //椤圭洰绔嬮」蹇呰鎬�
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰绔嬮」蹇呰鎬�", contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("渚濇嵁鍏呭垎鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鍐呭涓庡浗瀹躲€佹湰甯傚畯瑙傛斂绛栥€佽涓氭斂绛栫浉绗︼紝涓庢湰閮ㄩ棬鑱岃兘銆佺浉鍏充笓椤硅鍒掋€佸綋骞撮噸鐐瑰伐浣滅浉绗�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryPO.getProjectNecessityApproval(), contentFont, 60, 1, 3, true, true));
+ //椤圭洰绔嬮」蹇呰鎬�
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰绔嬮」蹇呰鎬�", contentFont, 60, 1, 3, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("渚濇嵁鍏呭垎鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鍐呭涓庡浗瀹躲€佹湰甯傚畯瑙傛斂绛栥€佽涓氭斂绛栫浉绗︼紝涓庢湰閮ㄩ棬鑱岃兘銆佺浉鍏充笓椤硅鍒掋€佸綋骞撮噸鐐瑰伐浣滅浉绗�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryPO.getProjectNecessityApproval(), contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("闇€姹傝揩鍒囨€�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鏈夌‘瀹氱殑鏈嶅姟瀵硅薄鎴栧彈鐩婂璞★紝鐜板疄闇€姹傝揩鍒囷紝娌℃湁鍙浛浠ｆ€�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("璐㈡斂鎶曞叆鐩稿叧鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鍏锋湁鍏叡鎬э紝灞炰簬鍏叡璐㈡斂鏀寔鐨勮寖鍥�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("闇€姹傝揩鍒囨€�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鏈夌‘瀹氱殑鏈嶅姟瀵硅薄鎴栧彈鐩婂璞★紝鐜板疄闇€姹傝揩鍒囷紝娌℃湁鍙浛浠ｆ€�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("璐㈡斂鎶曞叆鐩稿叧鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鍏锋湁鍏叡鎬э紝灞炰簬鍏叡璐㈡斂鏀寔鐨勮寖鍥�", contentFont, 60, 1, 1, true, true));
- //鎶曞叆缁忔祹鎬�
- dataTable.addCell(PdfUtils.pdfTableStyle("鎶曞叆缁忔祹鎬�", contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("鎶曞叆璧勯噾璁鸿瘉鍏呭垎鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("瀵规姇鍏ラ噺缁忚繃浜嗗繀瑕佺殑瀹℃牳杩囩▼", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryPO.getInvestedEconomic(), contentFont, 60, 1, 3, true, true));
+ //鎶曞叆缁忔祹鎬�
+ dataTable.addCell(PdfUtils.pdfTableStyle("鎶曞叆缁忔祹鎬�", contentFont, 60, 1, 3, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("鎶曞叆璧勯噾璁鸿瘉鍏呭垎鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("瀵规姇鍏ラ噺缁忚繃浜嗗繀瑕佺殑瀹℃牳杩囩▼", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryPO.getInvestedEconomic(), contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("棰勭畻缂栧埗绉戝鍚堢悊鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰棰勭畻涓庨」鐩唴瀹圭浉鍖归厤", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("閲嶅鎶曞叆椋庨櫓", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("娌℃湁绫讳技椤圭洰寰楀埌璐㈡斂璧勯噾鏀寔锛岄渶姹傝€咃紙鍙楃泭瀵硅薄锛夌殑闇€姹傛病鏈夊叾浠栧悓绫婚」鐩噸澶嶆姇鍏�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("棰勭畻缂栧埗绉戝鍚堢悊鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰棰勭畻涓庨」鐩唴瀹圭浉鍖归厤", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("閲嶅鎶曞叆椋庨櫓", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("娌℃湁绫讳技椤圭洰寰楀埌璐㈡斂璧勯噾鏀寔锛岄渶姹傝€咃紙鍙楃泭瀵硅薄锛夌殑闇€姹傛病鏈夊叾浠栧悓绫婚」鐩噸澶嶆姇鍏�", contentFont, 60, 1, 1, true, true));
//缁╂晥鐩爣鍚堢悊鎬�
dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鍚堢悊鎬�", contentFont, 60, 1, 3, true, true));
@@ -317,7 +313,7 @@ public class PreliminaryServiceImpl implements PreliminaryService {
//鏉愭枡鐨勫畬鏁存€�/鍏朵粬
dataTable.addCell(PdfUtils.pdfTableStyle("鏉愭枡鐨勫畬鏁存€�", contentFont, 60, 3, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle( preliminaryPO.getMaterialIntegrity(), contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryPO.getMaterialIntegrity(), contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("鍏朵粬", contentFont, 60, 3, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryPO.getOther(), contentFont, 60, 1, 2, true, true));
@@ -325,29 +321,26 @@ public class PreliminaryServiceImpl implements PreliminaryService {
document.add(dataTable);
+ document.close();
+ pdfWriter.close();
+ os.close();
+ System.out.println("鍒涘缓鎴愬姛锛�");
- document.close();
- pdfWriter.close();
- os.close();
- System.out.println("鍒涘缓鎴愬姛锛�");
-
- }
+ }
- }
- catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
}
-
}
/**
* 鏍规嵁濮旀墭鍑絠d鎵撳嵃棰勫鎰忚琛�
*/
@Override
- public void downloadPreliminaryByEntrustmentIdPdf(HttpServletResponse response, Long entrustmentId) throws IOException {
+ public void downloadPreliminaryByEntrustmentIdPdf(HttpServletResponse response, Long entrustmentId) throws IOException {
//杩欎釜鏄敓鎴恜df鐨勪綅缃互鍙婂悕绉�
String fileName = "棰勫鎰忚琛�";
response.setContentType("application/pdf");
@@ -384,96 +377,97 @@ public class PreliminaryServiceImpl implements PreliminaryService {
preliminaryMapper.selectList(queryWrapper));
if (!ObjectUtils.isEmpty(preliminaryList)) {
- int i=1;
- for(PreliminaryOut preliminaryModel: preliminaryList){
- Paragraph p = null;
- Phrase ph;
+ int i = 1;
+ for (PreliminaryOut preliminaryModel : preliminaryList) {
+ Paragraph p = null;
+ Phrase ph;
- //鍒涘缓绗簩琛�,骞惰缃浜岃涓殑琛ㄦ牸鏁�
- PdfPTable pdfPTable = new PdfPTable(4);
- pdfPTable.setWidthPercentage(100);
- pdfPTable.setTotalWidth(1.0f);
- //寰幆灏嗚〃澶存暟鎹坊鍔犲埌绗簩琛岃〃鏍间腑
- pdfPTable.addCell(PdfUtils.pdfTableStyle("甯傛暀濮旀湰閮ㄩ噸澶ч」鐩簨鍓嶈瘎浼颁簨鍔℃墍棰勫琛�", listFont, 50, 4, 1, true, true));
+ //鍒涘缓绗簩琛�,骞惰缃浜岃涓殑琛ㄦ牸鏁�
+ PdfPTable pdfPTable = new PdfPTable(4);
+ pdfPTable.setWidthPercentage(100);
+ pdfPTable.setTotalWidth(1.0f);
+ //寰幆灏嗚〃澶存暟鎹坊鍔犲埌绗簩琛岃〃鏍间腑
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("甯傛暀濮旀湰閮ㄩ噸澶ч」鐩簨鍓嶈瘎浼颁簨鍔℃墍棰勫琛�", listFont, 50, 4, 1, true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("涓€绾ф寚鏍�", listFont, 50, 1, 1, true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("浜岀骇鎸囨爣", listFont, 50, 1, 1, true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("璇勪及瑕佺偣", listFont, 50, 1, 1, true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("棰勫缁撹", listFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("涓€绾ф寚鏍�", listFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("浜岀骇鎸囨爣", listFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("璇勪及瑕佺偣", listFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("棰勫缁撹", listFont, 50, 1, 1, true, true));
- //璁剧疆琛ㄦ牸鐨勫搴�
- document.add(pdfPTable);
+ //璁剧疆琛ㄦ牸鐨勫搴�
+ document.add(pdfPTable);
- PdfPTable dataTable = new PdfPTable(4);
- dataTable.setWidthPercentage(100);
- dataTable.setTotalWidth(1.0f);
+ PdfPTable dataTable = new PdfPTable(4);
+ dataTable.setWidthPercentage(100);
+ dataTable.setTotalWidth(1.0f);
- //椤圭洰绔嬮」蹇呰鎬�
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰绔嬮」蹇呰鎬�", contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("渚濇嵁鍏呭垎鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鍐呭涓庡浗瀹躲€佹湰甯傚畯瑙傛斂绛栥€佽涓氭斂绛栫浉绗︼紝涓庢湰閮ㄩ棬鑱岃兘銆佺浉鍏充笓椤硅鍒掋€佸綋骞撮噸鐐瑰伐浣滅浉绗�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryModel.getProjectNecessityApproval(), contentFont, 60, 1, 3, true, true));
+ //椤圭洰绔嬮」蹇呰鎬�
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰绔嬮」蹇呰鎬�", contentFont, 60, 1, 3, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("渚濇嵁鍏呭垎鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鍐呭涓庡浗瀹躲€佹湰甯傚畯瑙傛斂绛栥€佽涓氭斂绛栫浉绗︼紝涓庢湰閮ㄩ棬鑱岃兘銆佺浉鍏充笓椤硅鍒掋€佸綋骞撮噸鐐瑰伐浣滅浉绗�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryModel.getProjectNecessityApproval(), contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("闇€姹傝揩鍒囨€�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鏈夌‘瀹氱殑鏈嶅姟瀵硅薄鎴栧彈鐩婂璞★紝鐜板疄闇€姹傝揩鍒囷紝娌℃湁鍙浛浠ｆ€�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("璐㈡斂鎶曞叆鐩稿叧鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鍏锋湁鍏叡鎬э紝灞炰簬鍏叡璐㈡斂鏀寔鐨勮寖鍥�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("闇€姹傝揩鍒囨€�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鏈夌‘瀹氱殑鏈嶅姟瀵硅薄鎴栧彈鐩婂璞★紝鐜板疄闇€姹傝揩鍒囷紝娌℃湁鍙浛浠ｆ€�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("璐㈡斂鎶曞叆鐩稿叧鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鍏锋湁鍏叡鎬э紝灞炰簬鍏叡璐㈡斂鏀寔鐨勮寖鍥�", contentFont, 60, 1, 1, true, true));
- //鎶曞叆缁忔祹鎬�
- dataTable.addCell(PdfUtils.pdfTableStyle("鎶曞叆缁忔祹鎬�", contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("鎶曞叆璧勯噾璁鸿瘉鍏呭垎鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("瀵规姇鍏ラ噺缁忚繃浜嗗繀瑕佺殑瀹℃牳杩囩▼", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryModel.getInvestedEconomic(), contentFont, 60, 1, 3, true, true));
+ //鎶曞叆缁忔祹鎬�
+ dataTable.addCell(PdfUtils.pdfTableStyle("鎶曞叆缁忔祹鎬�", contentFont, 60, 1, 3, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("鎶曞叆璧勯噾璁鸿瘉鍏呭垎鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("瀵规姇鍏ラ噺缁忚繃浜嗗繀瑕佺殑瀹℃牳杩囩▼", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryModel.getInvestedEconomic(), contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("棰勭畻缂栧埗绉戝鍚堢悊鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰棰勭畻涓庨」鐩唴瀹圭浉鍖归厤", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("閲嶅鎶曞叆椋庨櫓", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("娌℃湁绫讳技椤圭洰寰楀埌璐㈡斂璧勯噾鏀寔锛岄渶姹傝€咃紙鍙楃泭瀵硅薄锛夌殑闇€姹傛病鏈夊叾浠栧悓绫婚」鐩噸澶嶆姇鍏�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("棰勭畻缂栧埗绉戝鍚堢悊鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰棰勭畻涓庨」鐩唴瀹圭浉鍖归厤", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("閲嶅鎶曞叆椋庨櫓", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("娌℃湁绫讳技椤圭洰寰楀埌璐㈡斂璧勯噾鏀寔锛岄渶姹傝€咃紙鍙楃泭瀵硅薄锛夌殑闇€姹傛病鏈夊叾浠栧悓绫婚」鐩噸澶嶆姇鍏�", contentFont, 60, 1, 1, true, true));
- //缁╂晥鐩爣鍚堢悊鎬�
- dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鍚堢悊鎬�", contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鏄庣‘鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鎸囧悜鏄庣‘锛屼笖涓庨儴闂ㄩ暱鏈熻鍒掔洰鏍囥€佸勾搴﹀伐浣滅洰鏍囦竴鑷�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryModel.getRationalityPerformance(), contentFont, 60, 1, 3, true, true));
+ //缁╂晥鐩爣鍚堢悊鎬�
+ dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鍚堢悊鎬�", contentFont, 60, 1, 3, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鏄庣‘鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鎸囧悜鏄庣‘锛屼笖涓庨儴闂ㄩ暱鏈熻鍒掔洰鏍囥€佸勾搴﹀伐浣滅洰鏍囦竴鑷�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryModel.getRationalityPerformance(), contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鐩稿叧鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣涓庨」鐩璁¤В鍐崇殑闂鍖归厤锛屼笌椤圭洰鍐呭銆侀」鐩粡璐规敮鍑鸿寖鍥村尮閰�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鍙绋嬪害", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鍦ㄤ竴瀹氭湡闄愬唴鍏锋湁杈冨己鐨勫彲瀹炵幇鎬э紝鍏锋湁涓€瀹氱殑鍓嶇灮鎬у拰鎸戞垬鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鐩稿叧鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣涓庨」鐩璁¤В鍐崇殑闂鍖归厤锛屼笌椤圭洰鍐呭銆侀」鐩粡璐规敮鍑鸿寖鍥村尮閰�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鍙绋嬪害", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鍦ㄤ竴瀹氭湡闄愬唴鍏锋湁杈冨己鐨勫彲瀹炵幇鎬э紝鍏锋湁涓€瀹氱殑鍓嶇灮鎬у拰鎸戞垬鎬�", contentFont, 60, 1, 1, true, true));
- //瀹炴柦鏂规鍙鎬�
- dataTable.addCell(PdfUtils.pdfTableStyle("瀹炴柦鏂规鍙鎬�", contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("鍓嶆湡绛瑰瀹屽鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰缁忚繃蹇呰鐨勮皟鐮斻€侀闄╄瘎浼扮瓑鍓嶆湡宸ヤ綔", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryModel.getFeasibilityImplementationPlan(), contentFont, 60, 1, 3, true, true));
+ //瀹炴柦鏂规鍙鎬�
+ dataTable.addCell(PdfUtils.pdfTableStyle("瀹炴柦鏂规鍙鎬�", contentFont, 60, 1, 3, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("鍓嶆湡绛瑰瀹屽鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰缁忚繃蹇呰鐨勮皟鐮斻€侀闄╄瘎浼扮瓑鍓嶆湡宸ヤ綔", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryModel.getFeasibilityImplementationPlan(), contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("瀹炴柦璁″垝鍚堢悊鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰瀹炴柦璁″垝瀹屾暣銆佸彲琛屻€佸悎鐞嗭紝鍏峰鏄庣‘鐨勯」鐩寖鍥淬€侀」鐩唴瀹广€侀」鐩粍缁囥€佽繘搴﹀畨鎺掞紝椤圭洰鐩稿叧鐨勫熀纭€璁炬柦銆佽澶囨潯浠惰兘澶熷緱浠ユ湁鏁堜繚闅�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰绠＄悊鏈哄埗鍋ュ叏鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鍏峰椤圭洰璐ㄩ噺鏍囧噯銆佹斂搴滈噰璐涓虹害鏉熸満鍒讹紙瀵逛簬娑夊強鏀垮簻閲囪喘琛屼负鐨勯」鐩級銆侀」鐩墽琛岃繃绋嬬鎺ф帾鏂芥垨鏈哄埗銆侀」鐩缓鍚庣淮鎶ゆ満鍒讹紙瀵逛簬淇℃伅鍖栧缓璁剧被椤圭洰锛夈€佽祫鏂欏綊妗ｆ満鍒讹紝鐩稿叧鎺柦銆佹満鍒惰兘澶熶繚璇侀」鐩『鍒╁疄鏂�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("瀹炴柦璁″垝鍚堢悊鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰瀹炴柦璁″垝瀹屾暣銆佸彲琛屻€佸悎鐞嗭紝鍏峰鏄庣‘鐨勯」鐩寖鍥淬€侀」鐩唴瀹广€侀」鐩粍缁囥€佽繘搴﹀畨鎺掞紝椤圭洰鐩稿叧鐨勫熀纭€璁炬柦銆佽澶囨潯浠惰兘澶熷緱浠ユ湁鏁堜繚闅�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰绠＄悊鏈哄埗鍋ュ叏鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鍏峰椤圭洰璐ㄩ噺鏍囧噯銆佹斂搴滈噰璐涓虹害鏉熸満鍒讹紙瀵逛簬娑夊強鏀垮簻閲囪喘琛屼负鐨勯」鐩級銆侀」鐩墽琛岃繃绋嬬鎺ф帾鏂芥垨鏈哄埗銆侀」鐩缓鍚庣淮鎶ゆ満鍒讹紙瀵逛簬淇℃伅鍖栧缓璁剧被椤圭洰锛夈€佽祫鏂欏綊妗ｆ満鍒讹紝鐩稿叧鎺柦銆佹満鍒惰兘澶熶繚璇侀」鐩『鍒╁疄鏂�", contentFont, 60, 1, 1, true, true));
- //绛硅祫鍚堣鎬�
- dataTable.addCell(PdfUtils.pdfTableStyle("绛硅祫鍚堣鎬�", contentFont, 60, 1, 2, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("璧勯噾鏀寔鍚堢悊鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("娌℃湁涓庡叾瀹冮」鐩殑鏀寔鑼冨洿鍜屽璞″瓨鍦ㄤ氦鍙夐噸鍙狅紱璧勯噾鏀寔鏂瑰紡绉戝鍚堢悊銆�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryModel.getFinancialSupportRationality(), contentFont, 60, 1, 2, true, true));
+ //绛硅祫鍚堣鎬�
+ dataTable.addCell(PdfUtils.pdfTableStyle("绛硅祫鍚堣鎬�", contentFont, 60, 1, 2, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("璧勯噾鏀寔鍚堢悊鎬�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("娌℃湁涓庡叾瀹冮」鐩殑鏀寔鑼冨洿鍜屽璞″瓨鍦ㄤ氦鍙夐噸鍙狅紱璧勯噾鏀寔鏂瑰紡绉戝鍚堢悊銆�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryModel.getFinancialSupportRationality(), contentFont, 60, 1, 2, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("绛硅祫椋庨櫓鍙帶鎬э紙鑻ュ惈闈炶储鏀挎€ц祫閲戯級", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣涓庨」鐩璁¤В鍐崇殑闂鍖归厤锛屼笌椤圭洰鍐呭銆侀」鐩粡璐规敮鍑鸿寖鍥村尮閰�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("绛硅祫椋庨櫓鍙帶鎬э紙鑻ュ惈闈炶储鏀挎€ц祫閲戯級", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣涓庨」鐩璁¤В鍐崇殑闂鍖归厤锛屼笌椤圭洰鍐呭銆侀」鐩粡璐规敮鍑鸿寖鍥村尮閰�", contentFont, 60, 1, 1, true, true));
//鏉愭枡鐨勫畬鏁存€�/鍏朵粬
- dataTable.addCell(PdfUtils.pdfTableStyle("鏉愭枡鐨勫畬鏁存€�", contentFont, 60, 3, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle( preliminaryModel.getMaterialIntegrity(), contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("鏉愭枡鐨勫畬鏁存€�", contentFont, 60, 3, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryModel.getMaterialIntegrity(), contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("鍏朵粬", contentFont, 60, 3, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryModel.getOther(), contentFont, 60, 1, 2, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("鍏朵粬", contentFont, 60, 3, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(preliminaryModel.getOther(), contentFont, 60, 1, 2, true, true));
- document.add(dataTable);
- i++;
- if(i < preliminaryList.size())
- { document.newPage();}
- }
+ document.add(dataTable);
+ i++;
+ if (i < preliminaryList.size()) {
+ document.newPage();
+ }
+ }
document.close();
@@ -484,20 +478,18 @@ public class PreliminaryServiceImpl implements PreliminaryService {
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
}
-
}
/**
* 鎵撳嵃鍔冲姟璐�
*/
@Override
- public void downloadServiceFeePdf(HttpServletResponse response, List<ExpertInfoPDFCmd> expertInfoPDFCmds) throws IOException {
+ public void downloadServiceFeePdf(HttpServletResponse response, List<ExpertInfoPDFCmd> expertInfoPDFCmds) throws IOException {
//杩欎釜鏄敓鎴恜df鐨勪綅缃互鍙婂悕绉�
String fileName = "鍔冲姟璐瑰彂鏀炬竻鍗�";
response.setContentType("application/pdf");
@@ -517,7 +509,7 @@ public class PreliminaryServiceImpl implements PreliminaryService {
// 璁剧疆椤甸潰鐩戝惉浜嬩欢锛屽繀椤诲湪open鏂规硶鍓�
pdfWriter.setPageEvent(new PageNumPdfPageEvent());
//List<String> waterTextList = Collections.singletonList(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
- // pdfWriter.setPageEvent(new TextWaterMarkPageEvent(waterTextList));
+ // pdfWriter.setPageEvent(new TextWaterMarkPageEvent(waterTextList));
//鎵撳紑鏂囨。
document.open();
//浣跨敤涓婇潰鐨則itle 瀛椾綋 鍔犵矖锛岃繖涓槸鏍囬瀛椾綋
@@ -528,7 +520,6 @@ public class PreliminaryServiceImpl implements PreliminaryService {
Font contentFont = new Font(PdfUtils.contentBaseFont, 16);
-
if (!ObjectUtils.isEmpty(expertInfoPDFCmds)) {
//鍒涘缓绗簩琛�,骞惰缃浜岃涓殑琛ㄦ牸鏁�
@@ -548,13 +539,13 @@ public class PreliminaryServiceImpl implements PreliminaryService {
pdfPTable.addCell(PdfUtils.pdfTableStyle("绋庡墠閲戦", listFont, 50, 1, 1, true, true));
pdfPTable.addCell(PdfUtils.pdfTableStyle("绋庡悗閲戦", listFont, 50, 1, 1, true, true));
pdfPTable.addCell(PdfUtils.pdfTableStyle("绛炬敹", listFont, 50, 1, 1, true, true));
- int i=1;
- for(ExpertInfoPDFCmd expertInfoPDFCmd:expertInfoPDFCmds){
+ int i = 1;
+ for (ExpertInfoPDFCmd expertInfoPDFCmd : expertInfoPDFCmds) {
pdfPTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(i), listFont, 50, 1, 1, true, true));
pdfPTable.addCell(PdfUtils.pdfTableStyle(expertInfoPDFCmd.getExpertName(), listFont, 50, 1, 1, true, true));
pdfPTable.addCell(PdfUtils.pdfTableStyle(expertInfoPDFCmd.getWorkPlace(), listFont, 50, 1, 1, true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle(expertInfoPDFCmd.getPost()+"/"+expertInfoPDFCmd.getTitle(), listFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle(expertInfoPDFCmd.getPost() + "/" + expertInfoPDFCmd.getTitle(), listFont, 50, 1, 1, true, true));
pdfPTable.addCell(PdfUtils.pdfTableStyle(expertInfoPDFCmd.getIDCard(), listFont, 50, 1, 1, true, true));
pdfPTable.addCell(PdfUtils.pdfTableStyle(expertInfoPDFCmd.getBankAccount(), listFont, 50, 1, 1, true, true));
pdfPTable.addCell(PdfUtils.pdfTableStyle(expertInfoPDFCmd.getBankName(), listFont, 50, 1, 1, true, true));
@@ -572,9 +563,6 @@ public class PreliminaryServiceImpl implements PreliminaryService {
pdfPTable.addCell(PdfUtils.pdfTableStyle("", listFont, 50, 1, 1, true, true));
-
-
-
//璁剧疆琛ㄦ牸鐨勫搴�
document.add(pdfPTable);
@@ -586,7 +574,6 @@ public class PreliminaryServiceImpl implements PreliminaryService {
document.add(dataTable);
-
document.close();
pdfWriter.close();
os.close();
@@ -595,20 +582,18 @@ public class PreliminaryServiceImpl implements PreliminaryService {
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
}
-
}
/**
* 鏍规嵁鍙嶉鎰忚id鐢熸垚鎰忚鍙嶉琛�
*/
@Override
- public void downloadFeedbackByIdPdf(HttpServletResponse httpServletResponse, Long id) throws IOException{
+ public void downloadFeedbackByIdPdf(HttpServletResponse httpServletResponse, Long id) throws IOException {
}
@@ -616,7 +601,7 @@ public class PreliminaryServiceImpl implements PreliminaryService {
* 鏍规嵁濮旀墭鍑絠d鐢熸垚澶氫釜鎰忚鍙嶉
*/
@Override
- public void downloadFeedbackByEntrustmentIdPdf(HttpServletResponse httpServletResponse, Long entrustmentId) throws IOException{
+ public void downloadFeedbackByEntrustmentIdPdf(HttpServletResponse httpServletResponse, Long entrustmentId) throws IOException {
}
@@ -624,7 +609,7 @@ public class PreliminaryServiceImpl implements PreliminaryService {
* 鏍规嵁鏂规id鐢熸垚澶氫釜鎰忚鍙嶉
*/
@Override
- public void downloadFeedbackByRelatedIdPdf(HttpServletResponse httpServletResponse, Long relatedId) throws IOException{
+ public void downloadFeedbackByRelatedIdPdf(HttpServletResponse httpServletResponse, Long relatedId) throws IOException {
}
@@ -633,8 +618,8 @@ public class PreliminaryServiceImpl implements PreliminaryService {
* 锛堟牴鎹笓瀹秈d锛屾柟妗坧lan_id锛変笅杞藉凡瀹屾垚鐨勫簳绋�
*/
@Override
- public void downloadExpertByPlanIdPdf(HttpServletResponse response, EntrustmentExpertManuscriptCmd entrustmentExpertManuscriptCmd)
- throws IOException {
+ public void downloadExpertByPlanIdPdf(HttpServletResponse response, EntrustmentExpertManuscriptCmd entrustmentExpertManuscriptCmd)
+ throws IOException {
//杩欎釜鏄敓鎴恜df鐨勪綅缃互鍙婂悕绉�
String fileName = "涓撳搴曠ǹ琛�";
@@ -654,7 +639,7 @@ public class PreliminaryServiceImpl implements PreliminaryService {
PdfWriter pdfWriter = PdfWriter.getInstance(document, os);
// 璁剧疆椤甸潰鐩戝惉浜嬩欢锛屽繀椤诲湪open鏂规硶鍓�
pdfWriter.setPageEvent(new PageNumPdfPageEvent());
- // List<String> waterTextList = Collections.singletonList(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+ // List<String> waterTextList = Collections.singletonList(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
//pdfWriter.setPageEvent(new TextWaterMarkPageEvent(waterTextList));
//鎵撳紑鏂囨。
document.open();
@@ -663,61 +648,63 @@ public class PreliminaryServiceImpl implements PreliminaryService {
//浣跨敤瀛椾綋锛屾钀藉瓧浣�
Font listFont = new Font(PdfUtils.baseFont, 16);
//浣跨敤瀛椾綋锛屾鏂囧瓧浣�
- Font contentFont = new Font(PdfUtils.contentBaseFont, 14);
+ Font contentFont = new Font(PdfUtils.contentBaseFont, 12);
+
+
QueryWrapper<EntrustmentExpertManuscriptPO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ObjectUtils.isNotEmpty(entrustmentExpertManuscriptCmd.getExpertTel()), "expert_tel", entrustmentExpertManuscriptCmd.getExpertTel())
- .eq(ObjectUtils.isNotEmpty(entrustmentExpertManuscriptCmd.getPlanId()), "plan_id", entrustmentExpertManuscriptCmd.getPlanId()) ;
+ .eq(ObjectUtils.isNotEmpty(entrustmentExpertManuscriptCmd.getPlanId()), "plan_id", entrustmentExpertManuscriptCmd.getPlanId());
List<EntrustmentExpertManuscriptOut> entrustmentExpertManuscriptList = MapperUtils.INSTANCE.mapAsList(EntrustmentExpertManuscriptOut.class,
entrustmentExpertManuscriptMapper.selectList(queryWrapper));
if (!ObjectUtils.isEmpty(entrustmentExpertManuscriptList)) {
- int i=1;
- for(EntrustmentExpertManuscriptOut entrustmentExpertManuscriptModel: entrustmentExpertManuscriptList){
+ int i = 1;
+ for (EntrustmentExpertManuscriptOut entrustmentExpertManuscriptModel : entrustmentExpertManuscriptList) {
ProjectTypePO projectTypePO = projectTypeMapper.selectById(entrustmentExpertManuscriptModel.getParentId());
Paragraph p = null;
Phrase ph;
//鍒涘缓绗簩琛�,骞惰缃浜岃涓殑琛ㄦ牸鏁�
- PdfPTable pdfPTable = new PdfPTable(7);
+ PdfPTable pdfPTable = new PdfPTable(8);
pdfPTable.setWidthPercentage(100);
pdfPTable.setTotalWidth(1.0f);
//寰幆灏嗚〃澶存暟鎹坊鍔犲埌绗簩琛岃〃鏍间腑
- pdfPTable.addCell(PdfUtils.pdfTableStyle(projectTypePO.getBudYear()+"骞村競鏁欏鏈儴閲嶅ぇ椤圭洰浜嬪墠缁╂晥璇勪及", listFont, 50, 8, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle(projectTypePO.getBudYear() + "骞村競鏁欏鏈儴閲嶅ぇ椤圭洰浜嬪墠缁╂晥璇勪及", listFont, 50, 8, 1, true, true));
pdfPTable.addCell(PdfUtils.pdfTableStyle("涓撳宸ヤ綔搴曠ǹ", contentFont, 50, 8, 1, true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("涓€绾ч」鐩悕绉帮細", contentFont, 50, 1, 1,true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle(" "+projectTypePO.getProjectName(), contentFont, 50, 7, 1, false, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("涓€绾ч」鐩悕绉帮細", contentFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle(" " + projectTypePO.getProjectName(), contentFont, 50, 7, 1, false, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("鎷熸柊澧為」鐩悕绉帮細", contentFont, 50, 1, 1,true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle(" "+projectTypePO.getProjectTypeName(), contentFont, 50, 7, 1, false, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("鎷熸柊澧為」鐩悕绉帮細", contentFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle(" " + projectTypePO.getProjectTypeName(), contentFont, 50, 7, 1, false, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("璐ｄ换澶勫锛�", contentFont, 50, 1, 1,true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle(" 璐㈠姟澶勩€�"+projectTypePO.getDeptName(), contentFont, 50, 7, 1, false, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("璐ｄ换澶勫锛�", contentFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle(" 璐㈠姟澶勩€�" + projectTypePO.getDeptName(), contentFont, 50, 7, 1, false, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("璇勪及涓撳锛�", contentFont, 50, 1, 1,true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle(" "+entrustmentExpertManuscriptModel.getExpertName(), contentFont, 50, 7, 1, false, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("璇勪及涓撳锛�", contentFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle(" " + entrustmentExpertManuscriptModel.getExpertName(), contentFont, 50, 7, 1, false, true));
pdfPTable.addCell(PdfUtils.pdfTableStyle("璇勪及鍐呭銆佽鐐广€佹潈閲嶅強鎵撳垎", listFont, 50, 8, 1, true, true));
//璁剧疆琛ㄦ牸鐨勫搴�
document.add(pdfPTable);
- PdfPTable dataTable = new PdfPTable(6);
+ PdfPTable dataTable = new PdfPTable(8);
dataTable.setWidthPercentage(100);
dataTable.setTotalWidth(1.0f);
//椤圭洰绔嬮」蹇呰鎬�
dataTable.addCell(PdfUtils.pdfTableStyle("涓€绾ф寚鏍�", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("浜岀骇鎸囨爣", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("璇勪及瑕佺偣", contentFont, 60, 3, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("璇勪及瑕佺偣", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("鏉冮噸", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("璇勪及寰楀垎", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("澶囨敞璇存槑", contentFont, 60, 3, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("澶囨敞璇存槑", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰绔嬮」蹇呰鎬�", contentFont, 60, 1, 4, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("渚濇嵁鍏呭垎鎬�", contentFont, 60, 1, 1, true, true));
@@ -727,7 +714,7 @@ public class PreliminaryServiceImpl implements PreliminaryService {
dataTable.addCell(PdfUtils.pdfTableStyle(entrustmentExpertManuscriptModel.getProjectApprovalRemark(), contentFont, 60, 2, 4, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("闇€姹傝揩鍒囨€�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鍐呭涓庡浗瀹躲€佹湰甯傚畯瑙傛斂绛栥€佽涓氭斂绛栫浉绗︼紝涓庢湰閮ㄩ棬鑱岃兘銆佺浉鍏充笓椤硅鍒掋€佸綋骞撮噸鐐瑰伐浣滅浉绗�", contentFont, 60, 2, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鏈夌‘瀹氱殑鏈嶅姟瀵硅薄鎴栧彈鐩婂璞★紝鐜板疄闇€姹傝揩鍒囷紝娌℃湁鍙浛浠ｆ€�", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("10", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getDemandUrgencyScore()), contentFont, 60, 1, 1, true, true));
@@ -736,11 +723,10 @@ public class PreliminaryServiceImpl implements PreliminaryService {
dataTable.addCell(PdfUtils.pdfTableStyle("10", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getFinancialInvestmentCrrelationScore()), contentFont, 60, 1, 1, true, true));
+ Integer total1 = entrustmentExpertManuscriptModel.getAdequacyBasedScore() + entrustmentExpertManuscriptModel.getDemandUrgencyScore() + entrustmentExpertManuscriptModel.getFinancialInvestmentCrrelationScore();
dataTable.addCell(PdfUtils.pdfTableStyle("灏忚", contentFont, 60, 3, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("30", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 1, 1, true, true));
-
-
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(total1), contentFont, 60, 1, 1, true, true));
//鎶曞叆缁忔祹鎬�
@@ -761,9 +747,13 @@ public class PreliminaryServiceImpl implements PreliminaryService {
dataTable.addCell(PdfUtils.pdfTableStyle("7", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getRiskRepeatedInvestmentScore()), contentFont, 60, 1, 1, true, true));
+
+ Integer total2 = entrustmentExpertManuscriptModel.getDemonstrationInvestmentFundsScore() + entrustmentExpertManuscriptModel.getBudgetingScienceScore() + entrustmentExpertManuscriptModel.getRiskRepeatedInvestmentScore();
+
+
dataTable.addCell(PdfUtils.pdfTableStyle("灏忚", contentFont, 60, 3, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("20", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(total2), contentFont, 60, 1, 1, true, true));
//缁╂晥鐩爣鍚堢悊鎬�
@@ -777,16 +767,18 @@ public class PreliminaryServiceImpl implements PreliminaryService {
dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鐩稿叧鎬�", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣涓庨」鐩璁¤В鍐崇殑闂鍖归厤锛屼笌椤圭洰鍐呭銆侀」鐩粡璐规敮鍑鸿寖鍥村尮閰�", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("7", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getBudgetingScienceScore()), contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getRelatedPerformanceGoalScore()), contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鍙绋嬪害", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鍦ㄤ竴瀹氭湡闄愬唴鍏锋湁杈冨己鐨勫彲瀹炵幇鎬э紝鍏锋湁涓€瀹氱殑鍓嶇灮鎬у拰鎸戞垬鎬�", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("6", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getFeasibilityPerformanceGoalScore()), contentFont, 60, 1, 1, true, true));
+ Integer total3 = entrustmentExpertManuscriptModel.getClearPerformanceGoalScore() + entrustmentExpertManuscriptModel.getRelatedPerformanceGoalScore() + entrustmentExpertManuscriptModel.getFeasibilityPerformanceGoalScore();
+
dataTable.addCell(PdfUtils.pdfTableStyle("灏忚", contentFont, 60, 3, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("20", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(total3), contentFont, 60, 1, 1, true, true));
//瀹炴柦鏂规鍙鎬�
@@ -807,27 +799,31 @@ public class PreliminaryServiceImpl implements PreliminaryService {
dataTable.addCell(PdfUtils.pdfTableStyle("7", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getProjectManagementMechanismScore()), contentFont, 60, 1, 1, true, true));
+ Integer total4 = entrustmentExpertManuscriptModel.getCompletenessPreliminaryPreparationScore() + entrustmentExpertManuscriptModel.getReasonableImplementationPlanScore() + entrustmentExpertManuscriptModel.getProjectManagementMechanismScore();
+
dataTable.addCell(PdfUtils.pdfTableStyle("灏忚", contentFont, 60, 3, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("20", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(total4), contentFont, 60, 1, 1, true, true));
//绛硅祫鍚堣鎬�
- dataTable.addCell(PdfUtils.pdfTableStyle("绛硅祫鍚堣鎬�", contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("璧勯噾鏀寔鍚堢悊鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("娌℃湁涓庡叾瀹冮」鐩殑鏀寔鑼冨洿鍜屽璞″瓨鍦ㄤ氦鍙夐噸鍙狅紱璧勯噾鏀寔鏂瑰紡绉戝鍚堢悊銆�", contentFont, 60, 2, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("绛硅祫鍚堣鎬�", contentFont, 60, 1, 2, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("璧勯噾鏀寔鍚堢悊鎬с€佺璧勯闄╁彲鎺ф€э紙鑻ュ惈闈炶储鏀挎€ц祫閲戯級", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("1.娌℃湁涓庡叾瀹冮」鐩殑鏀寔鑼冨洿鍜屽璞″瓨鍦ㄤ氦鍙夐噸鍙狅紱璧勯噾鏀寔鏂瑰紡绉戝鍚堢悊锛�2.瀵圭璧勯闄╋紙鍚嚜绛圭瓑鍏跺畠娓犻亾鏉ユ簮璧勯噾锛夋湁鍏ㄩ潰鐨勮璇嗭紱閽堝棰勬湡椋庨櫓璁惧畾搴斿鎺柦锛屼笖搴斿鎺柦鍙銆佹湁鏁堛€�", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("10", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getReasonableFinancialSupportScore()), contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(entrustmentExpertManuscriptModel.getFundraisingComplianceRemark(), contentFont, 60, 2, 3, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(entrustmentExpertManuscriptModel.getFundraisingComplianceRemark(), contentFont, 60, 2, 2, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("绛硅祫椋庨櫓鍙帶鎬э紙鑻ュ惈闈炶储鏀挎€ц祫閲戯級", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("瀵圭璧勯闄╋紙鍚嚜绛圭瓑鍏跺畠娓犻亾鏉ユ簮璧勯噾锛夋湁鍏ㄩ潰鐨勮璇嗭紱閽堝棰勬湡椋庨櫓璁惧畾搴斿鎺柦锛屼笖搴斿鎺柦鍙銆佹湁鏁堛€�", contentFont, 60, 2, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("0", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getControllabilityFinancingRisksScore()), contentFont, 60, 1, 1, true, true));
+ Integer total5 = entrustmentExpertManuscriptModel.getReasonableFinancialSupportScore() + entrustmentExpertManuscriptModel.getControllabilityFinancingRisksScore();
dataTable.addCell(PdfUtils.pdfTableStyle("灏忚", contentFont, 60, 3, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("10", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(total5), contentFont, 60, 1, 1, true, true));
+
+ dataTable.addCell(PdfUtils.pdfTableStyle("鍚堣", contentFont, 60, 4, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("100", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(total1 + total2 + total3 + total4 + total5), contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 2, 1, true, true));
//绛硅祫鍚堣鎬�
@@ -837,33 +833,35 @@ public class PreliminaryServiceImpl implements PreliminaryService {
dataTable.addCell(PdfUtils.pdfTableStyle("涓嶄簣鏀寔", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("澶囨敞璇存槑", contentFont, 60, 2, 1, true, true));
- if(entrustmentExpertManuscriptModel.getConclusion().contains("寤鸿浜堜互鏀寔")){
- dataTable.addCell(PdfUtils.pdfTableStyle("鉁�" ,contentFont, 60, 1, 1, true, true));
- }else{
+ if (entrustmentExpertManuscriptModel.getConclusion().contains("1")) {
+ dataTable.addCell(PdfUtils.pdfTableStyle("鈭�", listFont, 60, 1, 1, true, true));
+ } else {
dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 1, 1, true, true));
}
- if(entrustmentExpertManuscriptModel.getConclusion().contains("寤鸿璋冩暣瀹屽杽鍚庝簣浠ユ敮鎸�")){
- dataTable.addCell(PdfUtils.pdfTableStyle("鉁�" ,contentFont, 60, 2, 1, true, true));
- }else{
+ if (entrustmentExpertManuscriptModel.getConclusion().contains("2")) {
+ dataTable.addCell(PdfUtils.pdfTableStyle("鈭�", listFont, 60, 2, 1, true, true));
+ } else {
dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 2, 1, true, true));
}
- if(entrustmentExpertManuscriptModel.getConclusion().contains("涓嶄簣鏀寔")){
- dataTable.addCell(PdfUtils.pdfTableStyle("鉁�" ,contentFont, 60, 2, 1, true, true));
- }else{
+ if (entrustmentExpertManuscriptModel.getConclusion().contains("3")) {
+ dataTable.addCell(PdfUtils.pdfTableStyle("鈭�", listFont, 60, 2, 1, true, true));
+ } else {
dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 2, 1, true, true));
}
dataTable.addCell(PdfUtils.pdfTableStyle(entrustmentExpertManuscriptModel.getConclusionRemark(), contentFont, 60, 2, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("瀛樺湪鐨勯棶棰樺強鐩稿叧寤鸿锛�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(entrustmentExpertManuscriptModel.getProblemsPropose(), contentFont, 60, 7, 1, true, true));
+
dataTable.addCell(PdfUtils.pdfTableStyle("涓撳绛惧瓧锛�", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 3, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("鏃ユ湡锛�"+new SimpleDateFormat("yyyy-MM-dd").format(new Date()), contentFont, 60, 4, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("鏃ユ湡锛�" + new SimpleDateFormat("yyyy-MM-dd").format(new Date()), contentFont, 60, 4, 1, true, true));
document.add(dataTable);
- if(i < entrustmentExpertManuscriptList.size())
- {
+ if (i < entrustmentExpertManuscriptList.size()) {
document.newPage();
}
i++;
@@ -878,8 +876,7 @@ public class PreliminaryServiceImpl implements PreliminaryService {
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
}
@@ -890,8 +887,8 @@ public class PreliminaryServiceImpl implements PreliminaryService {
* 锛堟牴鎹笓瀹秈d锛屾柟妗坮elated_id锛変笅杞藉凡瀹屾垚鐨勫簳绋�
*/
@Override
- public void downloadExpertByRelatedIdPdf(HttpServletResponse response, EntrustmentExpertManuscriptCmd entrustmentExpertManuscriptCmd)
- throws IOException {
+ public void downloadExpertByRelatedIdPdf(HttpServletResponse response, EntrustmentExpertManuscriptCmd entrustmentExpertManuscriptCmd)
+ throws IOException {
//杩欎釜鏄敓鎴恜df鐨勪綅缃互鍙婂悕绉�
String fileName = "涓撳搴曠ǹ琛�";
@@ -920,61 +917,61 @@ public class PreliminaryServiceImpl implements PreliminaryService {
//浣跨敤瀛椾綋锛屾钀藉瓧浣�
Font listFont = new Font(PdfUtils.baseFont, 16);
//浣跨敤瀛椾綋锛屾鏂囧瓧浣�
- Font contentFont = new Font(PdfUtils.contentBaseFont, 14);
+ Font contentFont = new Font(PdfUtils.contentBaseFont, 12);
QueryWrapper<EntrustmentExpertManuscriptPO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ObjectUtils.isNotEmpty(entrustmentExpertManuscriptCmd.getExpertTel()), "expert_tel", entrustmentExpertManuscriptCmd.getExpertTel())
- .eq(ObjectUtils.isNotEmpty(entrustmentExpertManuscriptCmd.getRelatedId()), "related_id", entrustmentExpertManuscriptCmd.getRelatedId()) ;
+ .eq(ObjectUtils.isNotEmpty(entrustmentExpertManuscriptCmd.getRelatedId()), "related_id", entrustmentExpertManuscriptCmd.getRelatedId());
List<EntrustmentExpertManuscriptOut> entrustmentExpertManuscriptList = MapperUtils.INSTANCE.mapAsList(EntrustmentExpertManuscriptOut.class,
entrustmentExpertManuscriptMapper.selectList(queryWrapper));
if (!ObjectUtils.isEmpty(entrustmentExpertManuscriptList)) {
- int i=1;
- for(EntrustmentExpertManuscriptOut entrustmentExpertManuscriptModel: entrustmentExpertManuscriptList){
+ int i = 1;
+ for (EntrustmentExpertManuscriptOut entrustmentExpertManuscriptModel : entrustmentExpertManuscriptList) {
ProjectTypePO projectTypePO = projectTypeMapper.selectById(entrustmentExpertManuscriptModel.getParentId());
Paragraph p = null;
Phrase ph;
//鍒涘缓绗簩琛�,骞惰缃浜岃涓殑琛ㄦ牸鏁�
- PdfPTable pdfPTable = new PdfPTable(7);
+ PdfPTable pdfPTable = new PdfPTable(8);
pdfPTable.setWidthPercentage(100);
pdfPTable.setTotalWidth(1.0f);
//寰幆灏嗚〃澶存暟鎹坊鍔犲埌绗簩琛岃〃鏍间腑
- pdfPTable.addCell(PdfUtils.pdfTableStyle(projectTypePO.getBudYear()+"骞村競鏁欏鏈儴閲嶅ぇ椤圭洰浜嬪墠缁╂晥璇勪及", listFont, 50, 8, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle(projectTypePO.getBudYear() + "骞村競鏁欏鏈儴閲嶅ぇ椤圭洰浜嬪墠缁╂晥璇勪及", listFont, 50, 8, 1, true, true));
pdfPTable.addCell(PdfUtils.pdfTableStyle("涓撳宸ヤ綔搴曠ǹ", contentFont, 50, 8, 1, true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("涓€绾ч」鐩悕绉帮細", contentFont, 50, 1, 1,true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle(" "+projectTypePO.getProjectName(), contentFont, 50, 7, 1, false, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("涓€绾ч」鐩悕绉帮細", contentFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle(" " + projectTypePO.getProjectName(), contentFont, 50, 7, 1, false, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("鎷熸柊澧為」鐩悕绉帮細", contentFont, 50, 1, 1,true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle(" "+projectTypePO.getProjectTypeName(), contentFont, 50, 7, 1, false, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("鎷熸柊澧為」鐩悕绉帮細", contentFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle(" " + projectTypePO.getProjectTypeName(), contentFont, 50, 7, 1, false, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("璐ｄ换澶勫锛�", contentFont, 50, 1, 1,true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle(" 璐㈠姟澶勩€�"+projectTypePO.getDeptName(), contentFont, 50, 7, 1, false, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("璐ｄ换澶勫锛�", contentFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle(" 璐㈠姟澶勩€�" + projectTypePO.getDeptName(), contentFont, 50, 7, 1, false, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle("璇勪及涓撳锛�", contentFont, 50, 1, 1,true, true));
- pdfPTable.addCell(PdfUtils.pdfTableStyle(" "+entrustmentExpertManuscriptModel.getExpertName(), contentFont, 50, 7, 1, false, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle("璇勪及涓撳锛�", contentFont, 50, 1, 1, true, true));
+ pdfPTable.addCell(PdfUtils.pdfTableStyle(" " + entrustmentExpertManuscriptModel.getExpertName(), contentFont, 50, 7, 1, false, true));
pdfPTable.addCell(PdfUtils.pdfTableStyle("璇勪及鍐呭銆佽鐐广€佹潈閲嶅強鎵撳垎", listFont, 50, 8, 1, true, true));
//璁剧疆琛ㄦ牸鐨勫搴�
document.add(pdfPTable);
- PdfPTable dataTable = new PdfPTable(6);
+ PdfPTable dataTable = new PdfPTable(8);
dataTable.setWidthPercentage(100);
dataTable.setTotalWidth(1.0f);
//椤圭洰绔嬮」蹇呰鎬�
dataTable.addCell(PdfUtils.pdfTableStyle("涓€绾ф寚鏍�", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("浜岀骇鎸囨爣", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("璇勪及瑕佺偣", contentFont, 60, 3, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("璇勪及瑕佺偣", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("鏉冮噸", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("璇勪及寰楀垎", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("澶囨敞璇存槑", contentFont, 60, 3, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("澶囨敞璇存槑", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰绔嬮」蹇呰鎬�", contentFont, 60, 1, 4, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("渚濇嵁鍏呭垎鎬�", contentFont, 60, 1, 1, true, true));
@@ -984,7 +981,7 @@ public class PreliminaryServiceImpl implements PreliminaryService {
dataTable.addCell(PdfUtils.pdfTableStyle(entrustmentExpertManuscriptModel.getProjectApprovalRemark(), contentFont, 60, 2, 4, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("闇€姹傝揩鍒囨€�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鍐呭涓庡浗瀹躲€佹湰甯傚畯瑙傛斂绛栥€佽涓氭斂绛栫浉绗︼紝涓庢湰閮ㄩ棬鑱岃兘銆佺浉鍏充笓椤硅鍒掋€佸綋骞撮噸鐐瑰伐浣滅浉绗�", contentFont, 60, 2, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("椤圭洰鏈夌‘瀹氱殑鏈嶅姟瀵硅薄鎴栧彈鐩婂璞★紝鐜板疄闇€姹傝揩鍒囷紝娌℃湁鍙浛浠ｆ€�", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("10", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getDemandUrgencyScore()), contentFont, 60, 1, 1, true, true));
@@ -993,11 +990,10 @@ public class PreliminaryServiceImpl implements PreliminaryService {
dataTable.addCell(PdfUtils.pdfTableStyle("10", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getFinancialInvestmentCrrelationScore()), contentFont, 60, 1, 1, true, true));
+ Integer total1 = entrustmentExpertManuscriptModel.getAdequacyBasedScore() + entrustmentExpertManuscriptModel.getDemandUrgencyScore() + entrustmentExpertManuscriptModel.getFinancialInvestmentCrrelationScore();
dataTable.addCell(PdfUtils.pdfTableStyle("灏忚", contentFont, 60, 3, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("30", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 1, 1, true, true));
-
-
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(total1), contentFont, 60, 1, 1, true, true));
//鎶曞叆缁忔祹鎬�
@@ -1018,9 +1014,13 @@ public class PreliminaryServiceImpl implements PreliminaryService {
dataTable.addCell(PdfUtils.pdfTableStyle("7", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getRiskRepeatedInvestmentScore()), contentFont, 60, 1, 1, true, true));
+
+ Integer total2 = entrustmentExpertManuscriptModel.getDemonstrationInvestmentFundsScore() + entrustmentExpertManuscriptModel.getBudgetingScienceScore() + entrustmentExpertManuscriptModel.getRiskRepeatedInvestmentScore();
+
+
dataTable.addCell(PdfUtils.pdfTableStyle("灏忚", contentFont, 60, 3, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("20", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(total2), contentFont, 60, 1, 1, true, true));
//缁╂晥鐩爣鍚堢悊鎬�
@@ -1034,16 +1034,18 @@ public class PreliminaryServiceImpl implements PreliminaryService {
dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鐩稿叧鎬�", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣涓庨」鐩璁¤В鍐崇殑闂鍖归厤锛屼笌椤圭洰鍐呭銆侀」鐩粡璐规敮鍑鸿寖鍥村尮閰�", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("7", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getBudgetingScienceScore()), contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getRelatedPerformanceGoalScore()), contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鍙绋嬪害", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("缁╂晥鐩爣鍦ㄤ竴瀹氭湡闄愬唴鍏锋湁杈冨己鐨勫彲瀹炵幇鎬э紝鍏锋湁涓€瀹氱殑鍓嶇灮鎬у拰鎸戞垬鎬�", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("6", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getFeasibilityPerformanceGoalScore()), contentFont, 60, 1, 1, true, true));
+ Integer total3 = entrustmentExpertManuscriptModel.getClearPerformanceGoalScore() + entrustmentExpertManuscriptModel.getRelatedPerformanceGoalScore() + entrustmentExpertManuscriptModel.getFeasibilityPerformanceGoalScore();
+
dataTable.addCell(PdfUtils.pdfTableStyle("灏忚", contentFont, 60, 3, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("20", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(total3), contentFont, 60, 1, 1, true, true));
//瀹炴柦鏂规鍙鎬�
@@ -1064,28 +1066,31 @@ public class PreliminaryServiceImpl implements PreliminaryService {
dataTable.addCell(PdfUtils.pdfTableStyle("7", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getProjectManagementMechanismScore()), contentFont, 60, 1, 1, true, true));
+ Integer total4 = entrustmentExpertManuscriptModel.getCompletenessPreliminaryPreparationScore() + entrustmentExpertManuscriptModel.getReasonableImplementationPlanScore() + entrustmentExpertManuscriptModel.getProjectManagementMechanismScore();
+
dataTable.addCell(PdfUtils.pdfTableStyle("灏忚", contentFont, 60, 3, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("20", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(total4), contentFont, 60, 1, 1, true, true));
//绛硅祫鍚堣鎬�
- dataTable.addCell(PdfUtils.pdfTableStyle("绛硅祫鍚堣鎬�", contentFont, 60, 1, 3, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("璧勯噾鏀寔鍚堢悊鎬�", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("娌℃湁涓庡叾瀹冮」鐩殑鏀寔鑼冨洿鍜屽璞″瓨鍦ㄤ氦鍙夐噸鍙狅紱璧勯噾鏀寔鏂瑰紡绉戝鍚堢悊銆�", contentFont, 60, 2, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("绛硅祫鍚堣鎬�", contentFont, 60, 1, 2, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("璧勯噾鏀寔鍚堢悊鎬с€佺璧勯闄╁彲鎺ф€э紙鑻ュ惈闈炶储鏀挎€ц祫閲戯級", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("1.娌℃湁涓庡叾瀹冮」鐩殑鏀寔鑼冨洿鍜屽璞″瓨鍦ㄤ氦鍙夐噸鍙狅紱璧勯噾鏀寔鏂瑰紡绉戝鍚堢悊锛�2.瀵圭璧勯闄╋紙鍚嚜绛圭瓑鍏跺畠娓犻亾鏉ユ簮璧勯噾锛夋湁鍏ㄩ潰鐨勮璇嗭紱閽堝棰勬湡椋庨櫓璁惧畾搴斿鎺柦锛屼笖搴斿鎺柦鍙銆佹湁鏁堛€�", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("10", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getReasonableFinancialSupportScore()), contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(entrustmentExpertManuscriptModel.getFundraisingComplianceRemark(), contentFont, 60, 2, 3, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(entrustmentExpertManuscriptModel.getFundraisingComplianceRemark(), contentFont, 60, 2, 2, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("绛硅祫椋庨櫓鍙帶鎬э紙鑻ュ惈闈炶储鏀挎€ц祫閲戯級", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("瀵圭璧勯闄╋紙鍚嚜绛圭瓑鍏跺畠娓犻亾鏉ユ簮璧勯噾锛夋湁鍏ㄩ潰鐨勮璇嗭紱閽堝棰勬湡椋庨櫓璁惧畾搴斿鎺柦锛屼笖搴斿鎺柦鍙銆佹湁鏁堛€�", contentFont, 60, 2, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("0", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(entrustmentExpertManuscriptModel.getControllabilityFinancingRisksScore()), contentFont, 60, 1, 1, true, true));
+ Integer total5 = entrustmentExpertManuscriptModel.getReasonableFinancialSupportScore() + entrustmentExpertManuscriptModel.getControllabilityFinancingRisksScore();
dataTable.addCell(PdfUtils.pdfTableStyle("灏忚", contentFont, 60, 3, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("10", contentFont, 60, 1, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(total5), contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("鍚堣", contentFont, 60, 4, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("100", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(String.valueOf(total1 + total2 + total3 + total4 + total5), contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 2, 1, true, true));
//绛硅祫鍚堣鎬�
dataTable.addCell(PdfUtils.pdfTableStyle("璇勪及缁撹锛堣鍕鹃€夛級", contentFont, 60, 1, 2, true, true));
@@ -1094,39 +1099,40 @@ public class PreliminaryServiceImpl implements PreliminaryService {
dataTable.addCell(PdfUtils.pdfTableStyle("涓嶄簣鏀寔", contentFont, 60, 2, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("澶囨敞璇存槑", contentFont, 60, 2, 1, true, true));
- if(entrustmentExpertManuscriptModel.getConclusion().contains("寤鸿浜堜互鏀寔")){
- dataTable.addCell(PdfUtils.pdfTableStyle("鉁�" ,contentFont, 60, 1, 1, true, true));
- }else{
+ if (entrustmentExpertManuscriptModel.getConclusion().contains("1")) {
+ dataTable.addCell(PdfUtils.pdfTableStyle("鈭�", listFont, 60, 1, 1, true, true));
+ } else {
dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 1, 1, true, true));
}
- if(entrustmentExpertManuscriptModel.getConclusion().contains("寤鸿璋冩暣瀹屽杽鍚庝簣浠ユ敮鎸�")){
- dataTable.addCell(PdfUtils.pdfTableStyle("鉁�" ,contentFont, 60, 2, 1, true, true));
- }else{
+ if (entrustmentExpertManuscriptModel.getConclusion().contains("2")) {
+ dataTable.addCell(PdfUtils.pdfTableStyle("鈭�", listFont, 60, 2, 1, true, true));
+ } else {
dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 2, 1, true, true));
}
- if(entrustmentExpertManuscriptModel.getConclusion().contains("涓嶄簣鏀寔")){
- dataTable.addCell(PdfUtils.pdfTableStyle("鉁�" ,contentFont, 60, 2, 1, true, true));
- }else{
+ if (entrustmentExpertManuscriptModel.getConclusion().contains("3")) {
+ dataTable.addCell(PdfUtils.pdfTableStyle("鈭�", listFont, 60, 2, 1, true, true));
+ } else {
dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 2, 1, true, true));
}
dataTable.addCell(PdfUtils.pdfTableStyle(entrustmentExpertManuscriptModel.getConclusionRemark(), contentFont, 60, 2, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("瀛樺湪鐨勯棶棰樺強鐩稿叧寤鸿锛�", contentFont, 60, 1, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle(entrustmentExpertManuscriptModel.getProblemsPropose(), contentFont, 60, 7, 1, true, true));
+
+
dataTable.addCell(PdfUtils.pdfTableStyle("涓撳绛惧瓧锛�", contentFont, 60, 1, 1, true, true));
dataTable.addCell(PdfUtils.pdfTableStyle("", contentFont, 60, 3, 1, true, true));
- dataTable.addCell(PdfUtils.pdfTableStyle("鏃ユ湡锛�"+new SimpleDateFormat("yyyy-MM-dd").format(new Date()), contentFont, 60, 4, 1, true, true));
+ dataTable.addCell(PdfUtils.pdfTableStyle("鏃ユ湡锛�" + new SimpleDateFormat("yyyy-MM-dd").format(new Date()), contentFont, 60, 4, 1, true, true));
document.add(dataTable);
- if(i < entrustmentExpertManuscriptList.size())
- {
+ if (i < entrustmentExpertManuscriptList.size()) {
document.newPage();
}
i++;
}
-
-
document.close();
pdfWriter.close();
os.close();
@@ -1135,42 +1141,47 @@ public class PreliminaryServiceImpl implements PreliminaryService {
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
}
}
+
/**
* 锛堟牴鎹鎵樺嚱id锛変笅杞藉簳绋挎牱渚�
*/
@Override
- public void downloadManuscriptEntrustmentIdPdf(HttpServletResponse httpServletResponse, Long entrustmentId) throws IOException{
+ public void downloadManuscriptEntrustmentIdPdf(HttpServletResponse httpServletResponse, Long entrustmentId) throws IOException {
}
+
/**
* 锛堟牴鎹柟妗坕d锛変笅杞藉簳绋挎牱渚�
*/
@Override
- public void downloadManuscriptRelatedIdPdf(HttpServletResponse httpServletResponse, Long relatedId) throws IOException{
+ public void downloadManuscriptRelatedIdPdf(HttpServletResponse httpServletResponse, Long relatedId) throws IOException {
+
}
+
/**
* 锛堟牴鎹鎵樺嚱id锛変笅杞藉甫绛惧悕搴曠ǹ鏍蜂緥
*/
@Override
- public void downloadManuscriptSignEntrustmentIdPdf(HttpServletResponse httpServletResponse, Long entrustmentId) throws IOException{
+ public void downloadManuscriptSignEntrustmentIdPdf(HttpServletResponse httpServletResponse, Long entrustmentId) throws IOException {
}
+
/**
* 锛堟牴鎹柟妗坕d锛変笅杞藉甫绛惧悕搴曠ǹ鏍蜂緥
*/
@Override
- public void downloadManuscripSigntRelatedIdPdf(HttpServletResponse httpServletResponse, Long relatedId) throws IOException{
+ public void downloadManuscripSigntRelatedIdPdf(HttpServletResponse httpServletResponse, Long relatedId) throws IOException {
}
@Override
- public void downloadPreliminaryEntrustmentIdPdf(HttpServletResponse httpServletResponse, Long entrustmentId) throws IOException{
+ public void downloadPreliminaryEntrustmentIdPdf(HttpServletResponse httpServletResponse, Long entrustmentId) throws IOException {
}
+
}
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/service/ProjectServiceImpl.java b/ServiceSite/src/main/java/com/seasky/budget/business/service/ProjectServiceImpl.java
index 86a3bfda2499fa3402f7de4feccbcbecde99694a..4ed5d457e752eecfacb1e927b5846e60604ff2ac 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/business/service/ProjectServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/service/ProjectServiceImpl.java
@@ -364,7 +364,7 @@ public class ProjectServiceImpl implements ProjectService {
.like(ObjectUtils.isNotEmpty(projectTypeQuery.getDeptName()), "dept_name", projectTypeQuery.getDeptName())
.eq(ObjectUtils.isNotEmpty(projectTypeQuery.getProjectState()), "state_code", projectTypeQuery.getProjectState())
.like(ObjectUtils.isNotEmpty(projectTypeQuery.getProjectName()), "project_name", projectTypeQuery.getProjectName())
- .orderByDesc("project_number", "serial_number");
+ .orderByDesc("update_date");
Page page = new Page<>(projectTypeQuery.getPageIndex(), projectTypeQuery.getPageSize());
Page projectPage = projectTypeMapper.selectPage(page, queryWrapper);
if (ObjectUtils.isEmpty(projectPage.getRecords())) {
diff --git a/ServiceSite/src/main/java/com/seasky/budget/utils/PdfUtils.java b/ServiceSite/src/main/java/com/seasky/budget/utils/PdfUtils.java
index 3d6a8cc4509bdc5a33b2bfc783e5b94b57a9a0eb..fc676bd7434773f9db80d59fac6c864297c1e46b 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/utils/PdfUtils.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/utils/PdfUtils.java
@@ -29,6 +29,7 @@ public class PdfUtils {
try {
baseFont = BaseFont.createFont("/ROOT/simhei.ttf", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
contentBaseFont = BaseFont.createFont("/ROOT/simfang.ttf", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);
+
} catch (DocumentException | IOException e) {
throw new RuntimeException(e);
}
diff --git a/WebSite/src/api/review-management-operation.js b/WebSite/src/api/review-management-operation.js
index c4dd1e340a3d0de274a5d60d1df326b50f3955a6..17756e000ad8fbaeaa7cce998c3774bbd0c8db6a 100644
--- a/WebSite/src/api/review-management-operation.js
+++ b/WebSite/src/api/review-management-operation.js
@@ -54,7 +54,7 @@ class operation extends Base {
static getRelatedList() {
return request.post('/planReview/getRelatedList');
}
-
+//涓嬭浇鍏叡鏂规閲岄潰涓撳搴曠ǹ
static downloadExpertPdf(data) {
return request({
url: `/preliminary/downloadExpertByRelatedIdPdf`,
@@ -64,6 +64,16 @@ class operation extends Base {
})
.then(res => super.downloadFile(res));
}
+//涓嬭浇濮旀墭鍑介噷闈㈢殑涓撳搴曠ǹ
+ static downloadExpertPlanPdf(data) {
+ return request({
+ url: `/preliminary/downloadExpertByPlanIdPdf`,
+ responseType: 'blob',
+ method: 'post',
+ data
+ })
+ .then(res => super.downloadFile(res));
+ }
//瀛愰」鐩煡鐪�
static getProjectListByEntrustmentId(data) {
return request.post('/entrustment/getProjectListByEntrustmentId', data);
diff --git a/WebSite/src/assets/onView.jpg b/WebSite/src/assets/onView.jpg
index 4d5349721f2cdbfedf261de2df36d39a69eaa3e2..c9780cf43daa3f7a0b8a5d41e8f2fdcb48618985 100644
Binary files a/WebSite/src/assets/onView.jpg and b/WebSite/src/assets/onView.jpg differ
diff --git a/WebSite/src/views/item-entry/antecedent-trial/index.vue b/WebSite/src/views/item-entry/antecedent-trial/index.vue
index 6a07378bf1e6198690b6b02d466f9ee42a49de5e..2ea8c458d44895c13ff77114616384a155cf2821 100644
--- a/WebSite/src/views/item-entry/antecedent-trial/index.vue
+++ b/WebSite/src/views/item-entry/antecedent-trial/index.vue
@@ -29,7 +29,7 @@
</div>
<div class="card-content-item">
<span> 椤圭洰璁″垝鍚姩鏃堕棿锛� </span>
- <span>{{ ProjectInfo.projectStartDate }}</span>
+ <span>{{ ProjectInfo.projectStartDate.slice(0, 10) }}</span>
</div>
<div class="card-content-item">
diff --git a/WebSite/src/views/item-entry/manuscript/index.vue b/WebSite/src/views/item-entry/manuscript/index.vue
index 459af605173a42074cac1c717789073ab960a8bd..cb538370ab099b417cbf19e933bd828abe9e6c6a 100644
--- a/WebSite/src/views/item-entry/manuscript/index.vue
+++ b/WebSite/src/views/item-entry/manuscript/index.vue
@@ -7,9 +7,11 @@
plain
icon="back"
size="small"
+ v-if="isbackshow"
@click="goBack"
>杩斿洖</el-button
>
+
<el-button
style="margin-bottom: 18px;"
plain
@@ -39,7 +41,7 @@
<span>
椤圭洰璁″垝鍚姩鏃堕棿锛�
</span>
- <span>{{ ProjectInfo.projectStartDate }}</span>
+ <span>{{ ProjectInfo.projectStartDate.slice(0, 10) }}</span>
</div>
<div class="card-content-item">
@@ -109,7 +111,12 @@
鍏€侀檮浠讹細
</span>
<div style="width: 100%;font-size: 14px;">
- <div v-for="(item, index) in arr1" :key="index">{{ item }}</div>
+ <div v-for="(item, index) in arr1" :key="index">
+ <a @click="clickA(item)" href="javascript:void(0);">{{
+ item.fileName
+ }}</a>
+
+ </div>
</div>
</div>
<div class="card-content-item">
@@ -117,7 +124,11 @@
涓冦€佹壙璇哄強瀹℃牳淇℃伅锛�
</span>
<div style="width: 100%;font-size: 14px;">
- <div v-for="(item, index) in arr2" :key="index">{{ item }}</div>
+ <div v-for="(item, index) in arr2" :key="index">
+ <a @click="clickA(item)" href="javascript:void(0);">{{
+ item.fileName
+ }}</a>
+ </div>
</div>
</div>
@@ -423,10 +434,10 @@
<td></td>
</tr>
<tr>
- <td rowspan="3">绛硅祫鍚堣鎬�</td>
- <td>璧勯噾鏀寔鍚堢悊鎬�</td>
+ <td rowspan="2">绛硅祫鍚堣鎬�</td>
+ <td>璧勯噾鏀寔鍚堢悊鎬с€佺璧勯闄╁彲鎺ф€э紙鑻ュ惈闈炶储鏀挎€ц祫閲戯級</td>
<td>
- 娌℃湁涓庡叾瀹冮」鐩殑鏀寔鑼冨洿鍜屽璞″瓨鍦ㄤ氦鍙夐噸鍙狅紱璧勯噾鏀寔鏂瑰紡绉戝鍚堢悊銆�
+ 1.娌℃湁涓庡叾瀹冮」鐩殑鏀寔鑼冨洿鍜屽璞″瓨鍦ㄤ氦鍙夐噸鍙狅紱璧勯噾鏀寔鏂瑰紡绉戝鍚堢悊;2.瀵圭璧勯闄╋紙鍚嚜绛圭瓑鍏跺畠娓犻亾鏉ユ簮璧勯噾锛夋湁鍏ㄩ潰鐨勮璇嗭紱閽堝棰勬湡椋庨櫓璁惧畾搴斿鎺柦锛屼笖搴斿鎺柦鍙銆佹湁鏁堛€�
</td>
<td>10</td>
<td>
@@ -452,35 +463,7 @@
</el-form-item>
</td>
</tr>
- <tr>
- <td>绛硅祫椋庨櫓鍙帶鎬э紙鑻ュ惈闈炶储鏀挎€ц祫閲戯級</td>
- <td>
- 瀵圭璧勯闄╋紙鍚嚜绛圭瓑鍏跺畠娓犻亾鏉ユ簮璧勯噾锛夋湁鍏ㄩ潰鐨勮璇嗭紱閽堝棰勬湡椋庨櫓璁惧畾搴斿鎺柦锛屼笖搴斿鎺柦鍙銆佹湁鏁堛€�
- </td>
- <td>0</td>
- <td>
- <el-form-item prop="controllabilityFinancingRisksScore">
- <el-input
- @change="
- nubChange(14, tableArr.controllabilityFinancingRisksScore)
- "
- v-model="tableArr.controllabilityFinancingRisksScore"
- placeholder="璇峰～鍐欏垎鏁�"
- oninput="value=value.replace(/[^\d]/g, '') "
- />
- </el-form-item>
- </td>
- <td>
- <el-form-item prop="controllabilityFinancingRisksRemark">
- <el-input
- v-model="tableArr.controllabilityFinancingRisksRemark"
- :rows="2"
- type="textarea"
- placeholder="璇峰～鍐�"
- />
- </el-form-item>
- </td>
- </tr>
+
<tr>
<td colspan="2">灏忚</td>
@@ -560,6 +543,7 @@ import { useRouter } from 'vue-router';
import operation from '@/api/review-management-operation';
import { ElMessage } from 'element-plus';
import Account from '@/api/Account';
+import FinanceOffice from '@/api/financeOffice';
use([]);
export default {
name: 'manuscript',
@@ -592,7 +576,7 @@ export default {
]
},
-
+ isbackshow:true,
radioValue: '',
writeDialog: false,
ProjectInfo: {
@@ -664,6 +648,10 @@ export default {
relatedId: '',
planId: '',
});
+ const clickA = async (item) => {
+ const res = await FinanceOffice.downloadAttachFileById(item.id);
+ console.log(res);
+ };
const total1 = computed(() => {
return (
Number(data.tableArr.adequacyBasedScore) +
@@ -708,8 +696,10 @@ export default {
router.currentRoute.value.query.token != '' &&
router.currentRoute.value.query.token
) {
- await Account.login(router.currentRoute.value.query.token, '');
+ data.isbackshow=!data.isbackshow;
+ await Account.login(router.currentRoute.value.query.token, '');
}
+
console.log(router.currentRoute.value.query);
data.relatedId = router.currentRoute.value.query.relatedId;
data.entrustmentId = router.currentRoute.value.query.entrustmentId;
@@ -766,16 +756,19 @@ export default {
const getProjectInfo = () => {
operation.getProjectInfo({ id: data.idS }).then(res => {
data.ProjectInfo = res.data[0];
- data.arr1 = data.ProjectInfo.fileOuts.map(item => {
- if (item.type == 1) {
- return item.fileName;
+ for (let i = 0; i < data.ProjectInfo.fileOuts.length; i++) {
+ if (data.ProjectInfo.fileOuts[i].type == 1) {
+ data.arr1 = [data.ProjectInfo.fileOuts[i]];
+ break;
}
- });
- data.arr2 = data.ProjectInfo.fileOuts.map(item => {
- if (item.type == 2) {
- return item.fileName;
+ }
+ for (let i = 0; i < data.ProjectInfo.fileOuts.length; i++) {
+ if (data.ProjectInfo.fileOuts[i].type == 2) {
+ data.arr2 = [data.ProjectInfo.fileOuts[i]];
+ break;
}
- });
+ }
+
});
};
const onPrint = () => {};
@@ -875,6 +868,7 @@ export default {
};
return {
+ clickA,
getEntrustmentExpertManuscript,
saveExpertManuscript,
getRelatedExpertManuscript,
diff --git a/WebSite/src/views/item-entry/pre-declaration-operation/index.vue b/WebSite/src/views/item-entry/pre-declaration-operation/index.vue
index 73a51a841558d1833bdc1000f8560be4d43d7594..817dc8f7bcd054822146fbc56fe4078362ca1b9b 100644
--- a/WebSite/src/views/item-entry/pre-declaration-operation/index.vue
+++ b/WebSite/src/views/item-entry/pre-declaration-operation/index.vue
@@ -46,6 +46,7 @@
type="primary"
icon="Edit"
size="small"
+ v-if="isshiwusuoshow"
@click="onDistributionOffice"
>鍒嗛厤浜嬪姟鎵€</el-button
>
@@ -140,7 +141,7 @@
>鍙楃悊</el-button
>
<el-button
- v-if="scope.row.entrustmentState == 5"
+ v-if="scope.row.entrustmentState == 5 && isshiwusuoshow "
plain
icon="monitor"
type="primary"
@@ -168,10 +169,9 @@
>
<el-button
v-if="
- scope.row.entrustmentState == 4 ||
+ (scope.row.entrustmentState == 4 ||
scope.row.entrustmentState == 5 ||
- scope.row.entrustmentState == 6
- "
+ scope.row.entrustmentState == 6)&& isshiwusuoshow "
plain
type="danger"
size="small"
@@ -464,7 +464,7 @@
plain
type="primary"
icon="Plus"
- size="small"
+ size="small" v-if="isshiwusuoshow"
@click="addExpert"
>娣诲姞涓撳</el-button
>
@@ -608,6 +608,7 @@
type="primary"
icon="Monitor"
size="small"
+ v-if="isshiwusuoshow"
@click="showDialog"
>鏂板鏂规</el-button
>
@@ -650,7 +651,7 @@
plain
type="primary"
icon="edit"
- size="small"
+ size="small"
@click="editSolutionTable(scoped.row)"
>缂栬緫</el-button
>
@@ -659,7 +660,7 @@
type="danger"
size="small"
icon="Delete"
- v-if="scoped.row.relatedId == null"
+ v-if="scoped.row.relatedId == null&& isshiwusuoshow "
@click="removePlanId(scoped.row)"
>鍒犻櫎</el-button
>
@@ -694,11 +695,11 @@
></el-option>
</el-select>
</el-form-item>
- <el-form-item>
+ <!--el-form-item>
<el-button plain type="primary" icon="download" size="small"
>涓嬭浇涓撳鎵嬬ǹ鏍蜂緥</el-button
>
- </el-form-item>
+ </el-form-item-->
</el-form>
</div>
</el-card>
@@ -739,11 +740,11 @@
type="primary"
size="small"
@click="FillPaper(props.row, sco.row)"
- >濉啓搴曠ǹ1111</el-button
+ >濉啓搴曠ǹ</el-button
>
- <el-button plain type="primary" size="small"
+ <!--el-button plain type="primary" size="small"
>涓嬭浇搴曠ǹ</el-button
- >
+ -->
</template>
</el-table-column>
</el-table>
@@ -791,6 +792,7 @@
width="400"
><template #default="scoped">
<el-button plain type="primary" icon="download" size="small"
+ @click="downloadExpertPdf(scoped.row)"
>涓嬭浇宸插畬鎴愬簳绋�</el-button
>
<el-upload
@@ -836,11 +838,11 @@
>娣诲姞鍙嶉鎰忚</el-button
>
</el-form-item>
- <el-form-item>
+ <!--el-form-item>
<el-button plain type="primary" icon="Download" size="small"
>鎵归噺涓嬭浇鍙嶉鎰忚</el-button
>
- </el-form-item>
+ </el-form-item-->
<el-form-item>
<el-button
plain
@@ -851,7 +853,7 @@
>鎵归噺鍙嶉</el-button
>
</el-form-item>
- <el-form-item>
+ <!--el-form-item>
<el-upload
:file-list="fileList"
class="upload-demo"
@@ -876,7 +878,7 @@
@click="buttonUp"
>涓嬭浇璇勫鎶ュ憡</el-button
>
- </el-form-item>
+ </el-form-item-->
</el-form>
<el-table
:data="reportTableInfo.tableInfo"
@@ -887,8 +889,7 @@
@selection-change="BatchFeedbackChange"
header-cell-class-name="headStyle"
>
- <el-table-column type="selection"> </el-table-column>
- <!-- <el-table-column type="index" width="50"> {{ (page - 1) * pageSize + scope.$index + 1 }}</el-table-column> -->
+ <el-table-column type="selection" > </el-table-column>
<el-table-column
label="搴忓彿"
type="index"
@@ -918,6 +919,19 @@
label="璇勫缁撹"
align="center"
></el-table-column>
+ <el-table-column
+ class="positionStyle"
+ prop="feedbackStatus"
+
+ label="鏄惁宸插弽棣堝埌璐ｄ换澶勫"
+ align="center"
+ >
+ <template #default="scoped">
+ <div>
+ {{ scoped.row.feedbackStatus=="1"?"宸插弽棣�":"鏈弽棣�" }}
+ </div>
+ </template>
+ </el-table-column>
<el-table-column class="positionStyle" label="鎿嶄綔" align="center"
><template #default="scope">
<el-button
@@ -992,7 +1006,7 @@
</el-form-item>
</el-form>
<el-form :inline="true" class="demo-form-inline">
- <el-form-item>
+ <!--el-form-item>
<el-upload
action="#"
:multiple="false"
@@ -1004,22 +1018,20 @@
>涓婁紶word鍚堣搴曠ǹ</el-button
>
</el-upload>
- </el-form-item>
+ </el-form-item-->
<el-form-item>
- <el-button plain type="primary" icon="Download" size="small"
+ <!--el-button plain type="primary" icon="Download" size="small"
>涓嬭浇鍚堣搴曠ǹ</el-button
>
<el-button plain type="primary" icon="Download" size="small"
- >涓撳搴曠ǹ涓€閿笅杞�</el-button
- >
+ >涓撳搴曠ǹ涓€閿笅杞�</el-button -->
<el-button
plain
type="primary"
icon="Download"
size="small"
@click="downloadServiceFeePdf"
- >鍔冲姟璐瑰彂鏀炬竻鍗�</el-button
- >
+ >鍔冲姟璐瑰彂鏀炬竻鍗�</el-button >
</el-form-item>
</el-form>
<el-table
@@ -2141,6 +2153,7 @@ import Financial from '@/api/financial-resources-center';
import { ElMessage } from 'element-plus';
import Moment from 'moment';
import trustLetterManagementFinance from '@/api/trust-letter-management-finance';
+import { useStore } from 'vuex';
use([]);
export default {
name: 'PreDeclarationOperation',
@@ -2148,7 +2161,9 @@ export default {
components: {},
setup() {
const router = useRouter();
+ const store = useStore();
const data = reactive({
+ isshiwusuoshow:true,
onNews: false,
disabled1: false,
disabled: false,
@@ -2321,6 +2336,16 @@ export default {
tableIds: [],
entrustmentState: ''
});
+ //涓嬭浇涓撳搴曠ǹ
+
+ const downloadExpertPdf =async (row)=> {
+ operation.downloadExpertPlanPdf( {
+ expertTel:row.expertTel,
+ planId:row.planId
+ });
+
+ };
+
//鏍规嵁id鍒犻櫎鏂规
const removePlanId= row => {
Financial
@@ -2439,6 +2464,7 @@ export default {
});
Moment,
onMounted(() => {
+ data.isshiwusuoshow = store.state.subject.user.roleName!=="浜嬪姟鎵€";
getEnstrustmentStateEnumList();
getClaimEnutrustmentList();
});
@@ -2661,7 +2687,7 @@ export default {
ElMessage.success('鍙嶉鎴愬姛');
data.onAcceptDialog = false;
getClaimEnutrustmentList();
- });
+ });
}
};
//鏌ョ湅鍙楃悊璁板綍
@@ -3321,7 +3347,7 @@ export default {
}
};
return {
-
+ downloadExpertPdf,
removePlanId,
IdChange,
getBackProjectListByEntrustmentId,
diff --git a/WebSite/src/views/item-entry/review-scheme-view/index.vue b/WebSite/src/views/item-entry/review-scheme-view/index.vue
index f8ff60d8d488459f58dbda27da44d670d33d8dea..67e5053fbb822986edc0e6ebdb0e1ada1df84bbb 100644
--- a/WebSite/src/views/item-entry/review-scheme-view/index.vue
+++ b/WebSite/src/views/item-entry/review-scheme-view/index.vue
@@ -16,12 +16,13 @@
plain
type="primary"
icon="plus"
- size="small"
+ size="small"
+ v-if="isshow"
@click="onAddAnExpert"
>娣诲姞涓撳</el-button
>
</el-form-item>
- <el-form-item>
+ <!--el-form-item>
<el-button
plain
type="primary"
@@ -40,7 +41,7 @@
@click="onElectronicSeal"
>鐢靛瓙绛剧珷</el-button
>
- </el-form-item>
+ </el-form-item-->
</el-form>
</el-card>
<el-card class="box-card" style="margin-top: 20px">
@@ -388,7 +389,7 @@
</el-card>
</el-tab-pane>
<el-tab-pane label="涓撳搴曠ǹ" name="3" v-if="state"
- ><el-card
+ ><!--el-card
shadow="never"
style="margin-bottom: 20px"
class="charts-card"
@@ -402,7 +403,7 @@
</el-form-item>
</el-form>
</div>
- </el-card>
+ </el-card-->
<el-table
:data="expertsWriteTableInfo.tableInfo"
highlight-current-row
@@ -442,9 +443,8 @@
@click="FillPaper(props.row, sco.row)"
>濉啓搴曠ǹ</el-button
>
- <el-button plain type="primary" size="small"
- >涓嬭浇搴曠ǹ</el-button
- >
+ <!--el-button plain type="primary" size="small"
+ >涓嬭浇搴曠ǹ</el-button-->
</template>
</el-table-column>
</el-table>
@@ -530,7 +530,7 @@
<el-card style="margin-bottom: 10px; padding-bottom: 20px">
<el-button size="small" @click="feedbackse">娣诲姞鍙嶉鎰忚</el-button>
<el-button type="primary" size="small">鎵归噺涓嬭浇鍙嶉鎰忚</el-button>
- <el-button type="primary" size="small">涓婁紶璇勫鎶ュ憡</el-button>
+ <!--el-button type="primary" size="small">涓婁紶璇勫鎶ュ憡</el-button-->
<el-button type="primary" size="small">鎵归噺鍙嶉</el-button>
</el-card>
<el-card style="margin-bottom: 10px; padding-bottom: 20px">
@@ -593,9 +593,15 @@
<el-tab-pane label="璇勫绛惧瓧鎵撳嵃" name="5" v-if="state">
<el-card style="margin-bottom: 10px; padding-bottom: 20px">
<div style="margin-bottom: 10px">鍚堣搴曠ǹ鏂瑰紡(*浠呮敮鎸丏ocx鏍煎紡):</div>
- <el-button type="primary" size="small">涓婁紶Word鍚堣搴曠ǹ</el-button>
+ <!--el-button type="primary" size="small">涓婁紶Word鍚堣搴曠ǹ</el-button>
<el-button type="primary" size="small">涓嬭浇鍚堣搴曠ǹ</el-button>
- <el-button type="primary" size="small">涓撳搴曠ǹ涓€閿笅杞�</el-button>
+ <el-button type="primary" size="small">涓撳搴曠ǹ涓€閿笅杞�</el-button-->
+ <el-button
+ type="primary"
+ size="small"
+ style="margin-top: 10px"
+ @click="downloadServiceFeePdf"
+ >涓嬭浇鍔冲姟璐瑰彂鏀炬竻鍗�</el-button >
</el-card>
<el-card style="margin-bottom: 10px; padding-bottom: 20px">
<div style="margin-bottom: 10px">濉啓鍔冲姟璐�:</div>
@@ -721,13 +727,7 @@
</template>
</el-table-column>
</el-table>
- <el-button
- type="primary"
- size="small"
- style="margin-top: 10px"
- @click="downloadServiceFeePdf"
- >涓嬭浇鍔冲姟璐瑰彂鏀炬竻鍗�</el-button
- >
+
</el-card>
</el-tab-pane>
</el-tabs>
@@ -889,7 +889,7 @@
></el-table-column>
<el-table-column
class="positionStyle"
- prop="deptCodeAuthorName"
+ prop="deptName"
label="涓氬姟澶勫"
align="center"
></el-table-column>
@@ -1360,6 +1360,7 @@ import operation from '@/api/review-management-operation';
import { use } from 'echarts/core';
import { ElMessage } from 'element-plus';
import { useRoute, useRouter } from 'vue-router';
+import { useStore } from 'vuex';
use([]);
export default {
name: 'ReviewSchemeView',
@@ -1367,6 +1368,7 @@ export default {
setup() {
const router = useRoute();
const route = useRouter();
+ const store = useStore();
const data = reactive({
reportTableInfo: {
tableInfo: [],
@@ -1498,6 +1500,7 @@ export default {
resId: '',
relatedId: null,
authorization: '',
+ isshow:true
});
watch(
() => data.ApprovalTableLaowu,
@@ -1559,6 +1562,7 @@ export default {
);
});
onMounted(() => {
+ data.isshow = store.state.subject.user.roleName!=="浜嬪姟鎵€";
if (router.query.cunArr) {
data.resId = router.query.cunArr;
getPlanRelatedById();
@@ -2064,7 +2068,11 @@ export default {
};
//涓嬭浇涓撳搴曠ǹ
const downloadExpertPdf = (row)=> {
- operation.downloadExpertPdf({expertTel:row.expertTel,relatedId:row.relatedId} );
+ console.log(row);
+ operation.downloadExpertPdf({
+ expertTel:row.expertTel,
+ relatedId:data.relatedId
+ } );
};
// 涓婄Щ
const handleMoveUp = (index, row) => {
diff --git a/WebSite/src/views/item-entry/review-scheme/index.vue b/WebSite/src/views/item-entry/review-scheme/index.vue
index 5be432dfc943fdbe0b2df145d63086147992b860..22ff41a7af4e7f5382b43c512b57367b70218ade 100644
--- a/WebSite/src/views/item-entry/review-scheme/index.vue
+++ b/WebSite/src/views/item-entry/review-scheme/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="workplace-container">
- <el-card>
+ <el-card v-if="isshow">
<el-form :inline="true" class="demo-form-inline">
<el-form-item>
<el-button
@@ -8,6 +8,7 @@
type="primary"
icon="plus"
size="small"
+
@click="createSolution"
>鍒涘缓鏂规</el-button
>
@@ -24,7 +25,7 @@
stripe
header-cell-class-name="headStyle"
>
- <!-- <el-table-column type="index" width="50"> {{ (page - 1) * pageSize + scope.$index + 1 }}</el-table-column> -->
+
<el-table-column
label="搴忓彿"
type="index"
@@ -117,14 +118,16 @@ import { reactive, toRefs, onMounted } from 'vue';
import { use } from 'echarts/core';
import { useRouter } from 'vue-router';
import operation from '@/api/review-management-operation';
-import { ElMessage } from 'element-plus';
-
+import { ElMessage } from 'element-plus';
+import { useStore } from 'vuex';
use([]);
export default {
name: 'ReviewScheme',
components: {},
setup() {
const router = useRouter();
+ const store = useStore();
+
const data = reactive({
onNewIndexDialog: false,
queryInfo: {},
@@ -135,9 +138,12 @@ export default {
pageIndex: 1,
pageSize: 10
},
- baoArr: []
+ baoArr: [],
+ isshow:true
});
- onMounted(() => {
+ onMounted(() => {
+ data.isshow = store.state.subject.user.roleName!=="浜嬪姟鎵€";
+
getRelatedList();
});
//鍒囨崲鍒嗛〉
diff --git a/WebSite/src/views/item-entry/view-page/index.vue b/WebSite/src/views/item-entry/view-page/index.vue
index 6c77f86f2622887cb919a261156b49d83dfc284e..84d0b37675300ac77d7b628df478cfe355a1ace3 100644
--- a/WebSite/src/views/item-entry/view-page/index.vue
+++ b/WebSite/src/views/item-entry/view-page/index.vue
@@ -257,11 +257,11 @@
></el-option>
</el-select>
</el-form-item>
- <el-form-item>
+ <!--el-form-item>
<el-button plain type="primary" icon="download" size="small"
>涓嬭浇涓撳鎵嬬ǹ鏍蜂緥</el-button
>
- </el-form-item>
+ </el-form-item-->
</el-form>
</div>
</el-card>