修改并网审核

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/AcceptanceStatusEnum.java

@@ -11,26 +11,26 @@ import lombok.Getter;
 @SuppressWarnings("ALL")
 public enum AcceptanceStatusEnum {
 
-    待提交验收("待提交验收", 1),
+    待提交验收("待提交验收", "1","","0"),
 
-    待投融验收("待投融验收", 2),
+    待投融验收("待投融验收", "2", "hygf_ys1","0"),
 
-    投融验收不通过("投融验收不通过", 3),
+    投融验收不通过("投融验收不通过", "3", "hygf_ys2","1"),
 
-    待法务验收("待法务验收", 4),
+    待法务验收("待法务验收", "4","hygf_ys2","0"),
 
-    法务验收不通过("法务验收不通过", 5),
+    法务验收不通过("法务验收不通过", "5", "hygf_ys3","1"),
 
-    待工程验收("待工程验收", 6),
+    待工程验收("待工程验收", "6", "hygf_ys3","0"),
 
-    工程验收不通过("工程验收不通过", 7),
+    工程验收不通过("工程验收不通过", "7", "hygf_ys4","1"),
 
-    待线下验收("待线下验收", 8),
+    待线下验收("待线下验收", "8", "hygf_ys5","0"),
 
-    线下验收不通过("线下验收不通过", 9),
-
-    验收完成("验收完成", 10);
+    线下验收不通过("线下验收不通过", "9", "hygf_ys6","1"),
 
+    验收完成("验收完成", "10", "hygf_ys5","1"),
+    线下验收完成("验收完成", "10", "hygf_ys6","0");
 
     /**
      * 名称，描述
@@ -39,17 +39,33 @@ public enum AcceptanceStatusEnum {
     /**
      * 编码
      */
-    private final int code;
+    private final String code;
+
+    //节点key
+    private final String key;
+
+    //节点key
+    private final String state;
 
-    public static AcceptanceStatusEnum getNodeByCode(int code) {
+
+    public static AcceptanceStatusEnum getNodeByCode(String code) {
         AcceptanceStatusEnum acceptanceStatusEnum = null;
         for (AcceptanceStatusEnum type : AcceptanceStatusEnum.values()) {
-            if (type.getCode() == code) {
+            if (code.equals(type.getCode())) {
                 acceptanceStatusEnum = type;
                 break;
             }
         }
         return acceptanceStatusEnum;
     }
-
+    public static String getNodeByKey(String Key,String state) {
+        AcceptanceStatusEnum acceptanceStatusEnum = null;
+        for (AcceptanceStatusEnum type : AcceptanceStatusEnum.values()) {
+            if (type.getKey().contains(Key)&&type.getState().equals(state)) {
+                acceptanceStatusEnum = type;
+                break;
+            }
+        }
+        return acceptanceStatusEnum.getCode();
+    }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/BasicGridAcceptancEnum.java

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @description: 验收状态枚举
+ */
+@Getter
+@AllArgsConstructor
+@SuppressWarnings("ALL")
+public enum BasicGridAcceptancEnum {
+
+    并网管理端工程审核("hygf_bw2", "hygf_bw2"),
+    经销商工程提交验收("hygf_ys1", "hygf_ys1"),
+    管理端投融审核("hygf_ys2", "hygf_ys2"),
+    管理端法务审核("hygf_ys3", "hygf_ys3"),
+    管理端工程审核("hygf_ys4", "hygf_ys4"),
+    管理端工程是否线下("hygf_ys5", "hygf_ys5"),
+    管理端工程线下验("hygf_ys6", "hygf_ys6");
+
+    /**
+     * 名称，描述
+     */
+    private final String rule;
+    /**
+     * 编码
+     */
+    private final String code;
+
+
+
+    public static BasicGridAcceptancEnum getNodeByCode(String code) {
+        BasicGridAcceptancEnum acceptanceStatusEnum = null;
+        for (BasicGridAcceptancEnum type : BasicGridAcceptancEnum.values()) {
+            if (type.getCode() .equals(code) ) {
+                acceptanceStatusEnum = type;
+                break;
+            }
+        }
+        return acceptanceStatusEnum;
+    }
+
+}

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AcceptanceCheckItem.java

@@ -617,4 +617,23 @@ public class AcceptanceCheckItem extends BaseEntity {
      */
     @TableField("assembly_dip_angle_image")
     private String assemblyDipAngleImage;
+
+
+    @TableField(exist = false)
+    private  String  approvalStatus;//审核结果,0,1
+    @TableField(exist = false)
+    private  String  operator;//操作人
+    @TableField(exist = false)
+    private  String  operationTime;//操作时间
+    @TableField(exist = false)
+    private  String  comment;//审核意见
+    //并网审核id
+    @TableField(exist = false)
+    private Long basicGridAcceptanceId;
+
+    //并网登记id
+    @TableField(exist = false)
+    private Long fonGridId;
+
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceController.java

@@ -51,45 +51,45 @@ public class AcceptanceController  extends BaseController {
         param.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
         param.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
 
-        // 获取用户权限
-        Set<String> roles = new HashSet<>();
-        try {
-            FeignClientResult<AgencyUserModel> response = Privilege.agencyUserClient.getme();
-            if (response.getStatus() == 200) {
-                AgencyUserModel agencyUser = response.getResult();
-                Map<Long, List<RoleModel>> orgRoles = agencyUser.getOrgRoles();
-                orgRoles.values().forEach(roleModels -> roles.addAll(roleModels.stream().map(RoleModel::getRoleTypeName).collect(Collectors.toSet())));
-            } else {
-                throw new RuntimeException("获取用户权限失败");
-            }
-        } catch (RuntimeException e) {
-            throw new RuntimeException(e.getMessage());
-        }
-        Set<String> acceptanceStatusSet = this.getFullAcceptanceStatus();
-        // 用户光伏-法务：看不到未通过投融审核的电站
-        if (roles.contains("户用光伏-法务") || roles.contains("户用光伏-经销商-法务")) {
-            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待提交验收.getCode()));
-            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待投融验收.getCode()));
-            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.投融验收不通过.getCode()));
-        }
-        // 用户光伏-工程： 看不到未通过法务审核的电站
-        else if (roles.contains("户用光伏-工程") || roles.contains("户用光伏-经销商-工程")) {
-            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待提交验收.getCode()));
-            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待投融验收.getCode()));
-            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.投融验收不通过.getCode()));
-            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待法务验收.getCode()));
-            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.法务验收不通过.getCode()));
-        }
+//        // 获取用户权限
+//        Set<String> roles = new HashSet<>();
+//        try {
+//            FeignClientResult<AgencyUserModel> response = Privilege.agencyUserClient.getme();
+//            if (response.getStatus() == 200) {
+//                AgencyUserModel agencyUser = response.getResult();
+//                Map<Long, List<RoleModel>> orgRoles = agencyUser.getOrgRoles();
+//                orgRoles.values().forEach(roleModels -> roles.addAll(roleModels.stream().map(RoleModel::getRoleTypeName).collect(Collectors.toSet())));
+//            } else {
+//                throw new RuntimeException("获取用户权限失败");
+//            }
+//        } catch (RuntimeException e) {
+//            throw new RuntimeException(e.getMessage());
+//        }
+//        Set<String> acceptanceStatusSet = this.getFullAcceptanceStatus();
+//        // 用户光伏-法务：看不到未通过投融审核的电站
+//        if (roles.contains("户用光伏-法务") || roles.contains("户用光伏-经销商-法务")) {
+//            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待提交验收.getCode()));
+//            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待投融验收.getCode()));
+//            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.投融验收不通过.getCode()));
+//        }
+//        // 用户光伏-工程： 看不到未通过法务审核的电站
+//        else if (roles.contains("户用光伏-工程") || roles.contains("户用光伏-经销商-工程")) {
+//            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待提交验收.getCode()));
+//            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待投融验收.getCode()));
+//            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.投融验收不通过.getCode()));
+//            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待法务验收.getCode()));
+//            acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.法务验收不通过.getCode()));
+//        }
 
         IPage<AcceptanceDto> page = new Page<>(current, size);
