修改验收审核

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

@@ -25,6 +25,8 @@ public enum AcceptanceStatusEnum {
 
     工程验收不通过("工程验收不通过", "7", "hygf_ys4","1"),
 
+    是否线下验收("是否线下验收", "11", "hygf_ys4","0"),
+
     待线下验收("待线下验收", "8", "hygf_ys5","0"),
 
     线下验收不通过("线下验收不通过", "9", "hygf_ys6","1"),

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceDto.java

@@ -90,7 +90,11 @@ public class AcceptanceDto extends BaseDto {
 
     private Long fonGridId;
 
+    private Long workOrderId;
 
+    private Long workOrderPowerStationId;
+
+    private Long peasantHouseholdId;
 
 
 

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

@@ -631,6 +631,9 @@ public class AcceptanceCheckItem extends BaseEntity {
     @TableField(exist = false)
     private Long basicGridAcceptanceId;
 
+    @TableField(exist = false)
+    private  String  approvalStatusxx;//,0,1
+
     //并网登记id
     @TableField(exist = false)
     private Long fonGridId;

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

@@ -21,6 +21,8 @@
             WHEN bga.acceptance_status  = '7' THEN '工程验收不通过'
             WHEN bga.acceptance_status  = '8' THEN '待线下验收'
             WHEN bga.acceptance_status  = '9' THEN '线下验收不通过'
+            WHEN bga.acceptance_status  = '11' THEN '是否线下验收'
+
             ELSE '验收完成' END AS acceptanceStatus,
 
             bga.work_order_id workOrderId,
@@ -29,7 +31,7 @@
             bga.acceptance_rec_date acceptanceRecDate,
             bga.instance_id instanceId,
             bga.next_executor_ids nextExecutorIds,
-            bga.next_node_key,
+            bga.next_node_key  nextNodeKey,
 
 
             ph.regional_companies_code AS regionalCompaniesCode,

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

@@ -22,7 +22,7 @@
         hbga.acceptance_rec_date acceptanceRecDate,
         hbga.instance_id instanceId,
         hbga.next_executor_ids nextExecutorIds,
-        hbga.next_node_key,
+        hbga.next_node_key nextNodeKey,
         hph.owners_name AS ownersName,
             hph.peasant_household_no peasantHouseholdNo,
             hph.project_address_name projectAddressName,

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

@@ -105,6 +105,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
     public void  checkAccept( Long  basicGridAcceptanceId   ,String userId){
         BasicGridAcceptance basicGridAcceptanc=  basicGridAcceptanceMapper.selectById(basicGridAcceptanceId);
         basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.待投融验收.getCode());
+        basicGridAcceptanc.setAcceptanceRecDate(new Date());
         //执行工作流
         StandardDto standardDto=new StandardDto();
         standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());

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

@@ -144,6 +144,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
     public void execute(AcceptanceCheckItem dto,String userId){
         //查询并网审批信息
         BasicGridAcceptance basicGridAcceptanc=  basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
+         String old=  basicGridAcceptanc.getNextNodeKey();
         if(OK.equals(dto.getApprovalStatus())){
             if( BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(basicGridAcceptanc.getNextNodeKey())){
                 basicGridAcceptanc.setGridStatus(GridStatusEnum.YWC.getCode());
@@ -153,10 +154,11 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
                 upq.eq(HygfOnGrid::getSequenceNbr,dto.getFonGridId());
                 upq.set(HygfOnGrid::getGridConnectionTime, new Date());
                 onGridMapper.update(null,upq);
-            }else{
+            } else{
 
                 basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(basicGridAcceptanc.getNextNodeKey(),dto.getApprovalStatus()));
             }
+
         }else{
             if( BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(basicGridAcceptanc.getNextNodeKey())){
                 basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode());
@@ -164,15 +166,14 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
                 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());
@@ -185,6 +186,29 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
         variable.setOperator(dto.getOperator());
         standardDto.setVariable(variable);
         BasicGridAcceptance workBasicGridAcceptance =  workflow.standard(basicGridAcceptanc,standardDto,userId);
+
+//        if( BasicGridAcceptancEnum.管理端工程审核.getCode().equals(old)){
+//
+//            //是否线下验收
+//            if(dto.getApprovalStatusxx().equals("0")){
+//                workBasicGridAcceptance.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(workBasicGridAcceptance.getNextNodeKey(),"0"));
+//            }else{
+//                workBasicGridAcceptance.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(workBasicGridAcceptance.getNextNodeKey(),"1"));
+//            }
+//            //执行工作流
+//            StandardDto standardDto1=new StandardDto();
+//            standardDto1.setComment(dto.getComment());
+//            standardDto1.setResult(dto.getApprovalStatusxx());
+//            standardDto1.setTaskId(workBasicGridAcceptance.getNextTaskId());
+//            VariableDto variable1=new VariableDto();
+//            variable1.setApprovalStatus(dto.getApprovalStatusxx());
+//            variable1.setComment(dto.getComment());
+//            variable1.setOperationTime(dto.getOperationTime());
+//            variable1.setOperator(dto.getOperator());
+//            standardDto1.setVariable(variable1);
+//            workBasicGridAcceptance = workflow.standard(workBasicGridAcceptance,standardDto,userId);
+//        }
+
         basicGridAcceptanceMapper.updateById(workBasicGridAcceptance);
 
     }