信创符合性申请修改

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/TenderAction.java

@@ -107,6 +107,17 @@ public class TenderAction {
     }
 
     /**
+     * 重新提交信创符合性申请
+     *
+     * @param message \
+     */
+    @OnTransition(source = "XCFHX_APPLY_FAILED", target = "ON_XCFHX_APPLY")
+    public void RESUBMIT_XCFHX_APPLY(Message<ProjectStatusChangeEvent> message) {
+        Purchase purchase = getPurchaseInfo(message);
+        purchase.setStatus(TenderStatusEnum.ON_XCFHX_APPLY.getTenderStatus());
+    }
+
+    /**
      * 终验申报
      *
      * @param message \

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/TenderStateMachineBuilderImpl.java

@@ -98,6 +98,11 @@ public class TenderStateMachineBuilderImpl implements TenderStateMachineBuilder
                 .source(TenderStatusEnum.TO_BE_SUBMIT_XCFHX_APPLY)
                 .target(TenderStatusEnum.ON_XCFHX_APPLY)
                 .event(TenderStatusChangeEvent.SUBMIT_XCFHX_APPLY)
+                .and()// 信创符合性申请
+                .withExternal()
+                .source(TenderStatusEnum.XCFHX_APPLY_FAILED)
+                .target(TenderStatusEnum.ON_XCFHX_APPLY)
+                .event(TenderStatusChangeEvent.RESUBMIT_XCFHX_APPLY)
                 .and()
                 // 信创符合性申请通过
                 .withExternal()

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/TenderStatusChangeEvent.java

@@ -38,6 +38,10 @@ public enum TenderStatusChangeEvent {
      */
     SUBMIT_XCFHX_APPLY(301, null, null),
     /**
+     * 信创符合性重新申请
+     */
+    RESUBMIT_XCFHX_APPLY(303, null, null),
+    /**
      * 信创符合性申请通过
      */
     XCFHX_APPLY_PASSED(302, null, null),

hz-pm-api/src/main/java/com/hz/pm/api/performance/manage/OrgSelfAppraisalManage.java

@@ -82,8 +82,8 @@ public class OrgSelfAppraisalManage {
     /**
      * 绩效列表
      *
-     * @param req
-     * @return
+     * @param req \
+     * @return \
      */
     public PageVo<PerformanceAppraisalVO> list(PerformanceAppraisalListReq req) {
         UserInfoDetails user = LoginUserUtil.loginUserDetail();

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/ConstructionManage.java

@@ -642,7 +642,8 @@ public class ConstructionManage {
     @Transactional(rollbackFor = Exception.class)
     public void submitXcfhxApply(XcfhxApplyReq req) {
         Purchase purchase = purchaseService.getById(req.getBidId());
-        if (!TenderStatusEnum.TO_BE_SUBMIT_XCFHX_APPLY.eq(purchase.getStatus())) {
+        if (!TenderStatusEnum.TO_BE_SUBMIT_XCFHX_APPLY.eq(purchase.getStatus())
+                && !TenderStatusEnum.XCFHX_APPLY_FAILED.eq(purchase.getStatus())) {
             throw BizException.wrap("该标段不支持提交信创符合性申请");
         }
 

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/ProjectStatusEnum.java

@@ -101,7 +101,7 @@ public enum ProjectStatusEnum {
         return null;
     }
 
-    public boolean eq(int code) {
+    public boolean eq(Integer code) {
         return this.getCode().equals(code);
     }