Skip to content

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

修改消息主体

parent a19c60a3
Show whitespace changes
Inline Side-by-side
Showing with 61 additions and 36 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IDealerReviewService.java
View file @ ed8ce6ab
......@@ -16,5 +16,5 @@ public interface IDealerReviewService {
public com.baomidou.mybatisplus.extension.plugins.pagination.Page<ReviewDto> queryForDealerReviewPage(int pageNum, int pageSize, ReviewDto reviewDto);
boolean saveDealerReview(DealerReview dealerReview, boolean flag, boolean token,String name);
boolean saveDealerReview(DealerReview dealerReview, boolean flag, boolean token,String name,String meg);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IPowerStationService.java
View file @ ed8ce6ab
......@@ -19,7 +19,7 @@ public interface IPowerStationService {
* @param flag 是否是最后一个节点
* @return 状态
*/
boolean savePowerStation(PowerStation powerStation, boolean flag,String name);
boolean savePowerStation(PowerStation powerStation, boolean flag,String name,String meg);
/**
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IToDoTasksService.java
View file @ ed8ce6ab
......@@ -12,9 +12,9 @@ import io.swagger.annotations.ApiModelProperty;
*/
public interface IToDoTasksService {
public void addToDoTasksByUserId(String userId, ToDoTasks toDoTasks);
public void addToDoTasksByUserId(String userId, ToDoTasks toDoTasks,String meg);
public void addToDoTasksByRole(String role, ToDoTasks toDoTasks);
public void addToDoTasksByRole(String role, ToDoTasks toDoTasks,String meg);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/DealerReviewServiceImpl.java
View file @ ed8ce6ab
......@@ -74,7 +74,7 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
}
@Override
public boolean saveDealerReview(DealerReview dealerReview, boolean flag, boolean token,String name) {
public boolean saveDealerReview(DealerReview dealerReview, boolean flag, boolean token,String name,String meg) {
try {
//流程节点code
if (flag) {
......@@ -86,8 +86,8 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
}
boolean fl = this.saveOrUpdate(dealerReview);
if (flag) {
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.经销商审核.getCode(), dealerReview.getSequenceNbr(), "经销商"+name+"审核",null);
toDoTasksServiceImpl.addToDoTasksByRole(dealerReview.getNodeRole(), toDoTasks);
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.经销商审核.getCode(), dealerReview.getSequenceNbr(), "经销商"+name+"待经销商审核",null);
toDoTasksServiceImpl.addToDoTasksByRole(dealerReview.getNodeRole(), toDoTasks,meg);
}else{
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.经销商审核.getCode());
......@@ -98,13 +98,11 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
doTasks.setState("已办");
doTasks.setCompleteTime(new Date());
toDoTasksMapper.updateById(doTasks);
UserMessage userMessage= new UserMessage( doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName()+"已完成", doTasks.getAmosOrgCode());
UserMessage userMessage= new UserMessage( doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName()+"已完成."+meg, doTasks.getAmosOrgCode());
userMessageMapper.insert(userMessage);
}
}
return fl;
} catch (Exception e) {
throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
}
......@@ -134,7 +132,6 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
List<String> idList = executor.stream().map(e -> e.get("groupId").toString()).collect(Collectors.toList());
nodeRole = StringUtils.join(idList, ",");
}
LinkedHashMap extensionInfo = js.get("extensionInfo") != null ? (LinkedHashMap) js.get("extensionInfo") : null;
String nodeRouting = extensionInfo != null ? extensionInfo.get("nodeRole").toString() : null;
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HouseholdContractServiceImpl.java
View file @ ed8ce6ab
......@@ -192,7 +192,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
ToDoTasks toDoTasks1= new ToDoTasks ( TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户"+householdContract.getPartyA()+"的合同填写",householdContract.getDealerCode());
PeasantHousehold peasantHousehold=peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getAmosUserId(),toDoTasks1);
toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getAmosUserId(),toDoTasks1,"任务明细：合同发起成功");
return householdContract;
}
......@@ -298,7 +298,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
//生成填报任务
ToDoTasks toDoTasks1= new ToDoTasks ( TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户"+householdContract.getPartyA()+"的合同填写",householdContract.getDealerCode());
PeasantHousehold peasan=peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
toDoTasksServiceImpl.addToDoTasksByUserId(peasan.getAmosUserId(),toDoTasks1);
toDoTasksServiceImpl.addToDoTasksByUserId(peasan.getAmosUserId(),toDoTasks1,"任务明细：合同发起成功");
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java
View file @ ed8ce6ab
......@@ -195,10 +195,10 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
//生成待办任务
ToDoTasks toDoTasks= new ToDoTasks ( TaskTypeStationEnum.电站勘察.getCode(), peasantHousehold.getSequenceNbr(), "用户"+householdContract.getPartyA()+"电站信息勘察",householdContract.getDealerCode());
toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getDeveloperUserId(),toDoTasks);
toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getDeveloperUserId(),toDoTasks,"");
ToDoTasks toDoTasks1= new ToDoTasks ( TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户"+householdContract.getPartyA()+"的合同待发起",householdContract.getDealerCode());
toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getDeveloperUserId(),toDoTasks1);
toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getDeveloperUserId(),toDoTasks1,"");
return model;
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java
View file @ ed8ce6ab
......@@ -21,6 +21,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.exception.BaseException;
......@@ -113,7 +114,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
@Override
@Transactional
public boolean savePowerStation(PowerStation powerStation, boolean flag,String name) {
public boolean savePowerStation(PowerStation powerStation, boolean flag,String name,String meg) {
try{
//流程节点code
if (flag) {
......@@ -124,13 +125,16 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
powerStation.setNodeRouting(workDto.getNodeRouting());
}
Boolean fl= this.saveOrUpdate(powerStation);
if (flag){
PowerStationNodeEnum powerStationNodeEnum= PowerStationNodeEnum.getNodeByCode(powerStation.getNextProcessNode());
if (flag){
//获取经销商orgcode
PeasantHousehold peasantHouseholdd= peasantHouseholdService.getById(powerStation.getPeasantHouseholdId());
ToDoTasks toDoTasks= new ToDoTasks ( TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(), "用户"+name+"电站待"+powerStationNodeEnum.getName(),peasantHouseholdd.getDeveloperCode());
toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(),toDoTasks,meg);
ToDoTasks toDoTasks= new ToDoTasks ( TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(), "用户"+name+"电站审核",peasantHouseholdd.getDeveloperCode());
toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(),toDoTasks);
}else{
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
......@@ -143,7 +147,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
doTasks.setCompleteTime(new Date());
toDoTasksMapper.updateById(doTasks);
UserMessage userMessage= new UserMessage( doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName()+"已完成", doTasks.getAmosOrgCode());
UserMessage userMessage= new UserMessage( doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName()+"已完成."+meg, doTasks.getAmosOrgCode());
userMessageMapper.insert(userMessage);
}
}
......@@ -165,14 +169,16 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
@Override
@Transactional
public String powerStationExamine(long pageId, String nodeCode, String stationId, String taskId, String planInstanceId, Map<String, Object> kv) {
String meg="";
// 1. 业务相关数据落表
PowerStation powerStation = this.baseMapper.selectById(stationId);
PowerStationNodeEnum nodeByCode = PowerStationNodeEnum.getNodeByCode(nodeCode);
String result = String.valueOf(kv.get("approvalStatue"));
boolean flag = true;
if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)||PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
this.updateSeve(powerStation.getPeasantHouseholdId(),kv);
} else {
String result = String.valueOf(kv.get("approvalStatue"));
if (VERIFY_RESULT_NO.equals(result)) {
powerStation.setProcessStatus(PowerStationProcessStateEnum.不通过.getName());
}
......@@ -206,7 +212,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
break;
}
}
meg="任务明细："+nodeByCode+(VERIFY_RESULT_YES.equals(result)?"通过":"不通过");
// 2. 更新流程状态
String code = null;
try{
......@@ -222,7 +228,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
powerStation.setFlowTaskId(flowTaskId);
}
powerStationService.savePowerStation(powerStation, flag,powerStation.getOwnersName());
powerStationService.savePowerStation(powerStation, flag,powerStation.getOwnersName(),meg);
if(!flag){
//更新农户状态
String peasantHouseholdId = powerStation.getPeasantHouseholdId();
......@@ -259,7 +265,6 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
LinkedHashMap extensionInfo= js.get("extensionInfo")!=null?(LinkedHashMap)js.get("extensionInfo"):null;
String nodeRouting=extensionInfo!=null?extensionInfo.get("nodeRole").toString():null;
workDto=new WorkDto(nodeRouting, nodeRole, nextProcessNode);
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java
View file @ ed8ce6ab
......@@ -9,11 +9,14 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationNodeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.SurveyInformationMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.ToDoTasksMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.UserMessageMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationService;
import com.yeejoin.amos.boot.module.hygf.api.service.ISurveyInformationService;
import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
......@@ -79,7 +82,10 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
@Autowired
IPowerStationService powerStationService;
@Autowired
ToDoTasksMapper toDoTasksMapper;
@Autowired
UserMessageMapper userMessageMapper;
@Value("${power.station.examine.pageId}")
private long pageId;
......@@ -191,6 +197,23 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
submitExamine(peasantHousehold);
}
peasantHouseholdServiceImpl.saveOrUpdate(peasantHousehold);
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.电站勘察.getCode());
wrapper.eq(ToDoTasks::getState, "待办");
wrapper.eq(ToDoTasks::getBusinessId, peasantHousehold.getSequenceNbr());
ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
if(doTasks!=null){
doTasks.setState("已办");
doTasks.setCompleteTime(new Date());
toDoTasksMapper.updateById(doTasks);
UserMessage userMessage= new UserMessage( doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName()+"已完成", doTasks.getAmosOrgCode());
userMessageMapper.insert(userMessage);
}
return surveyInfoAllDto;
}
......@@ -235,7 +258,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
powerStation.setFlowTaskId(flowTaskId);
powerStation.setNextProcessNode(PowerStationNodeEnum.设计审核.getCode());
}
powerStationService.savePowerStation(powerStation, true,powerStation.getOwnersName());
powerStationService.savePowerStation(powerStation, true,powerStation.getOwnersName(),"");
}
} catch (Exception e){
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/ToDoTasksServiceImpl.java
View file @ ed8ce6ab
......@@ -77,7 +77,7 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
@Override
public void addToDoTasksByUserId(String userId, ToDoTasks toDoTasks) {
public void addToDoTasksByUserId(String userId, ToDoTasks toDoTasks,String meg) {
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getType, toDoTasks.getType());
wrapper.eq(ToDoTasks::getState, "待办");
......@@ -87,13 +87,10 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
doTasks.setState("已办");
doTasks.setCompleteTime(new Date());
toDoTasksMapper.updateById(doTasks);
UserMessage userMessage= new UserMessage( doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName()+"已完成", doTasks.getAmosOrgCode());
UserMessage userMessage= new UserMessage( doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName()+"已完成."+meg, doTasks.getAmosOrgCode());
userMessageMapper.insert(userMessage);
}
toDoTasks.setAmosUserId(userId);
toDoTasksMapper.insert(toDoTasks);
UserMessage userMessage= new UserMessage( toDoTasks.getType(), toDoTasks.getBusinessId(), toDoTasks.getAmosUserId(), new Date(), toDoTasks.getTaskName()+"待完成", toDoTasks.getAmosOrgCode());
......@@ -102,7 +99,7 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
@Override
@Async
public void addToDoTasksByRole(String role, ToDoTasks toDoTasks) {
public void addToDoTasksByRole(String role, ToDoTasks toDoTasks,String meg) {
//查询该角色的所有人员，按时间倒序排序。缓存，每次按顺序取一个，内存中删除一个，知道分配完，继续查询获取，重新分配。
try {
......@@ -116,7 +113,7 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToD
doTasks.setState("已办");
doTasks.setCompleteTime(new Date());
toDoTasksMapper.updateById(doTasks);
UserMessage userMessage= new UserMessage( doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName()+"已完成", doTasks.getAmosOrgCode());
UserMessage userMessage= new UserMessage( doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName()+"已完成."+meg, doTasks.getAmosOrgCode());
userMessageMapper.insert(userMessage);
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java
View file @ ed8ce6ab
......@@ -419,7 +419,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
dealerReview.setFlowTaskId(flowTaskId);
dealerReview.setNextProcessNode(DealerReviewEnum.经销商管理员审核.getCode());
}
dealerReviewService.saveDealerReview(dealerReview,true,false,regUnitInfo.getName());
dealerReviewService.saveDealerReview(dealerReview,true,false,regUnitInfo.getName(),"任务明细：经销商已上传信息");
}else{
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
}
......@@ -439,6 +439,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
DealerReview dealerReview= dealerReviewMapper.selectOne(new QueryWrapper<DealerReview>().eq("unit_info_id", stationId));
UnitInfo unitInfo= this.getById(stationId);
DealerReviewEnum nodeByCode = DealerReviewEnum.getNodeByCode(nodeCode);
String approvalStatue="";
if (DealerReviewEnum.经销商管理员审核.getCode().equals(nodeCode)) {
String result = String.valueOf(kv.get("approvalStatue"));
if (VERIFY_RESULT_NO.equals(result)) {
......@@ -451,12 +452,14 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
params.put("code","不通过");
params.put("mobile",unitInfo.getAdminPhone());
params.put("smsCode", smsTempCode);
approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核不通过";
FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params);
}else{
// 1. 更新经销商状态
unitInfo.setAuditStatus(2);
unitInfo.setBlacklist(0);
Privilege.agencyUserClient.unlockUsers(unitInfo.getAdminUserId());
approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核通过";
}
}
// 2. 更新流程状态
......@@ -472,7 +475,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
dealerReview.setFlowTaskId(flowTaskId);
}
dealerReviewService.saveDealerReview(dealerReview,false,true,unitInfo.getName());
dealerReviewService.saveDealerReview(dealerReview,false,true,unitInfo.getName(),approvalStatue);
}
this.saveOrUpdate(unitInfo);
}catch (Exception e){
......
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