Commit 7fa5c531 authored by tangwei's avatar tangwei

解决冲突

parents 891c97f1 d7e038dc
......@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
/**
* 验收整改单
......@@ -62,7 +63,7 @@ public class AcceptanceRectificationOrderDto extends BaseDto {
private String responsibleUserPhone;
@ApiModelProperty(value = "整改照片")
private String rectificationPhoto;
private List<FileItemDto> rectificationPhoto;
@ApiModelProperty(value = "电站编号")
private String powerStationCode;
......@@ -73,4 +74,5 @@ public class AcceptanceRectificationOrderDto extends BaseDto {
@ApiModelProperty(value = "电站地址")
private String powerStationAddress;
private String rectificationPhotoStr;
}
package com.yeejoin.amos.boot.module.hygf.api.dto;
import lombok.Data;
/**
* @author keyong
* @title: FileItem
* <pre>
* @description: TODO
* </pre>
* @date 2024/1/5 17:33
*/
@Data
public class FileItemDto {
private String uid;
private String name;
private String status;
private String url;
}
......@@ -24,6 +24,7 @@ public interface IAcceptanceService {
*/
Map<String, Object> acceptanceDetails(Long sequenceNbr);
AcceptanceCheckItem saveEntity(AcceptanceCheckItem item);
AcceptanceCheckItem saveEntity(AcceptanceCheckItem item, Long sequenceNbr);
public void checkAccept( Long basicGridAcceptanceId ,String userId);
}
......@@ -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,
......@@ -33,6 +34,7 @@
resultType="com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceRectificationOrderDto">
SELECT
aro.*,
aro.rectification_photo AS rectificationPhotoStr,
ph.peasant_household_no as powerStationCode,
ph.owners_name AS ownersName,
ph.project_address_name AS powerStationAddress,
......
......@@ -71,8 +71,8 @@ public class AcceptanceController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "检查项新增", notes = "检查项新增")
public ResponseModel save(@RequestBody AcceptanceCheckItem model) {
return ResponseHelper.buildResponse(acceptanceService.saveEntity(model));
public ResponseModel save(@RequestBody AcceptanceCheckItem model, @RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(acceptanceService.saveEntity(model, sequenceNbr));
}
......
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.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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;
import com.yeejoin.amos.boot.module.hygf.api.dto.VariableDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceRectificationOrder;
......@@ -25,6 +29,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -62,7 +67,18 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
}
public AcceptanceRectificationOrderDto queryBySequenceNbr(Long sequenceNbr) {
return acceptanceRectificationOrderMapper.queryBySequenceNbr(sequenceNbr);
AcceptanceRectificationOrderDto dto = acceptanceRectificationOrderMapper.queryBySequenceNbr(sequenceNbr);
if (StringUtils.isNotEmpty(dto.getRectificationPhotoStr())) {
JSONArray jsonArray = JSONArray.parseArray(dto.getRectificationPhotoStr());
List<FileItemDto> itemDtos = new ArrayList<>();
for (Object obj : jsonArray) {
String jsonString = JSONObject.toJSONString(obj);
FileItemDto itemDto = JSONObject.parseObject(jsonString, FileItemDto.class);
itemDtos.add(itemDto);
}
dto.setRectificationPhoto(itemDtos);
}
return dto;
}
/**
......@@ -93,28 +109,32 @@ 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);
BeanUtils.copyProperties(workBasicGridAcceptance, basicGridAcceptance);
basicGridAcceptanceMapper.updateById(basicGridAcceptance);
}
return model;
}
}
\ No newline at end of file
......@@ -96,7 +96,12 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
}
@Override
public AcceptanceCheckItem saveEntity(AcceptanceCheckItem item) {
public AcceptanceCheckItem saveEntity(AcceptanceCheckItem item, Long sequenceNbr) {
BasicGridAcceptance acceptance = basicGridAcceptanceMapper.selectById(sequenceNbr);
Assert.notNull(acceptance, "未查询到相关电站信息!");
item.setWorkOrderId(acceptance.getWorkOrderId());
item.setWorkOrderPowerStationId(acceptance.getWorkOrderPowerStationId());
item.setPeasantHouseholdId(acceptance.getPeasantHouseholdId());
acceptanceCheckItemMapper.insert(item);
return Optional.ofNullable(item).orElse(new AcceptanceCheckItem());
}
......
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