解决冲突

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.alibaba.fastjson.JSONArray;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -15,10 +17,10 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="AcceptanceRectificationOrderDto", description="验收整改单")
-public class AcceptanceRectificationOrderDto  extends BaseDto {
+@ApiModel(value = "AcceptanceRectificationOrderDto", description = "验收整改单")
+public class AcceptanceRectificationOrderDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "整改单号")
     private String rectificationOrderCode;
@@ -57,7 +59,7 @@ public class AcceptanceRectificationOrderDto  extends BaseDto {
     private String responsibleUserPhone;
 
     @ApiModelProperty(value = "整改照片")
-    private String rectificationPhoto;
+    private JSONArray rectificationPhoto;
 
     @ApiModelProperty(value = "电站编号")
     private String powerStationCode;

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.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -86,7 +87,7 @@ public class AcceptanceRectificationOrder extends BaseEntity {
      * 负责人电话
      */
 	@TableField("responsible_user_phone")
-    private String responsibleUserPhone;
+    private JSONArray responsibleUserPhone;
 
     /**
      * 整改照片

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.AcceptanceRectificationOrderServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -53,9 +59,9 @@ public class AcceptanceRectificationOrderController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新验收整改单", notes = "根据sequenceNbr更新验收整改单")
-	public ResponseModel<AcceptanceRectificationOrderDto> updateBySequenceNbrAcceptanceRectificationOrder(@RequestBody AcceptanceRectificationOrderDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<AcceptanceRectificationOrderDto> updateBySequenceNbrAcceptanceRectificationOrder(@PathVariable(value = "sequenceNbr") Long sequenceNbr, @RequestBody AcceptanceRectificationOrderDto model) {
 	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.updateWithModel(model));
+	    return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.updateAndDriveWorkflow(model));
 	}
 
 	/**
@@ -114,4 +120,14 @@ public class AcceptanceRectificationOrderController extends BaseController {
 	public ResponseModel<List<AcceptanceRectificationOrderDto>> selectForList() {
 	    return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.queryForAcceptanceRectificationOrderList());
 	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "获取整改单负责人列表",   notes = "获取整改单负责人列表")
+	@GetMapping(value = "/directors")
+	public ResponseModel<List<AgencyUserModel>> directors() {
+		ReginParams reginParams = getSelectedOrgInfo();
+		AtomicLong companyId = new AtomicLong();
+		reginParams.getUserModel().getCompanys().stream().findFirst().ifPresent(company -> companyId.set(company.getSequenceNbr()));
+		return ResponseHelper.buildResponse(acceptanceRectificationOrderServiceImpl.queryDirectors(companyId.get()));
+	}
 }

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceRectificationOrderDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.StandardDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceRectificationOrder;
+import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceRectificationOrderMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceRectificationOrderService;
-import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceRectificationOrderDto;
-import org.checkerframework.checker.units.qual.A;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
 
 /**
@@ -21,14 +27,20 @@ import java.util.List;
  * @date 2024-01-16
  */
 @Service
-public class AcceptanceRectificationOrderServiceImpl extends BaseService<AcceptanceRectificationOrderDto,AcceptanceRectificationOrder,AcceptanceRectificationOrderMapper> implements IAcceptanceRectificationOrderService {
+public class AcceptanceRectificationOrderServiceImpl extends BaseService<AcceptanceRectificationOrderDto, AcceptanceRectificationOrder, AcceptanceRectificationOrderMapper> implements IAcceptanceRectificationOrderService {
     @Autowired
     private AcceptanceRectificationOrderMapper acceptanceRectificationOrderMapper;
+    @Value("${hygf.role.gc.roleSeq}")
+    private String hygfGcRoleSeq;
+    @Autowired
+    private BasicGridAcceptanceMapper basicGridAcceptanceMapper;
+    @Autowired
+    private WorkflowImpl workflow;
 
     /**
      * 分页查询
      */
-    public Page<AcceptanceRectificationOrderDto> queryForAcceptanceRectificationOrderPage(Page<AcceptanceRectificationOrderDto> page, Long acceptanceSeqNbr)   {
+    public Page<AcceptanceRectificationOrderDto> queryForAcceptanceRectificationOrderPage(Page<AcceptanceRectificationOrderDto> page, Long acceptanceSeqNbr) {
         Page<AcceptanceRectificationOrderDto> resultPage = acceptanceRectificationOrderMapper.page(page, acceptanceSeqNbr);
         resultPage.getRecords().forEach(v -> v.setRectificationStatusDesc("0".equals(v.getRectificationStatus()) ? "待整改" : "整改完成"));
         return resultPage;
@@ -37,11 +49,51 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
     /**
      * 列表查询 示例
      */
-    public List<AcceptanceRectificationOrderDto> queryForAcceptanceRectificationOrderList()   {
-        return this.queryForList("" , false);
+    public List<AcceptanceRectificationOrderDto> queryForAcceptanceRectificationOrderList() {
+        return this.queryForList("", false);
     }
 
     public AcceptanceRectificationOrderDto queryBySequenceNbr(Long sequenceNbr) {
         return acceptanceRectificationOrderMapper.queryBySequenceNbr(sequenceNbr);
     }
+
+    /**
+     * 查询负责人列表(经销商工程角色)
+     */
+    public List<AgencyUserModel> queryDirectors(Long companyId) {
+        try {
+            FeignClientResult<List<AgencyUserModel>> response = Privilege.agencyUserClient.queryByCompanyRoles(companyId, hygfGcRoleSeq, null, "UNLOCK");
+            if (response.getStatus() == 200) {
+                return response.getResult();
+            } else {
+                throw new RuntimeException(response.getMessage());
+            }
+        } catch (RuntimeException e) {
+            throw new RuntimeException(e.getMessage());
+        }
+    }
+
+    /**
+     * 提交整改并触发工作流
+     */
+    public AcceptanceRectificationOrderDto updateAndDriveWorkflow(AcceptanceRectificationOrderDto model) {
+        // 提交整改信息
+        AcceptanceRectificationOrder entity = new AcceptanceRectificationOrder();
+        BeanUtils.copyProperties(model, entity);
+        acceptanceRectificationOrderMapper.updateById(entity);
+
+        // 触发工作流
+        BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectOne(
+                Wrappers.<BasicGridAcceptance>lambdaQuery()
+                        .eq(BasicGridAcceptance::getWorkOrderPowerStationId, entity.getWorkOrderPowerStationId())
+        );
+        basicGridAcceptance.setAcceptanceStatus(String.valueOf(Integer.parseInt(basicGridAcceptance.getAcceptanceStatus()) - 1));
+        StandardDto standardDto = new StandardDto();
+        // TODO: standardDto setter
+        BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto);
+        BeanUtils.copyProperties(workBasicGridAcceptance, basicGridAcceptance);
+
+        basicGridAcceptanceMapper.updateById(basicGridAcceptance);
+        return null;
+    }
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -158,7 +158,7 @@ unitInfo.station.examine.planId=51776087-a9cf-4a87-9a03-24fd24a8cf45
 
 hygf.sms.tempCodeJXS=SMS_HYGF_0002
 
-
+hygf.role.gc.roleSeq=1702550832882413570
 
 # 锟矫伙拷锟斤拷userGroupId
 hygf.user.group.id=1702512164058718210