解决冲突

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

@@ -515,9 +515,18 @@ public class AcceptanceCheckItemDto extends BaseDto {
      */
     private String assemblyDipAngleImage;
 
+    private  String  approvalStatus; //审核结果,0,1
+
+    private  String  operator; //操作人
+
+    private  String  operationTime; //操作时间
+
+    private  String  comment; //审核意见
+
+    //并网审核id
+    private Long basicGridAcceptanceId;
+
+    //并网登记id
+    private Long fonGridId;
 
-    private  String  approvalStatus;//审核结果,0,1
-    private  String  operator;//操作人
-    private   String operationTime;//操作时间
-    private  String  comment;//审核意见
 }

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

@@ -3,13 +3,11 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -600,25 +598,27 @@ public class AcceptanceCheckItem extends BaseEntity {
     /**
      * 逆变器整体图
      */
+    @TableField(value = "overall_image", typeHandler = FastjsonTypeHandler.class)
+    private List<Object> overallImage;
 
-    @TableField(value ="overall_image",typeHandler = FastjsonTypeHandler.class)
-    private List<Object>  overallImage;
     /**
      * 电表箱整体图
      */
-    @TableField(value ="meter_box_overall_image",typeHandler = FastjsonTypeHandler.class)
-    private List<Object>  meterBoxOverallImage;
+    @TableField(value = "meter_box_overall_image", typeHandler = FastjsonTypeHandler.class)
+    private List<Object> meterBoxOverallImage;
+
     /**
      * 组件方阵图
      */
-
     @TableField(value ="assembly_array_image",typeHandler = FastjsonTypeHandler.class)
     private List<Object> assemblyArrayImage;
+
     /**
      * 组件方位角测试照片
      */
-    @TableField(value ="assembly_azimuth_image",typeHandler = FastjsonTypeHandler.class)
+    @TableField(value = "assembly_azimuth_image", typeHandler = FastjsonTypeHandler.class)
     private List<Object> assemblyAzimuthImage;
+
     /**
      * 组件倾斜角测试照片
      */

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

 package com.yeejoin.amos.boot.module.hygf.api.entity;
 
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
@@ -8,9 +7,9 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.apache.ibatis.type.JdbcType;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 验收整改单
@@ -21,7 +20,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_acceptance_rectification_order")
+@TableName(value = "hygf_acceptance_rectification_order", autoResultMap = true)
 public class AcceptanceRectificationOrder extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -96,5 +95,5 @@ public class AcceptanceRectificationOrder extends BaseEntity {
      * 整改照片
      */
 	@TableField(value = "rectification_photo", typeHandler = FastjsonTypeHandler.class)
-    private JSONArray rectificationPhoto;
+    private List<Object> rectificationPhoto;
 }

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

@@ -25,6 +25,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -101,12 +102,19 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
      * 提交整改并触发工作流
      */
 
+    @Transactional
     public AcceptanceRectificationOrderDto updateAndDriveWorkflow(AcceptanceRectificationOrderDto model, String userId) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
         // 提交整改信息
         AcceptanceRectificationOrder entity = new AcceptanceRectificationOrder();
         BeanUtils.copyProperties(model, entity);
+        // 处理负责人姓名
+        FeignClientResult<AgencyUserModel> response = Privilege.agencyUserClient.queryByUserId(entity.getResponsibleUserId().toString());
+        if (response.getStatus() == 200) {
+            AgencyUserModel userModel = response.getResult();
+            entity.setResponsibleUserName(userModel.getRealName());
+        }
         acceptanceRectificationOrderMapper.updateById(entity);
 
         // 如果整改已完成则触发工作流
@@ -131,9 +139,8 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
             standardDto.setVariable(variableDto);
             standardDto.setResult("1");
             BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto, userId);
-            BeanUtils.copyProperties(workBasicGridAcceptance, basicGridAcceptance);
 
-            basicGridAcceptanceMapper.updateById(basicGridAcceptance);
+            basicGridAcceptanceMapper.updateById(workBasicGridAcceptance);
         }
         return model;
     }

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

@@ -74,15 +74,9 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
     @Override
     public Map<String, Object> acceptanceDetails(Long sequenceNbr) {
         Assert.notNull(sequenceNbr, "sequenceNbr不能为空");
-
         BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectById(sequenceNbr);
         Assert.notNull(basicGridAcceptance, "查询验收单不存在");
-
         Map<String, Object> result = new HashMap<>(2);
-        // 基本信息
-
-        result.put("basicInfo", new HashMap<>());
-
         // 检查项信息
         AcceptanceCheckItem acceptanceCheckItem = acceptanceCheckItemMapper.selectOne(
                 Wrappers.<AcceptanceCheckItem>lambdaQuery()
@@ -91,7 +85,6 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         AcceptanceCheckItemDto acceptanceCheckItemDto = new AcceptanceCheckItemDto();
         BeanUtils.copyProperties(acceptanceCheckItem, acceptanceCheckItemDto);
         result.put("checkItem", acceptanceCheckItemDto);
-
         return result;
     }