-        if (StringUtils.hasText(param.getAcceptanceStatus())) {
-            if (acceptanceStatusSet.contains(param.getAcceptanceStatus())) {
-                acceptanceStatusSet = new HashSet<>(Collections.singletonList(param.getAcceptanceStatus()));
-            } else {
-                return ResponseHelper.buildResponse(page);
-            }
-        }
-        param.setAcceptanceStatus(String.join(",", acceptanceStatusSet));
+//        if (StringUtils.hasText(param.getAcceptanceStatus())) {
+//            if (acceptanceStatusSet.contains(param.getAcceptanceStatus())) {
+//                acceptanceStatusSet = new HashSet<>(Collections.singletonList(param.getAcceptanceStatus()));
+//            } else {
+//                return ResponseHelper.buildResponse(page);
+//            }
+//        }
+//        param.setAcceptanceStatus(String.join(",", acceptanceStatusSet));
 
         page = acceptanceService.page(page, param);
 
@@ -103,13 +103,13 @@ public class AcceptanceController  extends BaseController {
         return ResponseHelper.buildResponse(acceptanceService.acceptanceDetails(sequenceNbr));
     }
 
-    private Set<String> getFullAcceptanceStatus() {
-        String[] array = new String[AcceptanceStatusEnum.验收完成.getCode() + 1];
-        for (int i = AcceptanceStatusEnum.待提交验收.getCode(); i <= AcceptanceStatusEnum.验收完成.getCode(); i++) {
-            array[i] = String.valueOf(i);
-        }
-        return Arrays.stream(array).filter(Objects::nonNull).collect(Collectors.toSet());
-    }
+//    private Set<String> getFullAcceptanceStatus() {
+//        String[] array = new String[AcceptanceStatusEnum.验收完成.getCode() + 1];
+//        for (int i = AcceptanceStatusEnum.待提交验收.getCode(); i <= AcceptanceStatusEnum.验收完成.getCode(); i++) {
+//            array[i] = String.valueOf(i);
+//        }
+//        return Arrays.stream(array).filter(Objects::nonNull).collect(Collectors.toSet());
+//    }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/BasicGridAcceptanceController.java

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.GridStatusEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.ProcessDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.StartProcessDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
 import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
