初始化并网信息

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

@@ -142,4 +142,8 @@ public class HygfOnGrid extends BaseEntity {
 	@TableField("peasant_household_id")
     private Long peasantHouseholdId;
 
+    @TableField("grid_connection_time")
+    private Date gridConnectionTime;
+
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/WorkflowFeignClient.java

@@ -5,6 +5,7 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -57,4 +58,40 @@ public interface WorkflowFeignClient {
                                   @PathVariable(value = "processInstanceId") String processInstanceId);
 
 
+
+
+    /**
+     *
+     * 发起流程
+     *   {"businessKey": 业务id
+     *   processDefinitionKey  ：hygf_bwys
+     *   completeFirstTask：true}
+     *是否需要自定执行第一个任务节点
+     * */
+    @RequestMapping(value = "/v2/task/start/batch", method = RequestMethod.POST)
+    FeignClientResult<JSONObject> startProcess( @RequestBody List<Map<String,Object>> data);
+
+
+
+    /**
+     * 执行流程
+     *  {
+     *
+     *             "comment": 审核备注
+     *             "result": 表达式值
+     *             "resultCode": 表达式key,
+     *             "taskId": "string",任务id
+     *
+     *             "variable": {
+     *
+     *            }
+     *     }
+     *
+     * */
+    @RequestMapping(value = "/v2/task/complete/standard/{taskId}", method = RequestMethod.POST)
+    FeignClientResult<JSONObject> standard( @PathVariable(value = "taskId") String taskId    ,@RequestBody  Map<String,Object> data);
+
+
+
+
 }
\ No newline at end of file

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

@@ -85,6 +85,10 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
     ConstructionRecordsServiceImpl constructionRecordsServiceImpl;
     @Autowired
     ConstructionRecordsMapper constructionRecordsMapper;
+    @Autowired
+    BasicGridAcceptanceMapper  basicGridAcceptanceMapper;
+
+
     /**
      * 分页查询
      */
@@ -823,6 +827,15 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
          if(constructionRecords.getOperationResults().equals("通过")){
              //修改电站状态
              workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.已完工.getCode());
+
+             BasicGridAcceptance dat=new BasicGridAcceptance();
+             dat.setWorkOrderId(workOrderPowerStation.getWorkOrderId());
+             dat.setWorkOrderPowerStationId(workOrderPowerStation.getSequenceNbr());
+             dat.setPeasantHouseholdId(workOrderPowerStation.getPeasantHouseholdId());
+             dat.setGridStatus("1");
+            //新增并网记录
+             basicGridAcceptanceMapper.insert(dat);
+
          }else{
              //修改电站状态
              workOrderPowerStation.setPowerStationConstructionStatus(WorkOrderEnum.未通过.getCode());