修改代码

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

@@ -54,6 +54,24 @@ public class AcceptanceCheckDto  extends BaseDto {
 
     private String acceptanceTime;
 
+ //电站编号
+ private String peasantHouseholdNo;
+ //户主姓名
+ private String ownersName;
+ ///项目地址
+ private String projectAddressName;
+ //并网日期
+ private Date gridConnectionTime;
 
-    private String isAudit;
+ private String regionalCompaniesName;
+
+ private String serviceAgent;
+
+
+ //并网登记id
+
+ private Long fonGridId;
+
+
+ private String isAudit;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/AcceptanceCheckMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceCheckDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheck;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -14,6 +16,6 @@ import java.util.Map;
  * @date 2024-08-21
  */
 public interface AcceptanceCheckMapper extends BaseMapper<AcceptanceCheck> {
-
-    List<AcceptanceCheckDto> selectPageList(Map<String, Object> map);
+    @UserEmpower(field ={"hph.regional_companies_code"} ,dealerField={"hph.developer_code","hph.regional_companies_code","hph.developer_user_id"},fieldConditions ={"in","in","in"} ,relationship="and")
+    List<AcceptanceCheckDto> selectPageList(@Param("map")Map<String, Object> map);
 }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridRecordDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheck;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
@@ -61,11 +62,11 @@ public class AcceptanceCheckController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
+	@PostMapping(value = "/save/commit")
 	@ApiOperation(httpMethod = "POST", value = "新增并网验收节点", notes = "新增并网验收节点")
-	public ResponseModel<AcceptanceCheckDto> save(@RequestBody AcceptanceCheckDto model) {
-	    model = acceptanceCheckServiceImpl.createWithModel(model);
-	    return ResponseHelper.buildResponse(model);
+	public ResponseModel<AcceptanceCheck> save(@RequestBody Map<String,Object> model) {
+
+	    return ResponseHelper.buildResponse(acceptanceCheckServiceImpl.saveAndCommit(model));
 	}
 
 	/**
@@ -239,7 +240,11 @@ public class AcceptanceCheckController extends BaseController {
 					if (null != e.getBasicGridNode() && e.getBasicGridNode().contains(g) && (roleIds.contains(areaId) ||roleIds.contains(fawuId) ||  roleIds.contains(zichanId)||  roleIds.contains(tourongId))){
 						e.setIsAudit("0");
 						break;
-					}else {
+					}if (e.getBasicGridNode().equals("jxsAdmin") && roleIds.contains(delerAdminId)){
+						e.setIsAudit("0");
+						break;
+					}
+					else {
 						e.setIsAudit("1");
 					}
 				}

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

@@ -50,6 +50,12 @@ public class HygfRectificationOrderController extends BaseController {
 	Long delerAdminId;
 	@Value("${admin.delerKaId.roleId}")
 	Long delerKfId;
+	@Value("${admin.tourong.roleId}")
+	Long tourongId;
+	@Value("${admin.fawu.roleId}")
+	Long fawuId;
+	@Value("${admin.zichan.roleId}")
+	Long zichanId;
     /**
      * 新增审核单
      *
@@ -240,23 +246,28 @@ public class HygfRectificationOrderController extends BaseController {
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
 			if (longs.contains(areaId) ) {
-				workOrderPowerStationNodes.add("bw-area");
+				workOrderPowerStationNodes.add("ys-area");
 			}
-			if (longs.contains(engineeringId) ) {
-				workOrderPowerStationNodes.add("bw-engineering");
+			if (longs.contains(tourongId) ) {
+				workOrderPowerStationNodes.add("ys-engineering");
 			}
-			if (longs.contains(designId) ) {
-				workOrderPowerStationNodes.add("bw-design");
+			if (longs.contains(fawuId) ) {
+				workOrderPowerStationNodes.add("ys-design");
 			}
 			if (longs.contains(delerAdminId) ) {
-				workOrderPowerStationNodes.add("bw-design");
-				workOrderPowerStationNodes.add("bw-engineering");
-				workOrderPowerStationNodes.add("bw-area");
+				workOrderPowerStationNodes.add("ys-design");
+				workOrderPowerStationNodes.add("ys-engineering");
+				workOrderPowerStationNodes.add("ys-area");
 			}if (longs.contains(delerKfId) ) {
-				workOrderPowerStationNodes.add("bw-design");
-				workOrderPowerStationNodes.add("bw-engineering");
-				workOrderPowerStationNodes.add("bw-area");
+				workOrderPowerStationNodes.add("ys-design");
+				workOrderPowerStationNodes.add("ys-engineering");
+				workOrderPowerStationNodes.add("ys-area");
 			}
+//			if (longs.contains(delergcId) ) {
+//				workOrderPowerStationNodes.add("ys-design");
+//				workOrderPowerStationNodes.add("ys-engineering");
+//				workOrderPowerStationNodes.add("ys-area");
+//			}
 		}
 
 		Page<HygfRectificationOrder> page = hygfRectificationOrderServiceImpl.queryForHygfRectificationOrderPage(current, size, workOrderPowerStationNodes, peasantHouseholeId);

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

@@ -49,6 +49,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
     @Autowired
     HygfRectificationOrderServiceImpl rectificationOrderService;
     @Autowired
+    AcceptanceCheckMapper acceptanceCheckMapper;
+    @Autowired
     PeasantHouseholdMapper peasantHouseholdMapper;
 
 
@@ -72,7 +74,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         map.put("amosDealerId", amosDealerId);
         map.put("basicGridNodes",basicGridNodes);
         map.put("type",type);
-        List<AcceptanceCheckDto> list = this.getBaseMapper().selectPageList(map);
+        List<AcceptanceCheckDto> list = acceptanceCheckMapper.selectPageList(map);
         PageInfo<AcceptanceCheckDto> page = new PageInfo(list);
         Page<AcceptanceCheckDto> pageNew = new Page<>();
         pageNew.setCurrent(current);
@@ -98,17 +100,15 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
 
 
 
-    public synchronized HygfOnGrid saveAndCommit(HygfOnGrid grid, String userId) {
+    public  AcceptanceCheck saveAndCommit(  Map<String,Object> model) {
 
-        AcceptanceCheck basicGridRecord = this.getBaseMapper()
-                .selectOne(new LambdaQueryWrapper<AcceptanceCheck>()
-                        .eq(AcceptanceCheck::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId()));
+        AcceptanceCheck basicGridRecord = this.getBaseMapper().selectById(model.get("sequenceNbr").toString());
 
 
         LambdaUpdateWrapper<AcceptanceCheck> update = new LambdaUpdateWrapper<>();
         update.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.JXSGLYDSH.getCode());
         update.set(AcceptanceCheck::getBasicGridNode,"jxsAdmin");
-        if (grid.getType() != null && "1".equals(grid.getType())) {
+        if (model.get("type") != null && "1".equals(model.get("type").toString())) {
             // 执行工作流
             this.wofkflowExcute(basicGridRecord.getInstanceId(),"0","重新验收");
             update.set(AcceptanceCheck::getPowerStationAreaStatus,null);
@@ -134,7 +134,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
             AcceptanceCheckAuditingDto basicGridAuditingDto = new AcceptanceCheckAuditingDto();
             BeanUtils.copyProperties(workflowResultDto, basicGridAuditingDto);
-            basicGridAuditingDto.setPeasantHouseholdId(grid.getPeasantHouseholdId());
+            basicGridAuditingDto.setPeasantHouseholdId(basicGridRecord.getPeasantHouseholdId());
             basicGridAuditingDto.setPromoter(RequestContext.getExeUserId());
             acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
             update.set(AcceptanceCheck::getInstanceId,basicGridAuditingDto.getInstanceId());
@@ -161,7 +161,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         this.update(null,update);
         //发起待办
 //		commonService.buildTaskModel(buildBWYSTaskModel(grid, basicGridAcceptance));
-        return grid;
+        return basicGridRecord;
     }
 
 

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

@@ -848,7 +848,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		HygfOnGrid hygfOnGrid = hygfOnGridMapper.selectOne(up4);
 
 		//增加整改单数据
-		List<HygfRectificationOrder> hygfRectificationOrderList= rectificationOrderService.selectForListBySource(String.valueOf(peasantHousehold.getSequenceNbr()), RectificationOrderEnum.并网.getCode());
+		List<HygfRectificationOrder> hygfRectificationOrderList= rectificationOrderService.selectForListBySource(String.valueOf(peasantHousehold.getSequenceNbr()), RectificationOrderEnum.并网.getName());
 		if (CollectionUtil.isNotEmpty(hygfRectificationOrderList)){
 			List<HygfRectificationOrder>  areaOrders = hygfRectificationOrderList.stream().filter(e -> e.getRectificationSource().equals("area")).collect(Collectors.toList());
 			List<HygfRectificationOrder>  engineeringOrders = hygfRectificationOrderList.stream().filter(e -> e.getRectificationSource().equals("engineering")).collect(Collectors.toList());