Skip to content

A
amos-boot-biz
Commit 22755b5b authored by KeYong's avatar KeYong
Browse files
Options

Merge remote-tracking branch 'origin/developer' into developer

# Conflicts: # amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceCheckItemDto.java # amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AcceptanceCheckItem.java
parents 74278ca9 9aa4f455
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 64 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 @ 22755b5b
......@@ -25,6 +25,8 @@ public enum AcceptanceStatusEnum {
工程验收不通过("工程验收不通过", "7", "hygf_ys4","1"),
是否线下验收("是否线下验收", "11", "hygf_ys4","0"),
待线下验收("待线下验收", "8", "hygf_ys5","0"),
线下验收不通过("线下验收不通过", "9", "hygf_ys6","1"),
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceCheckItemDto.java
View file @ 22755b5b
......@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import java.util.Date;
/**
* 验收检查项
*/
......@@ -526,4 +528,5 @@ public class AcceptanceCheckItemDto extends BaseDto {
//并网登记id
private Long fonGridId;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceDto.java
View file @ 22755b5b
......@@ -90,7 +90,11 @@ public class AcceptanceDto extends BaseDto {
private Long fonGridId;
private Long workOrderId;
private Long workOrderPowerStationId;
private Long peasantHouseholdId;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/AcceptanceCheckItem.java
View file @ 22755b5b
......@@ -16,7 +16,7 @@ import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName(value = "hygf_acceptance_check_item", autoResultMap = true)
@TableName(value = "hygf_acceptance_check_item",autoResultMap = true)
public class AcceptanceCheckItem extends BaseEntity {
private static final long serialVersionUID = 1L;
......@@ -600,40 +600,51 @@ public class AcceptanceCheckItem extends BaseEntity {
*/
@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 = "assembly_array_image", typeHandler = FastjsonTypeHandler.class)
@TableField(value ="assembly_array_image",typeHandler = FastjsonTypeHandler.class)
private List<Object> assemblyArrayImage;
/**
* 组件方位角测试照片
*/
@TableField(value = "assembly_azimuth_image", typeHandler = FastjsonTypeHandler.class)
private List<Object> assemblyAzimuthImage;
/**
* 组件倾斜角测试照片
*/
@TableField(value = "assembly_dip_angle_image", typeHandler = FastjsonTypeHandler.class)
@TableField(value ="assembly_dip_angle_image",typeHandler = FastjsonTypeHandler.class)
private List<Object> assemblyDipAngleImage;
@TableField(exist = false)
@TableField("approval_status")
private String approvalStatus;//审核结果,0,1
@TableField(exist = false)
@TableField("operator")
private String operator;//操作人
@TableField(exist = false)
private String operationTime;//操作时间
@TableField(exist = false)
@TableField("operation_time")
private String operationTime;//操作时间
@TableField("comment")
private String comment;//审核意见
//并网审核id
@TableField(exist = false)
private Long basicGridAcceptanceId;
@TableField(exist = false)
private String approvalStatusxx;//,0,1
//并网登记id
@TableField(exist = false)
private Long fonGridId;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceMapper.xml
View file @ 22755b5b
......@@ -21,6 +21,8 @@
WHEN bga.acceptance_status = '7' THEN '工程验收不通过'
WHEN bga.acceptance_status = '8' THEN '待线下验收'
WHEN bga.acceptance_status = '9' THEN '线下验收不通过'
WHEN bga.acceptance_status = '11' THEN '是否线下验收'
ELSE '验收完成' END AS acceptanceStatus,
bga.work_order_id workOrderId,
......@@ -29,7 +31,7 @@
bga.acceptance_rec_date acceptanceRecDate,
bga.instance_id instanceId,
bga.next_executor_ids nextExecutorIds,
bga.next_node_key,
bga.next_node_key nextNodeKey,
ph.regional_companies_code AS regionalCompaniesCode,
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceRectificationOrderMapper.xml
View file @ 22755b5b
......@@ -4,6 +4,7 @@
<select id="page" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceRectificationOrderDto">
SELECT
aro.sequence_nbr AS sequenceNbr,
bga.work_order_power_station_id AS workOrderPowerStationId,
ph.peasant_household_no as powerStationCode,
ph.owners_name AS ownersName,
ph.project_address_name AS powerStationAddress,
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml
View file @ 22755b5b
......@@ -22,7 +22,7 @@
hbga.acceptance_rec_date acceptanceRecDate,
hbga.instance_id instanceId,
hbga.next_executor_ids nextExecutorIds,
hbga.next_node_key,
hbga.next_node_key nextNodeKey,
hph.owners_name AS ownersName,
hph.peasant_household_no peasantHouseholdNo,
hph.project_address_name projectAddressName,
......
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 @ 22755b5b
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
......@@ -9,6 +8,7 @@ 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.Enum.RectificationStatusEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceRectificationOrderDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.FileItemDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.StandardDto;
......@@ -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,6 +102,7 @@ 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);
......@@ -109,28 +111,31 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
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));
// 如果整改已完成则触发工作流
String status = entity.getRectificationStatus();
if (String.valueOf(RectificationStatusEnum.整改已完成.getCode()).equals(status)) {
BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectOne(
Wrappers.<BasicGridAcceptance>lambdaQuery()
.eq(BasicGridAcceptance::getPeasantHouseholdId, entity.getPeasantHouseholdId())
);
StandardDto standardDto = new StandardDto();
basicGridAcceptance.setAcceptanceStatus(String.valueOf(Integer.parseInt(basicGridAcceptance.getAcceptanceStatus()) - 1));
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);
StandardDto standardDto = new StandardDto();
basicGridAcceptanceMapper.updateById(basicGridAcceptance);
return null;
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("approvalStatus");
standardDto.setVariable(variableDto);
standardDto.setResult("1");
BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto, userId);
basicGridAcceptanceMapper.updateById(workBasicGridAcceptance);
}
return model;
}
}
\ 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 @ 22755b5b
......@@ -103,6 +103,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
public void checkAccept( Long basicGridAcceptanceId ,String userId){
BasicGridAcceptance basicGridAcceptanc= basicGridAcceptanceMapper.selectById(basicGridAcceptanceId);
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.待投融验收.getCode());
basicGridAcceptanc.setAcceptanceRecDate(new Date());
//执行工作流
StandardDto standardDto=new StandardDto();
standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());
......
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 @ 22755b5b
......@@ -5,19 +5,10 @@ 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.Enum.WorkOrderEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
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;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.service.IBasicGridAcceptanceService;
import com.yeejoin.amos.boot.module.hygf.api.service.IHygfOnGridService;
import lombok.extern.slf4j.Slf4j;
......@@ -26,8 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.typroject.tyboot.core.foundation.utils.DateUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
......@@ -47,6 +40,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
WorkflowImpl workflow;
@Autowired
AcceptanceCheckItemMapper acceptanceCheckItemMapper;
@Autowired
AcceptanceRectificationOrderMapper acceptanceRectificationOrderMapper;
private final String OK ="0";
private final String PASS ="1";
......@@ -141,52 +136,95 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
@Transactional
public void execute(AcceptanceCheckItem dto,String userId){
public void execute(AcceptanceCheckItem dto,String userId) {
//查询并网审批信息
BasicGridAcceptance basicGridAcceptanc= basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
if(OK.equals(dto.getApprovalStatus())){
if( BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(basicGridAcceptanc.getNextNodeKey())){
BasicGridAcceptance basicGridAcceptanc = basicGridAcceptanceMapper.selectById(dto.getBasicGridAcceptanceId());
String nextNodeKey = basicGridAcceptanc.getNextNodeKey();
if (OK.equals(dto.getApprovalStatus())) {
if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
basicGridAcceptanc.setGridStatus(GridStatusEnum.YWC.getCode());
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.待提交验收.getCode());
//并网时间
LambdaUpdateWrapper<HygfOnGrid> upq=new LambdaUpdateWrapper();
upq.eq(HygfOnGrid::getSequenceNbr,dto.getFonGridId());
LambdaUpdateWrapper<HygfOnGrid> upq = new LambdaUpdateWrapper();
upq.eq(HygfOnGrid::getSequenceNbr, dto.getFonGridId());
upq.set(HygfOnGrid::getGridConnectionTime, new Date());
onGridMapper.update(null,upq);
}else{
onGridMapper.update(null, upq);
} else {
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(basicGridAcceptanc.getNextNodeKey(),dto.getApprovalStatus()));
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
}
}else{
if( BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(basicGridAcceptanc.getNextNodeKey())){
} else {
if (BasicGridAcceptancEnum.并网管理端工程审核.getCode().equals(nextNodeKey)) {
basicGridAcceptanc.setGridStatus(GridStatusEnum.WTG.getCode());
}else{
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(basicGridAcceptanc.getNextNodeKey(),dto.getApprovalStatus()));
}
// 投融/法务/工程/线下验收审核不通过
else if (PASS.equals(dto.getApprovalStatus()) && (
BasicGridAcceptancEnum.管理端投融审核.getCode().equals(nextNodeKey) ||
BasicGridAcceptancEnum.管理端法务审核.getCode().equals(nextNodeKey) ||
BasicGridAcceptancEnum.管理端工程审核.getCode().equals(nextNodeKey) ||
BasicGridAcceptancEnum.管理端工程是否线下.getCode().equals(nextNodeKey)
)) {
AcceptanceRectificationOrder rectificationOrder = new AcceptanceRectificationOrder();
try {
rectificationOrder.setRectificationOrderCode("ZGD" + DateUtil.formatDate(new Date(), DateUtil.YMDHM));
rectificationOrder.setWorkOrderId(basicGridAcceptanc.getWorkOrderId());
rectificationOrder.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId());
rectificationOrder.setPeasantHouseholdId(basicGridAcceptanc.getPeasantHouseholdId());
rectificationOrder.setProblemDescription(dto.getComment());
rectificationOrder.setRectificationStatus(String.valueOf(RectificationStatusEnum.待整改.getCode()));
} catch (Exception e) {
throw new RuntimeException(e);
}
acceptanceRectificationOrderMapper.insert(rectificationOrder);
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
} else {
basicGridAcceptanc.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(nextNodeKey, dto.getApprovalStatus()));
}
}
if(basicGridAcceptanc.getNextNodeKey().equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())){
if (nextNodeKey.equals(BasicGridAcceptancEnum.管理端工程线下验.getCode())) {
dto.setWorkOrderId(basicGridAcceptanc.getWorkOrderId());
dto.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId());
dto.setPeasantHouseholdId(basicGridAcceptanc.getPeasantHouseholdId());
acceptanceCheckItemMapper.insert(dto);
}
//执行工作流
StandardDto standardDto=new StandardDto();
StandardDto standardDto = new StandardDto();
standardDto.setComment(dto.getComment());
standardDto.setResult(dto.getApprovalStatus());
standardDto.setTaskId(basicGridAcceptanc.getNextTaskId());
VariableDto variable=new VariableDto();
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);
BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptanc, standardDto, userId);
// if( BasicGridAcceptancEnum.管理端工程审核.getCode().equals(old)){
//
// //是否线下验收
// if(dto.getApprovalStatusxx().equals("0")){
// workBasicGridAcceptance.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(workBasicGridAcceptance.getNextNodeKey(),"0"));
// }else{
// workBasicGridAcceptance.setAcceptanceStatus(AcceptanceStatusEnum.getNodeByKey(workBasicGridAcceptance.getNextNodeKey(),"1"));
// }
// //执行工作流
// StandardDto standardDto1=new StandardDto();
// standardDto1.setComment(dto.getComment());
// standardDto1.setResult(dto.getApprovalStatusxx());
// standardDto1.setTaskId(workBasicGridAcceptance.getNextTaskId());
// VariableDto variable1=new VariableDto();
// variable1.setApprovalStatus(dto.getApprovalStatusxx());
// variable1.setComment(dto.getComment());
// variable1.setOperationTime(dto.getOperationTime());
// variable1.setOperator(dto.getOperator());
// standardDto1.setVariable(variable1);
// workBasicGridAcceptance = workflow.standard(workBasicGridAcceptance,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 @ 22755b5b
......@@ -139,7 +139,7 @@ public class WorkflowImpl {
if (json.getStatus() == 200) {
ProcessTaskDTO listco = json.getResult();
if(listco!=null){
// 当前节点执行任务id
basicGridAcceptance.setPromoter(userid);
......@@ -151,6 +151,8 @@ public class WorkflowImpl {
basicGridAcceptance.setNextNodeName(listco.getNextTask().get(0).getName());
//下个节点key
basicGridAcceptance.setNextNodeKey(listco.getNextTask().get(0).getKey());
}else{
return basicGridAcceptance;
}
/// 下一个节点角色权限
if(listco.getNextCandidateGroups()!=null){
......
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