@@ -170,6 +171,11 @@ public class BasicGridAcceptanceController extends BaseController {
 		return ResponseHelper.buildResponse(page);
 	}
 
+
+
+
+
+
 	/**
 	 * 列表全部数据查询
      *
@@ -183,6 +189,17 @@ public class BasicGridAcceptanceController extends BaseController {
 	}
 
 
+	//并网审核
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/execute")
+    @ApiOperation(httpMethod = "POST", value = "执行工作流", notes = "执行工作流")
+    public ResponseModel execute(@RequestBody AcceptanceCheckItem dto) {
+        basicGridAcceptanceServiceImpl.execute(dto);
+        return ResponseHelper.buildResponse(null);
+    }
+
 
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceServiceImpl.java

@@ -63,7 +63,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         }
         IPage<AcceptanceDto> resultPage = acceptanceMapper.page(page, acceptanceDto);
         resultPage.getRecords().forEach(v -> {
-            AcceptanceStatusEnum statusEnum = AcceptanceStatusEnum.getNodeByCode(Integer.parseInt(v.getAcceptanceStatus()));
+            AcceptanceStatusEnum statusEnum = AcceptanceStatusEnum.getNodeByCode(v.getAcceptanceStatus());
             v.setAcceptanceStatusDesc(statusEnum.getName());
             v.setRectificationStatusDesc("0".equals(v.getAcceptanceStatus()) ? "待整改" : "整改完成");
         });

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.AcceptanceStatusEnum;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.BasicGridAcceptancEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.GridStatusEnum;
-import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.ProcessDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.StartProcessDto;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum;
+import com.yeejoin.amos.boot.module.hygf.api.dto.*;
+import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
 import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
 import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckItemMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.HygfOnGridMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
@@ -39,6 +43,11 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
     PersonnelBusinessMapper personnelBusinessMapper;
     @Autowired
     WorkflowImpl workflow;
+    @Autowired
+    AcceptanceCheckItemMapper acceptanceCheckItemMapper;
+
+    private final  String OK ="0";
+    private final  String PASS ="1";
 
     public Page<BasicGridAcceptanceDto> selectPage(Long  regionCompanyId  ,Long amosDealerId ,int current, int size, String projectAddress, String powerStationCode, String ownersName, String gridStatus, Date gridConnectionTime, String formType) {
         PageHelper.startPage(current, size);
@@ -120,4 +129,57 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
     }
 
 
+    @Transactional
+    public void execute(AcceptanceCheckItem dto){
+        //查询并网审批信息
+        BasicGridAcceptance basicGridAcceptanc=  basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
+        if(OK.equals(dto.getApprovalStatus())){
+            if( BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(basicGridAcceptanc.getNextNodeKey())){
+                basicGridAcceptanc.setGridStatus(GridStatusEnum.YWC.getCode());
+                basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.待提交验收.getCode());
+                //并网时间
+                LambdaUpdateWrapper<HygfOnGrid> upq=new LambdaUpdateWrapper();
+                upq.eq(HygfOnGrid::getSequenceNbr,dto.getFonGridId());
+                upq.set(HygfOnGrid::getGridConnectionTime, new Date());
+                onGridMapper.update(null,upq);
+            }else{
+
+                basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(basicGridAcceptanc.getNextNodeKey(),dto.getApprovalStatus()));
+            }
+        }else{
+            if( BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(basicGridAcceptanc.getNextNodeKey())){
+                basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode());
+            }else{
+                basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(basicGridAcceptanc.getNextNodeKey(),dto.getApprovalStatus()));
+            }
+        }
+        if(basicGridAcceptanc.getNextNodeKey().equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())){
+
+            dto.setWorkOrderId(basicGridAcceptanc.getWorkOrderId());
+            dto.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId());
+            dto.setPeasantHouseholdId(basicGridAcceptanc.getPeasantHouseholdId());
+            acceptanceCheckItemMapper.insert(dto);
+
+        }
+
+        //执行工作流
+        StandardDto standardDto=new StandardDto();
+        standardDto.setComment(dto.getComment());
+        standardDto.setResult(dto.getApprovalStatus());
+        standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());
+        VariableDto variable=new VariableDto();
+        variable.setApprovalStatus(dto.getApprovalStatus());
+        variable.setComment(dto.getComment());
+        variable.setOperationTime(dto.getOperationTime());
+        variable.setOperator(dto.getOperator());
+        standardDto.setVariable(variable);
+        BasicGridAcceptance workBasicGridAcceptance =  workflow.standard(basicGridAcceptanc,standardDto);
+        basicGridAcceptanceMapper.updateById(workBasicGridAcceptance);
+
+    }
+
+
+
+
+
 }