Skip to content

A
amos-boot-biz
Commit 3bb9b698 authored by KeYong's avatar KeYong
Browse files
Options

Merge branch 'developer' of http://36.40.66.175:5000/moa/amos-boot-biz into developer

# Conflicts: # amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IAcceptanceService.java # amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceServiceImpl.java
parents 7cbb8c7b d5f57d8f
Hide whitespace changes
Inline Side-by-side
Showing with 565 additions and 141 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/AcceptanceStatusEnum.java
View file @ 3bb9b698
......@@ -11,26 +11,26 @@ import lombok.Getter;
@SuppressWarnings("ALL")
public enum AcceptanceStatusEnum {
待提交验收("待提交验收", 1),
待提交验收("待提交验收", "1","","0"),
待投融验收("待投融验收", 2),
待投融验收("待投融验收", "2", "hygf_ys1","0"),
投融验收不通过("投融验收不通过", 3),
投融验收不通过("投融验收不通过", "3", "hygf_ys2","1"),
待法务验收("待法务验收", 4),
待法务验收("待法务验收", "4","hygf_ys2","0"),
法务验收不通过("法务验收不通过", 5),
法务验收不通过("法务验收不通过", "5", "hygf_ys3","1"),
待工程验收("待工程验收", 6),
待工程验收("待工程验收", "6", "hygf_ys3","0"),
工程验收不通过("工程验收不通过", 7),
工程验收不通过("工程验收不通过", "7", "hygf_ys4","1"),
待线下验收("待线下验收", 8),
待线下验收("待线下验收", "8", "hygf_ys5","0"),
线下验收不通过("线下验收不通过", 9),
验收完成("验收完成", 10);
线下验收不通过("线下验收不通过", "9", "hygf_ys6","1"),
验收完成("验收完成", "10", "hygf_ys5","1"),
线下验收完成("验收完成", "10", "hygf_ys6","0");
/**
* 名称，描述
......@@ -39,17 +39,33 @@ public enum AcceptanceStatusEnum {
/**
* 编码
*/
private final int code;
private final String code;
//节点key
private final String key;
//节点key
private final String state;
public static AcceptanceStatusEnum getNodeByCode(int code) {
public static AcceptanceStatusEnum getNodeByCode(String code) {
AcceptanceStatusEnum acceptanceStatusEnum = null;
for (AcceptanceStatusEnum type : AcceptanceStatusEnum.values()) {
if (type.getCode() == code) {
if (code.equals(type.getCode())) {
acceptanceStatusEnum = type;
break;
}
}
return acceptanceStatusEnum;
}
public static String getNodeByKey(String Key,String state) {
AcceptanceStatusEnum acceptanceStatusEnum = null;
for (AcceptanceStatusEnum type : AcceptanceStatusEnum.values()) {
if (type.getKey().contains(Key)&&type.getState().equals(state)) {
acceptanceStatusEnum = type;
break;
}
}
return acceptanceStatusEnum.getCode();
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/BasicGridAcceptancEnum.java 0 → 100644
View file @ 3bb9b698
package com.yeejoin.amos.boot.module.hygf.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @description: 验收状态枚举
*/
@Getter
@AllArgsConstructor
@SuppressWarnings("ALL")
public enum BasicGridAcceptancEnum {
并网管理端工程审核("hygf_bw2", "hygf_bw2"),
经销商工程提交验收("hygf_ys1", "hygf_ys1"),
管理端投融审核("hygf_ys2", "hygf_ys2"),
管理端法务审核("hygf_ys3", "hygf_ys3"),
管理端工程审核("hygf_ys4", "hygf_ys4"),
管理端工程是否线下("hygf_ys5", "hygf_ys5"),
管理端工程线下验("hygf_ys6", "hygf_ys6");
/**
* 名称，描述
*/
private final String rule;
/**
* 编码
*/
private final String code;
public static BasicGridAcceptancEnum getNodeByCode(String code) {
BasicGridAcceptancEnum acceptanceStatusEnum = null;
for (BasicGridAcceptancEnum type : BasicGridAcceptancEnum.values()) {
if (type.getCode() .equals(code) ) {
acceptanceStatusEnum = type;
break;
}
}
return acceptanceStatusEnum;
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/RectificationStatusEnum.java 0 → 100644
View file @ 3bb9b698
package com.yeejoin.amos.boot.module.hygf.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @description: 整改单状态枚举
*/
@Getter
@AllArgsConstructor
@SuppressWarnings("ALL")
public enum RectificationStatusEnum {
待整改("待整改", 1),
整改未完成("整改未完成", 2),
整改已完成("整改已完成", 3);
/**
* 名称，描述
*/
private final String name;
/**
* 编码
*/
private final int code;
public static RectificationStatusEnum getNodeByCode(int code) {
RectificationStatusEnum anEnum = null;
for (RectificationStatusEnum type : RectificationStatusEnum.values()) {
if (type.getCode() == code) {
anEnum = type;
break;
}
}
return anEnum;
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceDto.java
View file @ 3bb9b698
......@@ -60,4 +60,40 @@ public class AcceptanceDto extends BaseDto {
@ApiModelProperty(value = "区域公司名称")
private String regionalCompaniesName;
/**
* 工作流实例ID
*/
private String instanceId;
/// 下一个节点角色权限
private String nextExecutorIds;
// 任务发起人id
private String promoter;
// 流程下一节点id
private String nextTaskId;
//下一节点可执行人逗号分割 0 0
private String nextExecuteUserIds;
//工作流发起人id
private String createUserId;
//下个节点名称
private String nextNodeName;
//下个节点key
private String nextNodeKey;
//并网登记id
private Long fonGridId;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceRectificationOrderDto.java
View file @ 3bb9b698
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.alibaba.fastjson.JSONArray;
import com.fasterxml.jackson.annotation.JsonFormat;
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 org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
......@@ -15,10 +19,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;
......@@ -45,6 +49,7 @@ public class AcceptanceRectificationOrderDto extends BaseDto {
private String rectificationDescription;
@ApiModelProperty(value = "完成日期")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date completeDate;
@ApiModelProperty(value = "负责人ID")
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/StandardDto.java
View file @ 3bb9b698
......@@ -11,7 +11,7 @@ import lombok.Data;
public class StandardDto {
private String comment;//审核备注
private String result;//审核状态值
private String resultCode="approvalStatus";//审核状态key
private String resultCode;//审核状态key
private String taskId; //工作流任务id
private VariableDto variable;//提交表单值
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AcceptanceCheckItem.java
View file @ 3bb9b698
......@@ -617,4 +617,23 @@ public class AcceptanceCheckItem extends BaseEntity {
*/
@TableField("assembly_dip_angle_image")
private String assemblyDipAngleImage;
@TableField(exist = false)
private String approvalStatus;//审核结果,0,1
@TableField(exist = false)
private String operator;//操作人
@TableField(exist = false)
private String operationTime;//操作时间
@TableField(exist = false)
private String comment;//审核意见
//并网审核id
@TableField(exist = false)
private Long basicGridAcceptanceId;
//并网登记id
@TableField(exist = false)
private Long fonGridId;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AcceptanceRectificationOrder.java
View file @ 3bb9b698
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;
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;
/**
......@@ -91,7 +95,6 @@ public class AcceptanceRectificationOrder extends BaseEntity {
/**
* 整改照片
*/
@TableField("rectification_photo")
private String rectificationPhoto;
@TableField(value = "rectification_photo", typeHandler = FastjsonTypeHandler.class)
private JSONArray rectificationPhoto;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/HygfOnGrid.java
View file @ 3bb9b698
......@@ -148,5 +148,6 @@ public class HygfOnGrid extends BaseEntity {
@TableField("grid_connection_time")
private Date gridConnectionTime;
@TableField(exist = false)
private String type;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IAcceptanceService.java
View file @ 3bb9b698
......@@ -26,4 +26,5 @@ public interface IAcceptanceService {
AcceptanceCheckItem saveEntity(AcceptanceCheckItem item, Long sequenceNbr);
public void checkAccept( Long basicGridAcceptanceId ,String userId);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceMapper.xml
View file @ 3bb9b698
......@@ -11,18 +11,44 @@
ph.owners_name AS ownersName,
ph.project_address_name AS projectAddressName,
bga.acceptance_rec_date AS acceptanceRecDate,
bga.acceptance_status AS acceptanceStatus,
CASE WHEN bga.acceptance_status = '1' THEN '待提交验收'
WHEN bga.acceptance_status = '2' THEN '待投融验收'
WHEN bga.acceptance_status = '3' THEN '投融验收不通过'
WHEN bga.acceptance_status = '4' THEN '待法务验收'
WHEN bga.acceptance_status = '5' THEN '法务验收不通过'
WHEN bga.acceptance_status = '6' THEN '待工程验收'
WHEN bga.acceptance_status = '7' THEN '工程验收不通过'
WHEN bga.acceptance_status = '8' THEN '待线下验收'
WHEN bga.acceptance_status = '9' THEN '线下验收不通过'
ELSE '验收完成' END AS acceptanceStatus,
bga.work_order_id workOrderId,
bga.work_order_power_station_id workOrderPowerStationId,
bga.peasant_household_id peasantHouseholdId,
bga.acceptance_rec_date acceptanceRecDate,
bga.instance_id instanceId,
bga.next_executor_ids nextExecutorIds,
bga.next_node_key,
ph.regional_companies_code AS regionalCompaniesCode,
ph.regional_companies_name AS regionalCompaniesName,
ifnull((
SELECT count(1) FROM hygf_acceptance_rectification_order aro WHERE aro.peasant_household_id = bga.peasant_household_id
), 0) AS rectificationOrderCount,
ifnull((
SELECT aro.rectification_status FROM hygf_acceptance_rectification_order aro WHERE aro.peasant_household_id = bga.peasant_household_id ORDER BY rec_date DESC LIMIT 1
SELECT
CASE WHEN aro.rectification_status = '1' THEN '待整改'
WHEN aro.rectification_status = '2' THEN '整改未完成'
WHEN aro.rectification_status = '3' THEN '整改已完成'
ELSE '' END AS rectificationStatus
FROM hygf_acceptance_rectification_order aro WHERE aro.peasant_household_id = bga.peasant_household_id ORDER BY rec_date DESC LIMIT 1
), 0) AS rectificationStatus
FROM
hygf_basic_grid_acceptance bga
LEFT JOIN hygf_peasant_household ph ON ph.sequence_nbr = bga.peasant_household_id
LEFT JOIN hygf_work_order ON hygf_work_order.sequence_nbr = bga.work_order_id
<where>
bga.is_delete = 0
AND bga.acceptance_status IS NOT NULL AND bga.acceptance_status != ''
......@@ -40,7 +66,7 @@
AND ph.peasant_household_no = #{param.powerStationCode}
</if>
<if test="param.acceptanceStatus != null and param.acceptanceStatus != ''">
AND JSON_SEARCH(#{param.acceptanceStatus}, 'ALL', bga.acceptance_status) IS NOT NULL
AND bga.acceptance_status = #{acceptanceStatus}
</if>
<if test="param.startSubmitDate != null and param.startSubmitDate != ''">
AND bga.acceptance_rec_date &gt;= #{param.startSubmitDate}
......@@ -48,12 +74,15 @@
<if test="param.endSubmitDate != null and param.endSubmitDate != ''">
AND bga.acceptance_rec_date &lt;= #{param.endSubmitDate}
</if>
<if test="param.amosDealerId != null and param.amosDealerId != ''">
AND ph.amos_user_id = #{param.amosDealerId}
<if test="param.amosDealerId!=null and param.amosDealerId!=''">
and hygf_work_order.amos_dealer_id = #{param.amosDealerId}
</if>
<if test="param.regionCompanyId != null and param.regionCompanyId != ''">
AND ph.regional_companies_seq = #{param.regionCompanyId}
<if test="param.regionCompanyId!=null and param.regionCompanyId!=''">
and hygf_work_order.region_company_id =#{param.regionCompanyId}
</if>
</if>
</where>
ORDER BY
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceRectificationOrderMapper.xml
View file @ 3bb9b698
......@@ -7,7 +7,13 @@
ph.peasant_household_no as powerStationCode,
ph.owners_name AS ownersName,
ph.project_address_name AS powerStationAddress,
IF(aro.rectification_status IS NULL OR aro.rectification_status = '', 0, 1) AS rectificationStatus
aro.rectification_status AS rectificationStatus,
CASE aro.rectification_status
WHEN 1 THEN '待整改'
WHEN 2 THEN '整改未完成'
WHEN 3 THEN '整改已完成'
ELSE ''
END AS rectificationStatusDesc
FROM
hygf_acceptance_rectification_order aro
LEFT JOIN hygf_basic_grid_acceptance bga ON bga.peasant_household_id = aro.peasant_household_id
......@@ -30,7 +36,13 @@
ph.peasant_household_no as powerStationCode,
ph.owners_name AS ownersName,
ph.project_address_name AS powerStationAddress,
IF(aro.rectification_status IS NULL OR aro.rectification_status = '', 0, 1) AS rectificationStatus
aro.rectification_status AS rectificationStatus,
CASE aro.rectification_status
WHEN 1 THEN '待整改'
WHEN 2 THEN '整改未完成'
WHEN 3 THEN '整改已完成'
ELSE ''
END AS rectificationStatusDesc
FROM
hygf_acceptance_rectification_order aro
LEFT JOIN hygf_basic_grid_acceptance bga ON bga.peasant_household_id = aro.peasant_household_id
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceController.java
View file @ 3bb9b698
......@@ -18,6 +18,7 @@ import com.yeejoin.amos.feign.privilege.model.RoleModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.repository.query.Param;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
......@@ -47,50 +48,12 @@ public class AcceptanceController extends BaseController {
@RequestBody AcceptanceDto param
) {
UserUnitInformationDto userUnitInformationDto = personnelBusinessMapper.getUserUnitInformationDto(getUserInfo().getUserId());
param.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
param.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
// 获取用户权限
Set<String> roles = new HashSet<>();
try {
FeignClientResult<AgencyUserModel> response = Privilege.agencyUserClient.getme();
if (response.getStatus() == 200) {
AgencyUserModel agencyUser = response.getResult();
Map<Long, List<RoleModel>> orgRoles = agencyUser.getOrgRoles();
orgRoles.values().forEach(roleModels -> roles.addAll(roleModels.stream().map(RoleModel::getRoleTypeName).collect(Collectors.toSet())));
} else {
throw new RuntimeException("获取用户权限失败");
}
} catch (RuntimeException e) {
throw new RuntimeException(e.getMessage());
}
Set<String> acceptanceStatusSet = this.getFullAcceptanceStatus();
// 用户光伏-法务：看不到未通过投融审核的电站
if (roles.contains("户用光伏-法务") || roles.contains("户用光伏-经销商-法务")) {
acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待提交验收.getCode()));
acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待投融验收.getCode()));
acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.投融验收不通过.getCode()));
}
// 用户光伏-工程： 看不到未通过法务审核的电站
else if (roles.contains("户用光伏-工程") || roles.contains("户用光伏-经销商-工程")) {
acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待提交验收.getCode()));
acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待投融验收.getCode()));
acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.投融验收不通过.getCode()));
acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.待法务验收.getCode()));
acceptanceStatusSet.remove(String.valueOf(AcceptanceStatusEnum.法务验收不通过.getCode()));
if(userUnitInformationDto!=null){
param.setRegionCompanyId(userUnitInformationDto.getRegionalCompaniesSeq());
param.setAmosDealerId(userUnitInformationDto.getAmosDealerId());
}
IPage<AcceptanceDto> page = new Page<>(current, size);
if (StringUtils.hasText(param.getAcceptanceStatus())) {
if (acceptanceStatusSet.contains(param.getAcceptanceStatus())) {
acceptanceStatusSet = new HashSet<>(Collections.singletonList(param.getAcceptanceStatus()));
} else {
return ResponseHelper.buildResponse(page);
}
}
param.setAcceptanceStatus(String.join(",", acceptanceStatusSet));
page = acceptanceService.page(page, param);
return ResponseHelper.buildResponse(page);
......@@ -103,13 +66,7 @@ public class AcceptanceController extends BaseController {
return ResponseHelper.buildResponse(acceptanceService.acceptanceDetails(sequenceNbr));
}
private Set<String> getFullAcceptanceStatus() {
String[] array = new String[AcceptanceStatusEnum.验收完成.getCode() + 1];
for (int i = AcceptanceStatusEnum.待提交验收.getCode(); i <= AcceptanceStatusEnum.验收完成.getCode(); i++) {
array[i] = String.valueOf(i);
}
return Arrays.stream(array).filter(Objects::nonNull).collect(Collectors.toSet());
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
......@@ -118,4 +75,12 @@ public class AcceptanceController extends BaseController {
return ResponseHelper.buildResponse(acceptanceService.saveEntity(model, sequenceNbr));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/checkAccept")
@ApiOperation(httpMethod = "POST", value = "提交验收", notes = "提交验收")
public ResponseModel checkAccept(@RequestParam Long basicGridAcceptanceId) {
acceptanceService.checkAccept(basicGridAcceptanceId,getUserId());
return ResponseHelper.buildResponse(null);
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceRectificationOrderController.java
View file @ 3bb9b698
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,getUserId()));
}
/**
......@@ -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/controller/BasicGridAcceptanceController.java
View file @ 3bb9b698
......@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.GridStatusEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.ProcessDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.StartProcessDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
......@@ -80,7 +81,7 @@ public class BasicGridAcceptanceController extends BaseController {
@PostMapping(value = "/save/commit")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel saveAndCommit(@RequestBody HygfOnGrid dto) {
return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.saveAndCommit(dto));
return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.saveAndCommit(dto,getUserId()));
}
/**
......@@ -170,6 +171,11 @@ public class BasicGridAcceptanceController extends BaseController {
return ResponseHelper.buildResponse(page);
}
/**
* 列表全部数据查询
*
......@@ -183,6 +189,17 @@ public class BasicGridAcceptanceController extends BaseController {
}
//并网审核
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/execute")
@ApiOperation(httpMethod = "POST", value = "执行工作流", notes = "执行工作流")
public ResponseModel execute(@RequestBody AcceptanceCheckItem dto) {
basicGridAcceptanceServiceImpl.execute(dto,getUserId());
return ResponseHelper.buildResponse(null);
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/feign/WorkflowFeignClient.java
View file @ 3bb9b698
......@@ -92,7 +92,7 @@ public interface WorkflowFeignClient {
*
* */
@RequestMapping(value = "/v2/task/complete/standard/{taskId}", method = RequestMethod.POST)
FeignClientResult<List<ProcessTaskDTO>> standard( @PathVariable(value = "taskId") String taskId ,@RequestBody StandardDto standardDto);
FeignClientResult<ProcessTaskDTO> standard( @PathVariable(value = "taskId") String taskId ,@RequestBody StandardDto standardDto);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceRectificationOrderServiceImpl.java
View file @ 3bb9b698
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.alibaba.fastjson.JSONObject;
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.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
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.dto.VariableDto;
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.foundation.context.RequestContext;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/**
......@@ -21,27 +35,86 @@ 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;
@Autowired
private RedisUtils redisUtils;
/**
* 分页查询
*/
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;
public Page<AcceptanceRectificationOrderDto> queryForAcceptanceRectificationOrderPage(Page<AcceptanceRectificationOrderDto> page, Long acceptanceSeqNbr) {
return acceptanceRectificationOrderMapper.page(page, acceptanceSeqNbr);
}
/**
* 列表查询 示例
*/
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, 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);
acceptanceRectificationOrderMapper.updateById(entity);
// 触发工作流
BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectOne(
Wrappers.<BasicGridAcceptance>lambdaQuery()
.eq(BasicGridAcceptance::getPeasantHouseholdId, entity.getPeasantHouseholdId())
);
basicGridAcceptance.setAcceptanceStatus(String.valueOf(Integer.parseInt(basicGridAcceptance.getAcceptanceStatus()) - 1));
StandardDto standardDto = new StandardDto();
standardDto.setTaskId(basicGridAcceptance.getNextTaskId());
// VariableDto variableDto = new VariableDto();
// variableDto.setComment("approval");
// variableDto.setOperator(reginParams.getUserModel().getUserId());
// variableDto.setApprovalStatus("1");
// variableDto.setOperationTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
// standardDto.setResultCode(basicGridAcceptance.getNextTaskId());
// standardDto.setVariable(variableDto);
// standardDto.setResult("1");
BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto,userId);
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/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceServiceImpl.java
View file @ 3bb9b698
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yeejoin.amos.boot.module.hygf.api.Enum.AcceptanceStatusEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationStatusEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceCheckItemDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.StandardDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckItemMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
......@@ -32,8 +34,11 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
@Autowired
private BasicGridAcceptanceMapper basicGridAcceptanceMapper;
@Autowired
private PeasantHouseholdMapper peasantHouseholdMapper;
@Autowired
private AcceptanceCheckItemMapper acceptanceCheckItemMapper;
@Autowired
WorkflowImpl workflow;
/**
* 分页查询验收列表数据
*
......@@ -44,13 +49,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
@Override
public IPage<AcceptanceDto> page(IPage<AcceptanceDto> page, AcceptanceDto acceptanceDto) {
if (Objects.nonNull(acceptanceDto)) {
// 处理验收状态
if (StringUtils.hasText(acceptanceDto.getAcceptanceStatus())) {
String[] vars = acceptanceDto.getAcceptanceStatus().split(",");
JSONArray jsonArray = new JSONArray();
jsonArray.addAll(Arrays.asList(vars));
acceptanceDto.setAcceptanceStatus(jsonArray.toJSONString());
}
// 处理提交日期
if (Objects.nonNull(acceptanceDto.getAcceptanceRecDate()) && acceptanceDto.getAcceptanceRecDate() instanceof List) {
Object acceptanceRecDate = acceptanceDto.getAcceptanceRecDate();
......@@ -62,11 +61,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
}
}
IPage<AcceptanceDto> resultPage = acceptanceMapper.page(page, acceptanceDto);
resultPage.getRecords().forEach(v -> {
AcceptanceStatusEnum statusEnum = AcceptanceStatusEnum.getNodeByCode(Integer.parseInt(v.getAcceptanceStatus()));
v.setAcceptanceStatusDesc(statusEnum.getName());
v.setRectificationStatusDesc("0".equals(v.getAcceptanceStatus()) ? "待整改" : "整改完成");
});
return resultPage;
}
......@@ -91,7 +86,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
// 检查项信息
AcceptanceCheckItem acceptanceCheckItem = acceptanceCheckItemMapper.selectOne(
Wrappers.<AcceptanceCheckItem>lambdaQuery()
.eq(AcceptanceCheckItem::getWorkOrderPowerStationId, basicGridAcceptance.getWorkOrderPowerStationId())
.eq(AcceptanceCheckItem::getPeasantHouseholdId, basicGridAcceptance.getPeasantHouseholdId())
);
AcceptanceCheckItemDto acceptanceCheckItemDto = new AcceptanceCheckItemDto();
BeanUtils.copyProperties(acceptanceCheckItem, acceptanceCheckItemDto);
......@@ -110,5 +105,17 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
acceptanceCheckItemMapper.insert(item);
return Optional.ofNullable(item).orElse(new AcceptanceCheckItem());
}
@Override
@Transactional
public void checkAccept( Long basicGridAcceptanceId ,String userId){
BasicGridAcceptance basicGridAcceptanc= basicGridAcceptanceMapper.selectById(basicGridAcceptanceId);
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.待投融验收.getCode());
//执行工作流
StandardDto standardDto=new StandardDto();
standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());
workflow.standard(basicGridAcceptanc,standardDto,userId);
basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java
View file @ 3bb9b698
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.module.hygf.api.Enum.AcceptanceStatusEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.BasicGridAcceptancEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.GridStatusEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.ProcessDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.StartProcessDto;
import com.yeejoin.amos.boot.module.hygf.api.Enum.WorkOrderEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheckItem;
import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckItemMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.HygfOnGridMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
......@@ -24,6 +28,8 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@Slf4j
......@@ -39,6 +45,11 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
PersonnelBusinessMapper personnelBusinessMapper;
@Autowired
WorkflowImpl workflow;
@Autowired
AcceptanceCheckItemMapper acceptanceCheckItemMapper;
private final String OK ="0";
private final String PASS ="1";
public Page<BasicGridAcceptanceDto> selectPage(Long regionCompanyId ,Long amosDealerId ,int current, int size, String projectAddress, String powerStationCode, String ownersName, String gridStatus, Date gridConnectionTime, String formType) {
PageHelper.startPage(current, size);
......@@ -71,20 +82,29 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
return grid;
}
@Transactional
public HygfOnGrid saveAndCommit(HygfOnGrid grid) {
public HygfOnGrid saveAndCommit(HygfOnGrid grid,String userId) {
BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectOne(new LambdaQueryWrapper<BasicGridAcceptance>().eq(BasicGridAcceptance::getWorkOrderPowerStationId, grid.getWorkOrderPowerStationId()));
basicGridAcceptance.setGridStatus(GridStatusEnum.DSH.getCode());
// 调用工作流执行第一个节点
ProcessDto processDto = new ProcessDto();
processDto.setBusinessKey(String.valueOf(basicGridAcceptance.getSequenceNbr()));
StartProcessDto startProcessDto = new StartProcessDto();
List<ProcessDto> process=new ArrayList<>();
process.add(processDto);
startProcessDto.setProcess(process);
BasicGridAcceptance workBasicGridAcceptance = workflow.startProcess(basicGridAcceptance, startProcessDto);
BeanUtils.copyProperties(workBasicGridAcceptance, basicGridAcceptance);
if(grid.getType()!=null&&"1".equals(grid.getType())){
//执行工作流
StandardDto standardDto=new StandardDto();
standardDto.setTaskId(basicGridAcceptance.getNextTaskId());
workflow.standard(basicGridAcceptance,standardDto,userId);
}else{
// 调用工作流执行第一个节点
ProcessDto processDto = new ProcessDto();
processDto.setBusinessKey(String.valueOf(basicGridAcceptance.getSequenceNbr()));
StartProcessDto startProcessDto = new StartProcessDto();
List<ProcessDto> process=new ArrayList<>();
process.add(processDto);
startProcessDto.setProcess(process);
workflow.startProcess(basicGridAcceptance, startProcessDto,userId);
}
if(grid.getSequenceNbr()!=null){
onGridMapper.updateById(grid);
}else{
......@@ -120,4 +140,57 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
}
@Transactional
public void execute(AcceptanceCheckItem dto,String userId){
//查询并网审批信息
BasicGridAcceptance basicGridAcceptanc= basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
if(OK.equals(dto.getApprovalStatus())){
if( BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(basicGridAcceptanc.getNextNodeKey())){
basicGridAcceptanc.setGridStatus(GridStatusEnum.YWC.getCode());
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.待提交验收.getCode());
//并网时间
LambdaUpdateWrapper<HygfOnGrid> upq=new LambdaUpdateWrapper();
upq.eq(HygfOnGrid::getSequenceNbr,dto.getFonGridId());
upq.set(HygfOnGrid::getGridConnectionTime, new Date());
onGridMapper.update(null,upq);
}else{
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(basicGridAcceptanc.getNextNodeKey(),dto.getApprovalStatus()));
}
}else{
if( BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(basicGridAcceptanc.getNextNodeKey())){
basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode());
}else{
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());
standardDto.setResult(dto.getApprovalStatus());
standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());
VariableDto variable=new VariableDto();
variable.setApprovalStatus(dto.getApprovalStatus());
variable.setComment(dto.getComment());
variable.setOperationTime(dto.getOperationTime());
variable.setOperator(dto.getOperator());
standardDto.setVariable(variable);
BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptanc,standardDto,userId);
basicGridAcceptanceMapper.updateById(workBasicGridAcceptance);
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkflowImpl.java
View file @ 3bb9b698
......@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.jsf.el.SpringBeanFacesELResolver;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -41,9 +42,9 @@ public class WorkflowImpl {
* **/
public BasicGridAcceptance startProcess(BasicGridAcceptance basicGridAcceptance,StartProcessDto startProcessDto){
public BasicGridAcceptance startProcess(BasicGridAcceptance basicGridAcceptance,StartProcessDto startProcessDto,String userid){
FeignClientResult<List<ProcessTaskDTO>> json= workflowFeignClient.startProcess(startProcessDto);
basicGridAcceptance= this.getBasicGridAcceptance(basicGridAcceptance,json);
basicGridAcceptance= this.getBasicGridAcceptance(basicGridAcceptance,json,userid);
return basicGridAcceptance;
}
......@@ -52,29 +53,33 @@ public class WorkflowImpl {
* 执行工作流
*
* */
public BasicGridAcceptance standard(BasicGridAcceptance basicGridAcceptance,StandardDto standardDto){
public BasicGridAcceptance standard(BasicGridAcceptance basicGridAcceptance,StandardDto standardDto,String userid){
FeignClientResult<ProcessTaskDTO> json=null;
if(standardDto.getResult()!=null){
standardDto.setResultCode("approvalStatus");
json= workflowFeignClient.standard(standardDto.getTaskId(),standardDto);
}else{
json= workflowFeignClient.standard(standardDto.getTaskId(),standardDto);
}
FeignClientResult<List<ProcessTaskDTO>> json= workflowFeignClient.standard(standardDto.getTaskId(),standardDto);
basicGridAcceptance= this.getBasicGridAcceptance(basicGridAcceptance,json);
basicGridAcceptance= this.getBasicGridAcceptanceone(basicGridAcceptance,json,userid);
return basicGridAcceptance;
}
public BasicGridAcceptance getBasicGridAcceptance(BasicGridAcceptance basicGridAcceptance,FeignClientResult<List<ProcessTaskDTO>> json){
public BasicGridAcceptance getBasicGridAcceptance(BasicGridAcceptance basicGridAcceptance,FeignClientResult<List<ProcessTaskDTO>> json,String userid){
if (!ObjectUtils.isEmpty(json)) {
if (json.getStatus() == 200) {
List<ProcessTaskDTO> lis = json.getResult();
ProcessTaskDTO listco= lis.get(0);
ProcessTaskDTO listco= lis.isEmpty()?null:lis.get(0);
if(listco!=null){
/**
* 工作流实例ID
*/
basicGridAcceptance.setInstanceId(listco.getProcessInstance().getId());
// 当前节点执行任务id
basicGridAcceptance.setPromoter(listco.getExecutor().getUserId());
basicGridAcceptance.setPromoter(userid);
//流程实例
basicGridAcceptance.setInstanceId(listco.getProcessInstance().getId());
// 流程下一节点id
if(listco.getNextTask()!=null&&!listco.getNextTask().isEmpty()){
basicGridAcceptance.setNextTaskId(listco.getNextTask().get(0).getId());
......@@ -118,6 +123,8 @@ public class WorkflowImpl {
//工作流发起人id
basicGridAcceptance.setCreateUserId(listco.getStartUser().getUserId());
}else{
throw new RuntimeException("工作流异常");
}
} else {
throw new RuntimeException(json.getMessage());
......@@ -126,6 +133,65 @@ public class WorkflowImpl {
return basicGridAcceptance;
}
public BasicGridAcceptance getBasicGridAcceptanceone(BasicGridAcceptance basicGridAcceptance,FeignClientResult<ProcessTaskDTO> json,String userid){
if (!ObjectUtils.isEmpty(json)) {
if (json.getStatus() == 200) {
ProcessTaskDTO listco = json.getResult();
if(listco!=null){
// 当前节点执行任务id
basicGridAcceptance.setPromoter(userid);
// 流程下一节点id
if(listco.getNextTask()!=null&&!listco.getNextTask().isEmpty()){
basicGridAcceptance.setNextTaskId(listco.getNextTask().get(0).getId());
//下个节点名称
basicGridAcceptance.setNextNodeName(listco.getNextTask().get(0).getName());
//下个节点key
basicGridAcceptance.setNextNodeKey(listco.getNextTask().get(0).getKey());
}
/// 下一个节点角色权限
if(listco.getNextCandidateGroups()!=null){
List<String> ld= listco.getNextCandidateGroups().get(basicGridAcceptance.getNextTaskId());
StringBuffer sbf = new StringBuffer();
for(int i=0;i<=ld.size()-1;i++){
if(i<ld.size()-1){
sbf.append(ld.get(i) + ",");
}else {
sbf.append(ld.get(i));
}
}
basicGridAcceptance.setNextExecutorIds(sbf.toString());
}
//下一节点可执行人逗号分割 0 0
if(listco.getNextTaskExecutor()!=null){
List<AgencyUserModel> li= listco.getNextTaskExecutor().get(basicGridAcceptance.getNextTaskId());
if(li!=null&&!li.isEmpty()){
StringBuffer sbf = new StringBuffer();
for(int i=0;i<=li.size()-1;i++){
if(i<li.size()-1){
sbf.append(li.get(i).getUserId() + ",");
}else {
sbf.append(li.get(i).getUserId());
}
}
basicGridAcceptance.setNextExecuteUserIds(sbf.toString());
}
}
}
} else {
throw new RuntimeException(json.getMessage());
}
}
return basicGridAcceptance;
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties
View file @ 3bb9b698
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment