Skip to content

A
amos-boot-biz
Commit 891376d1 authored by tangwei's avatar tangwei
Browse files
Options

验收列表修改

parent d5fa2d80
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 82 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/RectificationStatusEnum.java
View file @ 891376d1
......@@ -11,11 +11,11 @@ import lombok.Getter;
@SuppressWarnings("ALL")
public enum RectificationStatusEnum {
待提交验收("待整改", 1),
待整改("待整改", 1),
待投融验收("整改未完成", 2),
整改未完成("整改未完成", 2),
投融验收不通过("整改已完成", 3);
整改已完成("整改已完成", 3);
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/AcceptanceDto.java
View file @ 891376d1
......@@ -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/service/IAcceptanceService.java
View file @ 891376d1
......@@ -25,5 +25,5 @@ public interface IAcceptanceService {
Map<String, Object> acceptanceDetails(Long sequenceNbr);
AcceptanceCheckItem saveEntity(AcceptanceCheckItem item);
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 @ 891376d1
......@@ -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,6 @@
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 != ''">
......@@ -49,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-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/AcceptanceController.java
View file @ 891376d1
......@@ -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));
}
@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/service/impl/AcceptanceServiceImpl.java
View file @ 891376d1
......@@ -6,6 +6,7 @@ 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;
......@@ -17,6 +18,7 @@ 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;
......@@ -35,7 +37,8 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
private PeasantHouseholdMapper peasantHouseholdMapper;
@Autowired
private AcceptanceCheckItemMapper acceptanceCheckItemMapper;
@Autowired
WorkflowImpl workflow;
/**
* 分页查询验收列表数据
*
......@@ -46,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();
......@@ -64,12 +61,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
}
}
IPage<AcceptanceDto> resultPage = acceptanceMapper.page(page, acceptanceDto);
resultPage.getRecords().forEach(v -> {
AcceptanceStatusEnum acceptanceStatusEnum = AcceptanceStatusEnum.getNodeByCode(v.getAcceptanceStatus());
RectificationStatusEnum rectificationStatusEnum = RectificationStatusEnum.getNodeByCode(Integer.parseInt(v.getRectificationStatus()));
v.setAcceptanceStatusDesc(acceptanceStatusEnum.getName());
v.setRectificationStatusDesc(rectificationStatusEnum.getName());
});
return resultPage;
}
......@@ -108,5 +100,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 @ 891376d1
......@@ -89,17 +89,9 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
basicGridAcceptance.setGridStatus(GridStatusEnum.DSH.getCode());
if(grid.getType()!=null&&"1".equals(grid.getType())){
LocalDateTime now = LocalDateTime.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("YYYY-MM-dd");
String formattedDate = now.format(formatter);
//执行工作流
StandardDto standardDto=new StandardDto();
standardDto.setTaskId(basicGridAcceptance.getNextTaskId());
VariableDto variable=new VariableDto();
variable.setOperator("88888");
variable.setOperationTime(formattedDate);
standardDto.setVariable(variable);
workflow.standard(basicGridAcceptance,standardDto,userId);
}else{
......
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