From 9fa6d94009961854332f8a5efa0fc928f1c74802 Mon Sep 17 00:00:00 2001
From: yeguangli <820437705@qq.com>
Date: Wed, 12 Apr 2023 15:39:51 +0800
Subject: [PATCH 1/3] no message
---
.../web/api/IPreliminaryController.java | 5 ++
.../web/api/IProjectTypeController.java | 18 +++++++
.../web/dto/preliminary/PreliminaryOut.java | 2 +
.../web/dto/project_type/ProjectTypeOut.java | 3 ++
.../business/api/PreliminaryService.java | 5 ++
.../budget/business/api/ProjectService.java | 3 ++
.../service/PreliminaryServiceImpl.java | 22 +++++++-
.../business/service/ProjectServiceImpl.java | 54 ++++++++++++++++---
.../web/controller/PreliminaryController.java | 3 ++
.../web/controller/ProjectTypeController.java | 9 ++++
10 files changed, 116 insertions(+), 8 deletions(-)
diff --git a/ServiceSite/facade/src/main/java/com/seasky/budget/web/api/IPreliminaryController.java b/ServiceSite/facade/src/main/java/com/seasky/budget/web/api/IPreliminaryController.java
index 8ab8c17b..5394cd02 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/budget/web/api/IPreliminaryController.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/budget/web/api/IPreliminaryController.java
@@ -5,6 +5,7 @@ import com.seasky.budget.web.dto.base.IdRequest;
import com.seasky.budget.web.dto.preliminary.PreliminaryCmd;
import com.seasky.budget.web.dto.preliminary.PreliminaryOut;
import com.seasky.budget.web.dto.preliminary.PreliminaryQuery;
+import com.seasky.budget.web.dto.project_type.ProjectTypeOut;
import com.seasky.core.common.ResponseCode;
import com.seasky.core.common.Result;
import io.swagger.annotations.Api;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
+import java.util.List;
@FeignClient("budget-project-manage")
@RequestMapping("preliminary")
@@ -36,4 +38,7 @@ public interface IPreliminaryController {
@ApiOperation("鏍规嵁id鑾峰彇棰勫椤圭洰")
@PostMapping(path = "/getPreliminaryById")
Result<PreliminaryOut> getPreliminaryById(@RequestBody @NotNull @Valid IdRequest idRequest);
+
+
+
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/budget/web/api/IProjectTypeController.java b/ServiceSite/facade/src/main/java/com/seasky/budget/web/api/IProjectTypeController.java
index a07222f9..1d858621 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/budget/web/api/IProjectTypeController.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/budget/web/api/IProjectTypeController.java
@@ -4,6 +4,7 @@ import com.seasky.budget.web.dto.base.IdRequest;
import com.seasky.budget.web.dto.project_type.ProjectTypeCmd;
import com.seasky.budget.web.dto.project_type.ProjectTypeOut;
import com.seasky.budget.web.dto.project_type.ProjectTypeQuery;
+import com.seasky.core.common.ResponseCode;
import com.seasky.core.common.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,12 +18,21 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.io.IOException;
+import java.util.List;
import java.util.Map;
@FeignClient("budget-project-manage")
@RequestMapping("projectType")
@Api(tags = "椤圭洰鐢虫姤Controller")
public interface IProjectTypeController {
+
+ @ApiOperation("棰勫鍒楄〃閲岄潰鐨勯」鐩�")
+ @PostMapping(path = "/ProjectTypeList")
+ Result<ProjectTypeOut> ProjectTypeList(@RequestBody @NotNull IdRequest idRequest) ;
+
+
+
+
@ApiOperation("鏆傛椂淇濆瓨椤圭洰淇℃伅")
@PostMapping(path = "/temporarySave")
Result<Long> temporarySave(@RequestBody @NotNull ProjectTypeCmd projectTypeCmd);
@@ -46,6 +56,8 @@ public interface IProjectTypeController {
Result<ProjectTypeOut> getProjectInfoPage(@RequestBody @NotNull ProjectTypeQuery projectTypeQuery);
+
+
@ApiOperation("鍒犻櫎椤圭洰淇℃伅")
@PostMapping(path = "/remove")
Result<Integer> remove(@RequestBody @NotNull IdRequest idRequest);
@@ -73,6 +85,8 @@ public interface IProjectTypeController {
void downloadAttachFileById(HttpServletResponse httpServletResponse, @RequestParam("fileId") Long fileId) throws Exception;
+
+
@ApiOperation("涓嬭浇椤圭洰鐢虫姤pdf")
@GetMapping(path = "/downloadProjectPdf")
void downloadProjectPdf(HttpServletResponse httpServletResponse, @RequestParam("id") Long id) throws IOException;
@@ -81,6 +95,10 @@ public interface IProjectTypeController {
@ApiOperation("濉啓涓€绾ч」鐩悕绉�")
@PostMapping(path = "/saveProjectTypeName")
Result<Integer> saveProjectTypeName(@RequestBody @NotNull ProjectTypeCmd projectTypeCmd);
+
+
+
+
// @ApiOperation("涓婁紶闄勪欢")
// @PostMapping(path = "/uploadAttachFile")
// Result<List<Long>> uploadAttachFile(@RequestParam("file") MultipartFile[] files);
diff --git a/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/preliminary/PreliminaryOut.java b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/preliminary/PreliminaryOut.java
index 3c238df2..49b53b6e 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/preliminary/PreliminaryOut.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/preliminary/PreliminaryOut.java
@@ -60,4 +60,6 @@ public class PreliminaryOut implements Serializable {
@ApiModelProperty(value = "闄勪欢闆嗗悎", example = "")
private List<FileOut> fileOuts;
+
+
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/project_type/ProjectTypeOut.java b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/project_type/ProjectTypeOut.java
index 852e0c52..3edf5d18 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/project_type/ProjectTypeOut.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/project_type/ProjectTypeOut.java
@@ -73,4 +73,7 @@ public class ProjectTypeOut implements Serializable {
@ApiModelProperty(value = "闄勪欢闆嗗悎", example = "")
private List<FileOut> fileOuts;
+
+ @ApiModelProperty(value = "鏄惁鏈夐瀹¤〃", example = "")
+ private String isPreliminary;
}
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/api/PreliminaryService.java b/ServiceSite/src/main/java/com/seasky/budget/business/api/PreliminaryService.java
index eed78601..73a6b97f 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/business/api/PreliminaryService.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/api/PreliminaryService.java
@@ -4,8 +4,11 @@ import com.seasky.budget.web.dto.base.IdRequest;
import com.seasky.budget.web.dto.preliminary.PreliminaryCmd;
import com.seasky.budget.web.dto.preliminary.PreliminaryOut;
import com.seasky.budget.web.dto.preliminary.PreliminaryQuery;
+import com.seasky.budget.web.dto.project_type.ProjectTypeOut;
import com.seasky.core.common.Pagination;
+import java.util.List;
+
public interface PreliminaryService {
@@ -14,4 +17,6 @@ public interface PreliminaryService {
Pagination<PreliminaryOut> getPreliminaryPage(PreliminaryQuery preliminaryQuery);
PreliminaryOut getPreliminaryById(IdRequest idRequest);
+
+
}
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/api/ProjectService.java b/ServiceSite/src/main/java/com/seasky/budget/business/api/ProjectService.java
index 07b5a240..6ec5384f 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/business/api/ProjectService.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/api/ProjectService.java
@@ -42,4 +42,7 @@ public interface ProjectService {
//鐢熸垚鐢虫姤涔df
void downloadProjectPdf(HttpServletResponse httpServletResponse, Long id) throws IOException;
+
+ //棰勫鍒楄〃閲岄潰椤圭洰
+ List<ProjectTypeOut> ProjectTypeList(IdRequest idRequest);
}
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 4886a8b6..53b7794a 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
@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.seasky.budget.business.api.LoginService;
import com.seasky.budget.business.api.PreliminaryService;
+import com.seasky.budget.business.dao.mapper.EntrustmentProjectMapper;
import com.seasky.budget.business.dao.mapper.FileMapper;
import com.seasky.budget.business.dao.mapper.PreliminaryMapper;
+import com.seasky.budget.business.dao.mapper.ProjectTypeMapper;
+import com.seasky.budget.business.entity.EntrustmentProjectPO;
import com.seasky.budget.business.entity.FilePO;
import com.seasky.budget.business.entity.PreliminaryPO;
import com.seasky.budget.business.entity.ProjectTypePO;
@@ -16,6 +19,7 @@ import com.seasky.budget.web.dto.preliminary.PreliminaryCmd;
import com.seasky.budget.web.dto.preliminary.PreliminaryOut;
import com.seasky.budget.web.dto.preliminary.PreliminaryQuery;
import com.seasky.budget.web.dto.project_type.ProjectTypeOut;
+import com.seasky.budget.web.dto.project_type.ProjectTypeQuery;
import com.seasky.budget.web.dto.userInfo.UserInfo;
import com.seasky.core.common.Pagination;
import com.seasky.core.common.ResponseCode;
@@ -24,8 +28,9 @@ import com.seasky.core.util.ExceptionUtil;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Collections;
-import java.util.List;
+
+import java.util.*;
+import java.util.stream.Collectors;
/**
@@ -43,6 +48,13 @@ public class PreliminaryServiceImpl implements PreliminaryService {
@Autowired
private FileMapper fileMapper;
+ @Autowired
+ private ProjectTypeMapper projectTypeMapper;
+
+ @Autowired
+ private EntrustmentProjectMapper entrustmentProjectMapper;
+
+
//鏂板缓銆佺紪杈戞柟娉�
@Override
public Long savePreliminary(PreliminaryCmd preliminaryCmd) { //鏂板缓缂栬緫鐨勬柟娉�
@@ -86,6 +98,12 @@ public class PreliminaryServiceImpl implements PreliminaryService {
return pagination;
}
+
+
+
+
+
+
//鏍规嵁id鑾峰彇棰勫椤圭洰
@Override
public PreliminaryOut getPreliminaryById(IdRequest idRequest) {
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 956273bb..9896fdd2 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
@@ -8,12 +8,8 @@ import com.itextpdf.text.pdf.BaseFont;
import com.itextpdf.text.pdf.PdfWriter;
import com.seasky.budget.business.api.LoginService;
import com.seasky.budget.business.api.ProjectService;
-import com.seasky.budget.business.dao.mapper.FileMapper;
-import com.seasky.budget.business.dao.mapper.ProjectStateMapper;
-import com.seasky.budget.business.dao.mapper.ProjectTypeMapper;
-import com.seasky.budget.business.entity.FilePO;
-import com.seasky.budget.business.entity.ProjectStatePO;
-import com.seasky.budget.business.entity.ProjectTypePO;
+import com.seasky.budget.business.dao.mapper.*;
+import com.seasky.budget.business.entity.*;
import com.seasky.budget.business.event.PageNumPdfPageEvent;
import com.seasky.budget.business.event.TextWaterMarkPageEvent;
import com.seasky.budget.enums.ProjectStateEnum;
@@ -55,6 +51,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
@Service
@@ -69,6 +66,12 @@ public class ProjectServiceImpl implements ProjectService {
@Autowired
private FileMapper fileMapper;
+ @Autowired
+ private EntrustmentProjectMapper entrustmentProjectMapper;
+
+ @Autowired
+ private PreliminaryMapper preliminaryMapper;
+
@Override
public Long saveProjectInfo(ProjectTypeCmd projectTypeCmd) {
@@ -523,4 +526,43 @@ public class ProjectServiceImpl implements ProjectService {
public FileMapper getFileMapper() {
return fileMapper;
}
+
+ //濮旀墭鍑介噷闈㈤瀹＄殑椤圭洰鍒楄〃鐨勬柟娉�
+ @Override
+ public List<ProjectTypeOut> ProjectTypeList(IdRequest idRequest) {
+
+ ///鑾峰彇濮旀墭鍑介噷闈㈢殑椤圭洰
+ QueryWrapper<EntrustmentProjectPO> entrustmentProjectPOQueryWrapper = new QueryWrapper<>();
+ entrustmentProjectPOQueryWrapper.eq(true, "entrustment_id", idRequest.getId());
+ List<EntrustmentProjectPO> entrustmentProjectPOS = entrustmentProjectMapper.selectList(entrustmentProjectPOQueryWrapper);
+
+ ///鑾峰彇椤圭洰鍒楄〃椤�
+ List<Long> projectIds = entrustmentProjectPOS.stream().map(EntrustmentProjectPO::getParentId).collect(Collectors.toList());
+ QueryWrapper<ProjectTypePO> projectTypePOQueryWrapper = new QueryWrapper<>();
+ projectTypePOQueryWrapper.in("id", projectIds);
+ List<ProjectTypePO> projectTypePOS = projectTypeMapper.selectList(projectTypePOQueryWrapper);
+
+ //鑾峰彇棰勫琛ㄥ垪琛�
+ QueryWrapper<PreliminaryPO> preliminaryPOQueryWrapper = new QueryWrapper<>();
+ List<PreliminaryPO> preliminaryPOS = preliminaryMapper.selectList(preliminaryPOQueryWrapper);
+
+
+ if (ObjectUtils.isEmpty(projectTypePOS)) {
+ throw ExceptionUtil.getException(null, "鑾峰彇涓嶅埌濮旀墭鍑戒笅椤圭洰淇℃伅锛�");
+ }
+
+ List<ProjectTypeOut> result = MapperUtils.INSTANCE.mapAsList(ProjectTypeOut.class, projectTypePOS);
+
+ for (ProjectTypeOut projecttypeout:result)
+ {
+ for(PreliminaryPO preliminaryPO:preliminaryPOS){
+ if(projecttypeout.getId().equals( preliminaryPO.getProjectId())){
+ projecttypeout.setIsPreliminary("鏈�");
+ } else{
+ projecttypeout.setIsPreliminary("鏃�");
+ }
+ }
+ }
+ return result;
+ }
}
\ No newline at end of file
diff --git a/ServiceSite/src/main/java/com/seasky/budget/web/controller/PreliminaryController.java b/ServiceSite/src/main/java/com/seasky/budget/web/controller/PreliminaryController.java
index 1e3a76ee..7317bdd3 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/web/controller/PreliminaryController.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/web/controller/PreliminaryController.java
@@ -15,6 +15,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
import static com.seasky.core.common.Response.ok;
@RestController
@@ -38,4 +40,5 @@ public class PreliminaryController implements IPreliminaryController {
return ok(ResponseCode.SUCCESS, preliminaryService.getPreliminaryById(idRequest));
}
+
}
diff --git a/ServiceSite/src/main/java/com/seasky/budget/web/controller/ProjectTypeController.java b/ServiceSite/src/main/java/com/seasky/budget/web/controller/ProjectTypeController.java
index c2e4071f..54f0e0a3 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/web/controller/ProjectTypeController.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/web/controller/ProjectTypeController.java
@@ -18,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotNull;
import java.io.IOException;
+import java.util.List;
import java.util.Map;
import static com.seasky.core.common.Response.ok;
@@ -28,6 +29,11 @@ public class ProjectTypeController implements IProjectTypeController {
@Autowired
private ProjectService projectService;
+ @Override
+ public Result<ProjectTypeOut> ProjectTypeList(IdRequest idRequest) {
+ return ok(ResponseCode.SUCCESS, projectService.ProjectTypeList(idRequest));
+ }
+
@Override
public Result<Long> temporarySave(ProjectTypeCmd projectTypeCmd) {
return ok(ResponseCode.SUCCESS, projectService.temporarySave(projectTypeCmd));
@@ -92,4 +98,7 @@ public class ProjectTypeController implements IProjectTypeController {
public Result<Integer> saveProjectTypeName(@NotNull ProjectTypeCmd projectTypeCmd) {
return null;
}
+
+
+
}
--
GitLab
From d51e9182eef25ab8c63ab32f5bc6bd80363f18e2 Mon Sep 17 00:00:00 2001
From: yeguangli <820437705@qq.com>
Date: Thu, 13 Apr 2023 13:07:12 +0800
Subject: [PATCH 2/3] no message
---
.../EntrustmentExpertManuscriptCmd.java | 116 ++++++++++++++++++
.../EntrustmentExpertManuscriptOut.java | 96 +++++++++++++++
.../EntrustmentExpertManuscriptService.java | 4 +
.../business/api/PreliminaryService.java | 2 -
.../EntrustmentExpertManuscriptMapper.java | 7 ++
.../EntrustmentExpertManuscriptMapper.fxml | 5 +
.../entity/EntrustmentExpertManuscriptPO.java | 114 +++++++++++++++++
.../business/entity/EntrustmentProjectPO.java | 3 +
.../budget/business/entity/PreliminaryPO.java | 2 +-
...ntrustmentExpertManuscriptServiceImpl.java | 11 ++
10 files changed, 357 insertions(+), 3 deletions(-)
create mode 100644 ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptCmd.java
create mode 100644 ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptOut.java
create mode 100644 ServiceSite/src/main/java/com/seasky/budget/business/api/EntrustmentExpertManuscriptService.java
create mode 100644 ServiceSite/src/main/java/com/seasky/budget/business/dao/mapper/EntrustmentExpertManuscriptMapper.java
create mode 100644 ServiceSite/src/main/java/com/seasky/budget/business/dao/xml/EntrustmentExpertManuscriptMapper.fxml
create mode 100644 ServiceSite/src/main/java/com/seasky/budget/business/entity/EntrustmentExpertManuscriptPO.java
create mode 100644 ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentExpertManuscriptServiceImpl.java
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
new file mode 100644
index 00000000..8895307e
--- /dev/null
+++ b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptCmd.java
@@ -0,0 +1,116 @@
+package com.seasky.budget.web.dto.entrustment_expert_manuscript;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("涓撳搴曠ǹmodel")
+public class EntrustmentExpertManuscriptCmd implements Serializable {
+
+
+
+ @ApiModelProperty(value = "id", example = "")
+ @NotNull(message = "id涓嶈兘涓虹┖锛�")
+ private Long id;
+
+ @ApiModelProperty(value = "parent_id", example = "")
+ @NotNull(message = "椤圭洰id锛�")
+ private Long parentId;
+
+ @ApiModelProperty(value = "entrustment_id", example = "")
+ @NotNull(message = "濮旀墭鍑絠d锛�")
+ private Long entrustmentId;
+
+ @ApiModelProperty(value = "expert_id", example = "")
+ @NotNull(message = "涓撳id锛�")
+ private Long expertId;
+
+ @ApiModelProperty(value = "expert_tel", example = "")
+ @NotNull(message = "涓撳鐢佃瘽")
+ private String expertTel;
+
+ @ApiModelProperty(value = "expert_name", example = "")
+ @NotNull(message = "涓撳濮撳悕")
+ private String expertName;
+
+ @ApiModelProperty(value = "adequacy_based_score", example = "")
+ private Integer adequacyBasedScore;
+
+ @ApiModelProperty(value = "demand_urgency_score", example = "")
+ private Integer demandUrgencyScore;
+
+ @ApiModelProperty(value = "financial_investment_correlation_score", example = "")
+ private Integer financialInvestmentCrrelationScore;
+
+ @ApiModelProperty(value = "project_approval_remark", example = "")
+ private String projectApprovalRemark;
+
+ @ApiModelProperty(value = "demonstration_investment_funds_score", example = "")
+ private Integer demonstrationInvestmentFundsScore;
+
+ @ApiModelProperty(value = "budgeting_science_score", example = "")
+ private Integer budgetingScienceScore;
+
+ @ApiModelProperty(value = "risk_repeated_investment_score", example = "")
+ private Integer riskRepeatedInvestmentScore;
+
+ @ApiModelProperty(value = "investment_economy_remark", example = "")
+ private String investmentEconomyRemark;
+
+ @ApiModelProperty(value = "clear_performance_goal_score", example = "")
+ private Integer clearPerformanceGoalScore;
+
+ @ApiModelProperty(value = "related_performance_goal_score", example = "")
+ private Integer relatedPerformanceGoalScore;
+
+ @ApiModelProperty(value = "feasibility_performance_goal_score", example = "")
+ private Integer feasibilityPerformanceGoalScore;
+
+ @ApiModelProperty(value = "reasonable_performance_goal_remark", example = "")
+ private String reasonablePerformanceGoalRemark;
+
+ @ApiModelProperty(value = "completeness_preliminary_preparation_score", example = "")
+ private Integer completenessPreliminaryPreparationScore;
+
+ @ApiModelProperty(value = "reasonable_implementation_plan_score", example = "")
+ private Integer reasonableImplementationPlanScore;
+
+ @ApiModelProperty(value = "project_management_mechanism_score", example = "")
+ private Integer projectManagementMechanismScore;
+
+ @ApiModelProperty(value = "implementation_plan_feasible_remark", example = "")
+ private String implementationPlanFeasibleRemark;
+
+ @ApiModelProperty(value = "reasonable_financial_support_score", example = "")
+ private Integer reasonableFinancialSupportScore;
+
+ @ApiModelProperty(value = "controllability_financing_risks_score", example = "")
+ private Integer controllabilityFinancingRisksScore;
+
+ @ApiModelProperty(value = "fundraising_compliance_remark", example = "")
+ private String fundraisingComplianceRemark;
+
+ @ApiModelProperty(value = "conclusion", example = "")
+ private String conclusion;
+
+
+ @ApiModelProperty(value = "conclusion_remark", example = "")
+ private String conclusionRemark;
+
+ @ApiModelProperty(value = "problems_propose", example = "")
+ private String problemsPropose;
+
+ @ApiModelProperty(value = "total_score", example = "")
+ private Integer totalScore;
+}
+
+
diff --git a/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptOut.java b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptOut.java
new file mode 100644
index 00000000..4517eb76
--- /dev/null
+++ b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptOut.java
@@ -0,0 +1,96 @@
+package com.seasky.budget.web.dto.entrustment_expert_manuscript;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotNull;
+
+public class EntrustmentExpertManuscriptOut {
+
+ @ApiModelProperty(value = "id", example = "")
+ private Long id;
+
+ @ApiModelProperty(value = "parent_id", example = "")
+ private Long parentId;
+
+ @ApiModelProperty(value = "entrustment_id", example = "")
+ private Long entrustmentId;
+
+ @ApiModelProperty(value = "expert_id", example = "")
+ private Long expertId;
+
+ @ApiModelProperty(value = "expert_tel", example = "")
+ private String expertTel;
+
+ @ApiModelProperty(value = "expert_name", example = "")
+ private String expertName;
+
+ @ApiModelProperty(value = "adequacy_based_score", example = "")
+ private Integer adequacyBasedScore;
+
+ @ApiModelProperty(value = "demand_urgency_score", example = "")
+ private Integer demandUrgencyScore;
+
+ @ApiModelProperty(value = "financial_investment_correlation_score", example = "")
+ private Integer financialInvestmentCrrelationScore;
+
+ @ApiModelProperty(value = "project_approval_remark", example = "")
+ private String projectApprovalRemark;
+
+ @ApiModelProperty(value = "demonstration_investment_funds_score", example = "")
+ private Integer demonstrationInvestmentFundsScore;
+
+ @ApiModelProperty(value = "budgeting_science_score", example = "")
+ private Integer budgetingScienceScore;
+
+ @ApiModelProperty(value = "risk_repeated_investment_score", example = "")
+ private Integer riskRepeatedInvestmentScore;
+
+ @ApiModelProperty(value = "investment_economy_remark", example = "")
+ private String investmentEconomyRemark;
+
+ @ApiModelProperty(value = "clear_performance_goal_score", example = "")
+ private Integer clearPerformanceGoalScore;
+
+ @ApiModelProperty(value = "related_performance_goal_score", example = "")
+ private Integer relatedPerformanceGoalScore;
+
+ @ApiModelProperty(value = "feasibility_performance_goal_score", example = "")
+ private Integer feasibilityPerformanceGoalScore;
+
+ @ApiModelProperty(value = "reasonable_performance_goal_remark", example = "")
+ private String reasonablePerformanceGoalRemark;
+
+ @ApiModelProperty(value = "completeness_preliminary_preparation_score", example = "")
+ private Integer completenessPreliminaryPreparationScore;
+
+ @ApiModelProperty(value = "reasonable_implementation_plan_score", example = "")
+ private Integer reasonableImplementationPlanScore;
+
+ @ApiModelProperty(value = "project_management_mechanism_score", example = "")
+ private Integer projectManagementMechanismScore;
+
+ @ApiModelProperty(value = "implementation_plan_feasible_remark", example = "")
+ private String implementationPlanFeasibleRemark;
+
+ @ApiModelProperty(value = "reasonable_financial_support_score", example = "")
+ private Integer reasonableFinancialSupportScore;
+
+ @ApiModelProperty(value = "controllability_financing_risks_score", example = "")
+ private Integer controllabilityFinancingRisksScore;
+
+ @ApiModelProperty(value = "fundraising_compliance_remark", example = "")
+ private String fundraisingComplianceRemark;
+
+ @ApiModelProperty(value = "conclusion", example = "")
+ private String conclusion;
+
+
+ @ApiModelProperty(value = "conclusion_remark", example = "")
+ private String conclusionRemark;
+
+ @ApiModelProperty(value = "problems_propose", example = "")
+ private String problemsPropose;
+
+ @ApiModelProperty(value = "total_score", example = "")
+ private Integer totalScore;
+}
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/api/EntrustmentExpertManuscriptService.java b/ServiceSite/src/main/java/com/seasky/budget/business/api/EntrustmentExpertManuscriptService.java
new file mode 100644
index 00000000..7f07dce8
--- /dev/null
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/api/EntrustmentExpertManuscriptService.java
@@ -0,0 +1,4 @@
+package com.seasky.budget.business.api;
+
+public interface EntrustmentExpertManuscriptService {
+}
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/api/PreliminaryService.java b/ServiceSite/src/main/java/com/seasky/budget/business/api/PreliminaryService.java
index 73a6b97f..fd5a45fd 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/business/api/PreliminaryService.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/api/PreliminaryService.java
@@ -4,10 +4,8 @@ import com.seasky.budget.web.dto.base.IdRequest;
import com.seasky.budget.web.dto.preliminary.PreliminaryCmd;
import com.seasky.budget.web.dto.preliminary.PreliminaryOut;
import com.seasky.budget.web.dto.preliminary.PreliminaryQuery;
-import com.seasky.budget.web.dto.project_type.ProjectTypeOut;
import com.seasky.core.common.Pagination;
-import java.util.List;
public interface PreliminaryService {
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/dao/mapper/EntrustmentExpertManuscriptMapper.java b/ServiceSite/src/main/java/com/seasky/budget/business/dao/mapper/EntrustmentExpertManuscriptMapper.java
new file mode 100644
index 00000000..8e73b60e
--- /dev/null
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/dao/mapper/EntrustmentExpertManuscriptMapper.java
@@ -0,0 +1,7 @@
+package com.seasky.budget.business.dao.mapper;
+
+import com.seasky.budget.business.entity.EntrustmentExpertManuscriptPO;
+import com.seasky.core.base.BaseMapper;
+
+public interface EntrustmentExpertManuscriptMapper extends BaseMapper<EntrustmentExpertManuscriptPO> {
+}
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/dao/xml/EntrustmentExpertManuscriptMapper.fxml b/ServiceSite/src/main/java/com/seasky/budget/business/dao/xml/EntrustmentExpertManuscriptMapper.fxml
new file mode 100644
index 00000000..2b216358
--- /dev/null
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/dao/xml/EntrustmentExpertManuscriptMapper.fxml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.seasky.budget.business.dao.mapper.EntrustmentExpertManuscriptMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/entity/EntrustmentExpertManuscriptPO.java b/ServiceSite/src/main/java/com/seasky/budget/business/entity/EntrustmentExpertManuscriptPO.java
new file mode 100644
index 00000000..8fe98220
--- /dev/null
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/entity/EntrustmentExpertManuscriptPO.java
@@ -0,0 +1,114 @@
+package com.seasky.budget.business.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.seasky.core.base.BaseModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author Administrator
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Accessors(chain = true)
+@Builder
+@TableName("t_entrustment_expert_manuscript")
+public class EntrustmentExpertManuscriptPO extends BaseModel {
+
+ @TableField(value = "id")
+ private Long id;
+
+ @TableField(value = "parent_id")
+ private Long parentId;
+
+ @TableField(value = "entrustment_id")
+ private Long entrustmentId;
+
+ @TableField(value = "expert_id")
+ private Long expertId;
+
+ @TableField(value = "expert_tel")
+ private String expertTel;
+
+ @TableField(value = "expert_name")
+ private String expertName;
+
+ @TableField(value = "adequacy_based_score")
+ private Integer adequacyBasedScore;
+
+ @TableField(value = "demand_urgency_score")
+ private Integer demandUrgencyScore;
+
+ @TableField(value = "financial_investment_correlation_score")
+ private Integer financialInvestmentCrrelationScore;
+
+ @TableField(value = "project_approval_remark")
+ private String projectApprovalRemark;
+
+ @TableField(value = "demonstration_investment_funds_score")
+ private Integer demonstrationInvestmentFundsScore;
+
+ @TableField(value = "budgeting_science_score")
+ private Integer budgetingScienceScore;
+
+ @TableField(value = "risk_repeated_investment_score")
+ private Integer riskRepeatedInvestmentScore;
+
+ @TableField(value = "investment_economy_remark")
+ private String investmentEconomyRemark;
+
+ @TableField(value = "clear_performance_goal_score")
+ private Integer clearPerformanceGoalScore;
+
+ @TableField(value = "related_performance_goal_score")
+ private Integer relatedPerformanceGoalScore;
+
+ @TableField(value = "feasibility_performance_goal_score")
+ private Integer feasibilityPerformanceGoalScore;
+
+ @TableField(value = "reasonable_performance_goal_remark")
+ private String reasonablePerformanceGoalRemark;
+
+ @TableField(value = "completeness_preliminary_preparation_score")
+ private Integer completenessPreliminaryPreparationScore;
+
+ @TableField(value = "reasonable_implementation_plan_score")
+ private Integer reasonableImplementationPlanScore;
+
+ @TableField(value = "project_management_mechanism_score")
+ private Integer projectManagementMechanismScore;
+
+ @TableField(value = "implementation_plan_feasible_remark")
+ private String implementationPlanFeasibleRemark;
+
+ @TableField(value = "reasonable_financial_support_score")
+ private Integer reasonableFinancialSupportScore;
+
+ @TableField(value = "controllability_financing_risks_score")
+ private Integer controllabilityFinancingRisksScore;
+
+ @TableField(value = "fundraising_compliance_remark")
+ private String fundraisingComplianceRemark;
+
+ @TableField(value = "conclusion")
+ private String conclusion;
+
+ @TableField(value = "conclusion_remark")
+ private String conclusionRemark;
+
+ @TableField(value = "problems_propose")
+ private String problemsPropose;
+
+ @TableField(value = "total_score")
+ private Integer totalScore;
+
+
+
+}
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/entity/EntrustmentProjectPO.java b/ServiceSite/src/main/java/com/seasky/budget/business/entity/EntrustmentProjectPO.java
index e0f60a31..ff3d35a2 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/business/entity/EntrustmentProjectPO.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/entity/EntrustmentProjectPO.java
@@ -21,4 +21,7 @@ public class EntrustmentProjectPO extends BaseModel {
@TableField("parent_id")
private Long parentId;
+
+
+
}
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/entity/PreliminaryPO.java b/ServiceSite/src/main/java/com/seasky/budget/business/entity/PreliminaryPO.java
index a98fe1f1..e2da67c6 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/business/entity/PreliminaryPO.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/entity/PreliminaryPO.java
@@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
@Builder
-@TableName("t_preliminary")
+@TableName("t_entrustment_preliminary")
public class PreliminaryPO extends BaseModel{
@TableField("project_id")
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentExpertManuscriptServiceImpl.java b/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentExpertManuscriptServiceImpl.java
new file mode 100644
index 00000000..9e1be2b6
--- /dev/null
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentExpertManuscriptServiceImpl.java
@@ -0,0 +1,11 @@
+package com.seasky.budget.business.service;
+
+import com.seasky.budget.business.api.EntrustmentExpertManuscriptService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class EntrustmentExpertManuscriptServiceImpl implements EntrustmentExpertManuscriptService {
+
+
+
+}
--
GitLab
From 9d93a6cce625e823a879e366e4a2424932ed6d29 Mon Sep 17 00:00:00 2001
From: yeguangli <820437705@qq.com>
Date: Mon, 17 Apr 2023 10:59:58 +0800
Subject: [PATCH 3/3] no message
---
.../EntrustmentExpertManuscriptQuery.java | 33 ++++++++
.../EntrustmentExpertManuscriptService.java | 4 +
...ntrustmentExpertManuscriptServiceImpl.java | 77 +++++++++++++++++++
3 files changed, 114 insertions(+)
create mode 100644 ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptQuery.java
diff --git a/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptQuery.java b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptQuery.java
new file mode 100644
index 00000000..187637a2
--- /dev/null
+++ b/ServiceSite/facade/src/main/java/com/seasky/budget/web/dto/entrustment_expert_manuscript/EntrustmentExpertManuscriptQuery.java
@@ -0,0 +1,33 @@
+package com.seasky.budget.web.dto.entrustment_expert_manuscript;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("涓撳搴曠ǹ")
+public class EntrustmentExpertManuscriptQuery implements Serializable {
+
+ @ApiModelProperty(value = "parent_id", example = "")
+ private Long parentId;
+
+ @ApiModelProperty(value = "entrustment_id", example = "")
+ private Long entrustmentId;
+
+ @ApiModelProperty(value = "expert_id", example = "")
+ private Long expertId;
+
+ @ApiModelProperty(value = "褰撳墠椤�", example = "1")
+ private Integer pageIndex;
+
+ @ApiModelProperty(value = "椤甸潰澶у皬", example = "10")
+ private Integer pageSize;
+}
+
+
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/api/EntrustmentExpertManuscriptService.java b/ServiceSite/src/main/java/com/seasky/budget/business/api/EntrustmentExpertManuscriptService.java
index 7f07dce8..a191ee0b 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/business/api/EntrustmentExpertManuscriptService.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/api/EntrustmentExpertManuscriptService.java
@@ -1,4 +1,8 @@
package com.seasky.budget.business.api;
+import com.seasky.budget.web.dto.entrustment_expert_manuscript.EntrustmentExpertManuscriptCmd;
+
public interface EntrustmentExpertManuscriptService {
+
+ Integer saveEntrustmentExpertManuscript(EntrustmentExpertManuscriptCmd entrustmentExpertManuscriptCmd);
}
diff --git a/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentExpertManuscriptServiceImpl.java b/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentExpertManuscriptServiceImpl.java
index 9e1be2b6..c491793f 100644
--- a/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentExpertManuscriptServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/budget/business/service/EntrustmentExpertManuscriptServiceImpl.java
@@ -1,11 +1,88 @@
package com.seasky.budget.business.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.seasky.budget.business.api.EntrustmentExpertManuscriptService;
+import com.seasky.budget.business.api.LoginService;
+import com.seasky.budget.business.dao.mapper.EntrustmentExpertManuscriptMapper;
+import com.seasky.budget.business.entity.EntrustmentExpertManuscriptPO;
+import com.seasky.budget.business.entity.EntrustmentPO;
+import com.seasky.budget.business.entity.EntrustmentProjectPO;
+import com.seasky.budget.business.entity.ProjectTypePO;
+import com.seasky.budget.enums.EntrustmentStateEnum;
+import com.seasky.budget.enums.ProjectStateEnum;
+import com.seasky.budget.web.dto.Entrustment.EntrustmentCmd;
+import com.seasky.budget.web.dto.entrustment_expert_manuscript.EntrustmentExpertManuscriptCmd;
+import com.seasky.budget.web.dto.entrustment_expert_manuscript.EntrustmentExpertManuscriptQuery;
+import com.seasky.budget.web.dto.userInfo.UserInfo;
+import com.seasky.core.util.ExceptionUtil;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
@Service
public class EntrustmentExpertManuscriptServiceImpl implements EntrustmentExpertManuscriptService {
+ @Autowired
+ private EntrustmentExpertManuscriptMapper entrustmentExpertManuscriptMapper;
+
+ @Autowired
+ private LoginService loginService;
+ //淇濆瓨搴曠ǹ
+ @Override
+ public Integer saveEntrustmentExpertManuscript(EntrustmentExpertManuscriptCmd entrustmentExpertManuscriptCmd) {
+
+ //region 濮旀墭鍑界紪鍙风敓鎴�
+ //鏍规嵁濮旀墭鍑界紪鍙疯鍒欐煡璇㈡暟鎹簱宸插瓨鍦ㄧ殑鏈€澶у鎵樺嚱缂栧彿
+ UserInfo loginInfo = loginService.getLoginInfo();
+ QueryWrapper<EntrustmentExpertManuscriptPO> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq(true, "parent_id", entrustmentExpertManuscriptCmd.getParentId());
+ queryWrapper.eq(true, "expert_tel", loginInfo.getUserCode());
+ List<EntrustmentExpertManuscriptPO> entrustmentExpertManuscriptPOS = entrustmentExpertManuscriptMapper.selectList(queryWrapper);
+
+
+ //娌℃湁褰撳墠涓撳鐨勫簳绋�
+ if (ObjectUtils.isEmpty(entrustmentExpertManuscriptPOS)) {
+ EntrustmentExpertManuscriptPO entrustmentExpertManuscriptPO=EntrustmentExpertManuscriptPO.builder().expertName(loginInfo.getUserName())
+ .expertTel(loginInfo.getUserCode()).entrustmentId(entrustmentExpertManuscriptCmd.getEntrustmentId())
+ .parentId(entrustmentExpertManuscriptCmd.getParentId()).build();
+
+ entrustmentExpertManuscriptPO.setAdequacyBasedScore(entrustmentExpertManuscriptCmd.get);
+ entrustmentExpertManuscriptPO.setDemandUrgencyScore();
+ entrustmentExpertManuscriptPO.setFinancialInvestmentCrrelationScore();
+ entrustmentExpertManuscriptPO.setProjectApprovalRemark();
+ entrustmentExpertManuscriptPO.setDemonstrationInvestmentFundsScore();
+ entrustmentExpertManuscriptPO.setBudgetingScienceScore();
+ entrustmentExpertManuscriptPO.setRiskRepeatedInvestmentScore();
+ entrustmentExpertManuscriptPO.setInvestmentEconomyRemark();
+ entrustmentExpertManuscriptPO.setClearPerformanceGoalScore();
+ entrustmentExpertManuscriptPO.setRelatedPerformanceGoalScore();
+ entrustmentExpertManuscriptPO.setFeasibilityPerformanceGoalScore();
+ entrustmentExpertManuscriptPO.setCompletenessPreliminaryPreparationScore();
+ entrustmentExpertManuscriptPO.setReasonableImplementationPlanScore();
+ entrustmentExpertManuscriptPO.setProjectManagementMechanismScore();
+ entrustmentExpertManuscriptPO.setImplementationPlanFeasibleRemark();
+ entrustmentExpertManuscriptPO.setReasonableFinancialSupportScore();
+ entrustmentExpertManuscriptPO.setControllabilityFinancingRisksScore();
+ entrustmentExpertManuscriptPO.setFundraisingComplianceRemark();
+ entrustmentExpertManuscriptPO.setConclusion();
+ entrustmentExpertManuscriptPO.setConclusionRemark();
+ entrustmentExpertManuscriptPO.setProblemsPropose();
+ entrustmentExpertManuscriptPO.setTotalScore();
+
+
+
+ }else{
+
+ EntrustmentExpertManuscriptPO entrustmentExpertManuscriptPO = entrustmentExpertManuscriptMapper.selectById(entrustmentExpertManuscriptCmd.getId());
+
+ }
+ //endregion
+
+ return 1;
+ }
}
--
GitLab