Browse Source

feat:

1. 上传初验材料增加单位一平台截图;
master
WendyYang 4 months ago
parent
commit
1058ae8b50
9 changed files with 17 additions and 12 deletions
  1. +4
    -2
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java
  2. +0
    -1
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java
  3. +3
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/dto/PreInsSaveDTO.java
  4. +0
    -3
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/Operation.java
  5. +3
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/Purchase.java
  6. +0
    -3
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/TestValidInfoReq.java
  7. +0
    -3
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/OperationVO.java
  8. +4
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PreInsVO.java
  9. +3
    -0
      hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java

+ 4
- 2
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java View File

@@ -539,6 +539,7 @@ public class ConstructionManage {
vo.setPreliminaryInspectionMaterials(w.getPreliminaryInspectionMaterials()); vo.setPreliminaryInspectionMaterials(w.getPreliminaryInspectionMaterials());
vo.setIsCompletedLogCollection(w.getIsCompletedLogCollection()); vo.setIsCompletedLogCollection(w.getIsCompletedLogCollection());
vo.setActualPerformanceIndicators(w.getActualPerformanceIndicators()); vo.setActualPerformanceIndicators(w.getActualPerformanceIndicators());
vo.setUnitOnePlatformImages(w.getUnitOnePlatformImages());
List<PreInsAcceptancePerson> persons = personMap.get(w.getId()); List<PreInsAcceptancePerson> persons = personMap.get(w.getId());
if (persons != null) { if (persons != null) {
vo.setAcceptancePersons(convertPersons(persons)); vo.setAcceptancePersons(convertPersons(persons));
@@ -558,7 +559,7 @@ public class ConstructionManage {


@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public synchronized void submitFirstInspectedFiles(PreInsSaveDTO req) { public synchronized void submitFirstInspectedFiles(PreInsSaveDTO req) {
UserInfoDetails user = LoginUserUtil.userDetail();
UserInfoDetails user = LoginUserUtil.userDetailNotNull();
Purchase purchase = purchaseService.getById(req.getBidId()); Purchase purchase = purchaseService.getById(req.getBidId());
if (!TenderMainStatus.TO_BE_SUBMIT_FIRST_INSPECTED_INFO.eq(purchase.getStatus())) { if (!TenderMainStatus.TO_BE_SUBMIT_FIRST_INSPECTED_INFO.eq(purchase.getStatus())) {
throw BizException.wrap("该标段无法上传初验材料"); throw BizException.wrap("该标段无法上传初验材料");
@@ -589,6 +590,7 @@ public class ConstructionManage {
purchase.setPreliminaryInspectionMaterials(req.getPreliminaryInspectionMaterials()); purchase.setPreliminaryInspectionMaterials(req.getPreliminaryInspectionMaterials());
purchase.setIsCompletedLogCollection(req.getIsCompletedLogCollection()); purchase.setIsCompletedLogCollection(req.getIsCompletedLogCollection());
purchase.setActualPerformanceIndicators(req.getActualPerformanceIndicators()); purchase.setActualPerformanceIndicators(req.getActualPerformanceIndicators());
purchase.setUnitOnePlatformImages(req.getUnitOnePlatformImages());
purchaseService.updateById(purchase); purchaseService.updateById(purchase);
// 判断是否所有标段都上传了初验材料 // 判断是否所有标段都上传了初验材料
LambdaQueryWrapper<Purchase> purchaseQuery = Wrappers.lambdaQuery(Purchase.class) LambdaQueryWrapper<Purchase> purchaseQuery = Wrappers.lambdaQuery(Purchase.class)
@@ -668,7 +670,7 @@ public class ConstructionManage {
VUtils.isTrue(CollUtil.isNotEmpty(tasks)).throwMessage("此信创符合性已经发起过审核 并且还没审核完!"); VUtils.isTrue(CollUtil.isNotEmpty(tasks)).throwMessage("此信创符合性已经发起过审核 并且还没审核完!");
} }


UserInfoDetails user = LoginUserUtil.userDetail();
UserInfoDetails user = LoginUserUtil.userDetailNotNull();
WflowModels model = processModelManage.getWflowModelsNoNull(ProjectProcessType.XC_APPROVAL_PROCESS, WflowModels model = processModelManage.getWflowModelsNoNull(ProjectProcessType.XC_APPROVAL_PROCESS,
user.getMhUnitId()); user.getMhUnitId());




+ 0
- 1
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/PurchaseManage.java View File

@@ -1001,7 +1001,6 @@ public class PurchaseManage {
newOperation.setProjectCode(project.getProjectCode()); newOperation.setProjectCode(project.getProjectCode());
return newOperation; return newOperation;
}); });
operation.setUnitOnePlatformImages(req.getUnitOnePlatformImages());
operation.setActualAdaptionTime(req.getActualTime()); operation.setActualAdaptionTime(req.getActualTime());
operation.setAdaptionFiles(req.getFiles()); operation.setAdaptionFiles(req.getFiles());
operation.setAdaptionRemark(req.getRemark()); operation.setAdaptionRemark(req.getRemark());


+ 3
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/dto/PreInsSaveDTO.java View File

@@ -43,4 +43,7 @@ public class PreInsSaveDTO {
@ApiModelProperty("实际成效指标") @ApiModelProperty("实际成效指标")
private String actualPerformanceIndicators; private String actualPerformanceIndicators;


@ApiModelProperty("单位一平台截图")
private String unitOnePlatformImages;

} }

+ 0
- 3
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/Operation.java View File

@@ -68,9 +68,6 @@ public class Operation {
@ApiModelProperty("适配改造时间") @ApiModelProperty("适配改造时间")
private LocalDateTime adaptationTime; private LocalDateTime adaptationTime;


@ApiModelProperty("单位一平台截图")
private String unitOnePlatformImages;

@ApiModelProperty("实际完成适配改造时间") @ApiModelProperty("实际完成适配改造时间")
private LocalDateTime actualAdaptionTime; private LocalDateTime actualAdaptionTime;




+ 3
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/entity/Purchase.java View File

@@ -128,6 +128,9 @@ public class Purchase {
@ApiModelProperty("采购说明") @ApiModelProperty("采购说明")
private String purchaseRemark; private String purchaseRemark;


@ApiModelProperty("单位一平台截图")
private String unitOnePlatformImages;

@ApiModelProperty("初验时间") @ApiModelProperty("初验时间")
private LocalDate preliminaryInspectionDate; private LocalDate preliminaryInspectionDate;




+ 0
- 3
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/req/TestValidInfoReq.java View File

@@ -29,7 +29,4 @@ public class TestValidInfoReq {
@ApiModelProperty("附件") @ApiModelProperty("附件")
private String files; private String files;


@ApiModelProperty("单位一平台截图")
private String unitOnePlatformImages;

} }

+ 0
- 3
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/OperationVO.java View File

@@ -66,9 +66,6 @@ public class OperationVO {
@ApiModelProperty("测试验证时间") @ApiModelProperty("测试验证时间")
private LocalDateTime testValidTime; private LocalDateTime testValidTime;


@ApiModelProperty("单位一平台截图")
private String unitOnePlatformImages;

@ApiModelProperty("实际完成适配改造时间") @ApiModelProperty("实际完成适配改造时间")
private LocalDateTime actualAdaptionTime; private LocalDateTime actualAdaptionTime;




+ 4
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PreInsVO.java View File

@@ -33,4 +33,8 @@ public class PreInsVO {


@ApiModelProperty("实际成效指标") @ApiModelProperty("实际成效指标")
private String actualPerformanceIndicators; private String actualPerformanceIndicators;

@ApiModelProperty("单位一平台截图")
private String unitOnePlatformImages;

} }

+ 3
- 0
hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/model/vo/PurchaseVO.java View File

@@ -146,6 +146,9 @@ public class PurchaseVO {
@NotBlank(message = "信创符合性测评记录ID不能为空") @NotBlank(message = "信创符合性测评记录ID不能为空")
private String mhXcfhxReportRecordId; private String mhXcfhxReportRecordId;


@ApiModelProperty("单位一平台截图")
private String unitOnePlatformImages;

@ApiModelProperty("初验时间") @ApiModelProperty("初验时间")
private LocalDate preliminaryInspectionDate; private LocalDate preliminaryInspectionDate;




Loading…
Cancel
Save