电站全过程状态修改

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

@@ -16,7 +16,29 @@ public enum ArrivalStateeEnum {
 
     已收货("已收货", "已收货"),
 
-    已作废("已作废", "已作废");
+    已作废("已作废", "已作废"),
+
+
+    待勘察("待勘察", "待勘察"),
+    勘察中("勘察中", "勘察中"),
+    勘察完成 ("勘察完成", "勘察完成"),
+    备货中("备货中", "备货中"),
+    备货完成("备货完成", "备货完成"),
+    施工中("施工中", "施工中"),
+    施工完成 ("施工完成", "施工完成"),
+    并网中("并网中", "并网中"),
+    并网完成("并网完成", "并网完成"),
+    线上验收("线上验收", "线上验收"),
+    线下验收("线下验收", "线下验收"),
+    验收完成("验收完成", "验收完成");
+
+
+
+
+
+
+
+
 
     /**
      * 名称，描述

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/UserEmpowerMapper.xml

@@ -27,7 +27,7 @@ VALUES
 	#{userId},
 	#{userId},
 	#{com},
-	 NULL,
+	 null,
 	'JXIOP',
 	#{role} );
 

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.StandardDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
@@ -117,6 +119,14 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());
         workflow.standard(basicGridAcceptanc,standardDto,userId);
         basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
+
+        //线上验收
+        LambdaUpdateWrapper<PeasantHousehold> up =new LambdaUpdateWrapper<>();
+        up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.线上验收.getCode());
+        long idsk= basicGridAcceptanc.getPeasantHouseholdId();
+        up.eq(PeasantHousehold::getSequenceNbr,idsk);
+        peasantHouseholdMapper.update(null,up);
+
     }
 
 

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

@@ -43,6 +43,10 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
     @Autowired
     WorkOrderMapper workOrderMapper;
 
+
+    @Autowired
+    PeasantHouseholdMapper peasantHouseholdMapper;
+
     private final  String OK ="0";
     private final  String PASS ="5";
 
@@ -104,6 +108,15 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
            startProcessDto.setProcess(process);
            workflow.startProcess(basicGridAcceptance, startProcessDto,userId);
 
+           //线上验收
+           LambdaUpdateWrapper<PeasantHousehold> up =new LambdaUpdateWrapper<>();
+           up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网中.getCode());
+           long idsk= basicGridAcceptance.getPeasantHouseholdId();
+           up.eq(PeasantHousehold::getSequenceNbr,idsk);
+           peasantHouseholdMapper.update(null,up);
+
+
+
        }
         if(grid.getSequenceNbr()!=null){
             onGridMapper.updateById(grid);
@@ -154,11 +167,19 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
                 upq.eq(HygfOnGrid::getSequenceNbr, dto.getFonGridId());
                 upq.set(HygfOnGrid::getGridConnectionTime, new Date());
                 onGridMapper.update(null, upq);
+                //并网完成
+                LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
+                up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.并网完成.getCode());
+                long idsk= basicGridAcceptanc.getPeasantHouseholdId();
+                up.eq(PeasantHousehold::getSequenceNbr,idsk);
+                peasantHouseholdMapper.update(null,up);
+
             } else {
 
                 basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
             }
 
+
         } else {
             if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
                 basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode());
@@ -210,7 +231,26 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
         standardDto.setVariable(variable);
         BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptanc, standardDto, userId);
 
+        if (workBasicGridAcceptance.getNextNodeKey().equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())) {
+            //线下验收
+            LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
+            up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.线下验收.getCode());
+            long idsk= basicGridAcceptanc.getPeasantHouseholdId();
+            up.eq(PeasantHousehold::getSequenceNbr,idsk);
+            peasantHouseholdMapper.update(null,up);
+        }
+
+        //验收完成
+        if(workBasicGridAcceptance.getNextTaskId()==null){
+
+            //更新状态
+            LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
+            up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.验收完成.getCode());
+            long idsk= basicGridAcceptanc.getPeasantHouseholdId();
+            up.eq(PeasantHousehold::getSequenceNbr,idsk);
+            peasantHouseholdMapper.update(null,up);
 
+        }
 
         basicGridAcceptanceMapper.updateById(workBasicGridAcceptance);
     }

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

@@ -390,12 +390,12 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
         Privilege.groupUserClient.deleteGroupUser(userGroupId,publicAgencyUsex.getAmosUserId());
 
 
-            userEmpowerMapper.upuserrole(
-                    publicAgencyUse.getSequenceNbr(),
-                    publicAgencyUse.getAmosUserId(),
-                    userGroupId,
-                    personnelBusines.getAmosUnitId()
-            );
+//            userEmpowerMapper.upuserrole(
+//                    publicAgencyUse.getSequenceNbr(),
+//                    publicAgencyUse.getAmosUserId(),
+//                    userGroupId,
+//                    personnelBusines.getAmosUnitId()
+//            );
 
 
             //修改权限

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

@@ -326,6 +326,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
                     String peasantHouseholdId = powerStation.getPeasantHouseholdId();
                     PeasantHousehold peasantHousehold = peasantHouseholdService.getBaseMapper().selectById(Long.valueOf(peasantHouseholdId));
                     peasantHousehold.setSurveyOrNot(3);
+                    peasantHousehold.setConstructionState(ArrivalStateeEnum.勘察完成.getCode());
                     peasantHouseholdService.saveOrUpdate(peasantHousehold);
                 }
             //}

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

@@ -310,7 +310,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
             //更新电站施工状态
             LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
-            up.set(PeasantHousehold::getConstructionState,DeliveryStateeEnum.已发货.getCode());
+            up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.备货中.getCode());
             List<DocumentStation> idsk= model.getPeasantHouseholdId();
             List<Long> idsH=new ArrayList<>();
 
@@ -391,7 +391,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
                 //更新电站施工状态
                 LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
-                up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.已收货.getCode());
+                up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.备货完成.getCode());
                 List<DocumentStation> idsk= model.getPeasantHouseholdId();
                 List<Long> idsH=new ArrayList<>();
 
@@ -410,7 +410,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
                     //更新电站施工状态
                     LambdaUpdateWrapper<PeasantHousehold>  up =new LambdaUpdateWrapper<>();
-                    up.set(PeasantHousehold::getConstructionState,DeliveryStateeEnum.已发货.getCode());
+                    up.set(PeasantHousehold::getConstructionState,ArrivalStateeEnum.备货中.getCode());
                     List<DocumentStation> idsk= model.getPeasantHouseholdId();
                     List<Long> idsH=new ArrayList<>();
                     for (DocumentStation documentStation : idsk) {

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

@@ -6,6 +6,7 @@ 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.ArrivalStateeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
@@ -92,6 +93,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
     WorkflowFeignClient workflowFeignClient;
 
 
+    @Autowired
+    PeasantHouseholdMapper peasantHouseholdMapper;
 
     /**
      * 分页查询
@@ -282,6 +285,15 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
              up.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.施工中.getCode());
          }else{
              up.set(WorkOrderPowerStation::getPowerStationConstructionStatus,WorkOrderEnum.待登记.getCode());
+
+             WorkOrderPowerStation basicGridAcceptanc= workOrderPowerStationMapper.selectById(powerStationConstructionData.getWorkOrderPowerStationId());
+             //施工完成
+             LambdaUpdateWrapper<PeasantHousehold>  up1 =new LambdaUpdateWrapper<>();
+             up1.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.并网完成.getCode());
+             long idsk= basicGridAcceptanc.getPeasantHouseholdId();
+             up1.eq(PeasantHousehold::getSequenceNbr,idsk);
+             peasantHouseholdMapper.update(null,up1);
+
          }
             workOrderPowerStationMapper.update(null,up);
             //修改派工单状态