Skip to content

A
amos-boot-zx-biz
Commit 25987157 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

工作台

parent 01a42939
Show whitespace changes
Inline Side-by-side
Showing with 846 additions and 299 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/HygfRouthTypeEnum.java
View file @ 25987157
package com.yeejoin.amos.boot.module.hygf.api.Enum; package com.yeejoin.amos.boot.module.hygf.api.Enum;
import lombok.Getter;
/** /**
* 户用光伏业务类型枚举 * 户用光伏业务类型枚举
* *
* @author Administrator * @author Administrator
*/ */
@Getter
public enum HygfRouthTypeEnum { public enum HygfRouthTypeEnum {
/** /**
* 业务类型枚举 * 业务类型枚举
*/ */
HYGF_REPAY("hygf_repayment", "还款"), HYGF_REPAY("hygf_repayment", "还款",10000L),
HYGF_DZKC("hygf_dzkc", "电站勘察"), HYGF_DZKC("hygf_dzkc", "电站勘察",10001L),
HYGF_DSG("hygf_dsg", "待施工"), HYGF_DSG("hygf_dsg", "待施工",10002L),
HYGF_HTTB("hygf_httb", "合同填报"), HYGF_HTFQ("hygf_htfq", "合同发起",10003L),
HYGF_HTQS("hygf_httb", "合同签署",10004L),
HYGF_HTGZ("hygf_httb", "合同盖章",10005L),
HYGF_XZFHD("fh_xzfhd", "新增发货单",10006L),
HYGF_XZPGD("hygf_xzfgd", "新增派工单",10007L),
HYGF_XZBWDJ("bw_xzbwdj", "新增并网登记",10008L),
HYGF_BWSJSH("bw_bwsjsh", "并网设计审核",10011L),
HYGF_BWGCSH("bw_bwgcsh", "并网工程审核",10012L),
HYGF_XZYSTJ("ys_xzystj", "新增验收提交",10009L),
HYGF_YSTRSH("bw_ystrsh", "验收投融审核",10013L),
HYGF_YSFWSH("bw_ysfwsh", "验收法务审核",10014L),
HYGF_XZTSRZ("hygf_xztsrz", "新增推送融资",10010L),
; ;
private final String code; private final String code;
private final String name; private final String name;
private final Long business;
HygfRouthTypeEnum(String code, String name) { HygfRouthTypeEnum(String code, String name,Long business) {
this.code = code; this.code = code;
this.name = name; this.name = name;
this.business = business;
} }
public static String getNameByType(String code) { public static String getNameByType(String code) {
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/TaskTypeStationEnum.java
View file @ 25987157
...@@ -5,17 +5,15 @@ import lombok.Getter; ...@@ -5,17 +5,15 @@ import lombok.Getter;
@AllArgsConstructor @AllArgsConstructor
public enum TaskTypeStationEnum { public enum TaskTypeStationEnum {
经销商审核("经销商审核", "经销商审核"), 经销商审核("经销商审核", "经销商审核"),
电站勘察("电站勘察", "电站勘察"), 勘察("勘察", "勘察"),
电站审核("电站审核", "电站审核"), 合同("合同", "合同"),
合同填报("合同填报", "合同填报"),
重置密码("重置密码", "重置密码"), 重置密码("重置密码", "重置密码"),
设置管理员("设置管理员", "设置管理员"), 设置管理员("设置管理员", "设置管理员"),
发货管理("发货管理", "发货管理"), 发货("发货", "发货"),
派工发料("派工发料", "派工发料"), 施工("施工", "施工"),
施工完工("施工完工", "施工完工"), 并网("并网", "并网"),
并网管理("并网管理", "并网管理"), 验收("验收", "验收"),
验收管理("验收管理", "验收管理"), 投融资("投融资", "投融资"),
投融资管理("投融资管理", "投融资管理"),
还款("还款", "还款"); 还款("还款", "还款");
/** /**
* 名称，描述 * 名称，描述
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/ToDoTasksMapper.java
View file @ 25987157
...@@ -36,4 +36,21 @@ public interface ToDoTasksMapper extends BaseMapper<ToDoTasks> { ...@@ -36,4 +36,21 @@ public interface ToDoTasksMapper extends BaseMapper<ToDoTasks> {
* @return * @return
*/ */
List<String> getTodoUserIdsByAmosDealer(@Param("companyOrgCode") String companyOrgCode, @Param("roleId") String roleId, @Param("amosDealerId") String amosDealerId); List<String> getTodoUserIdsByAmosDealer(@Param("companyOrgCode") String companyOrgCode, @Param("roleId") String roleId, @Param("amosDealerId") String amosDealerId);
/**
* 过滤用户根据管理端
* @param companyOrgCode
* @param userId
* @return
*/
List<String> filterUsersByAdmin(@Param("companyOrgCode") String companyOrgCode, @Param("list") List<String> userId);
/**
* 过滤用户根据经销商端
* @param companyOrgCode
* @param amosDealerCode
* @param userId
* @return
*/
List<String> filterUsersByAmosDealer(@Param("companyOrgCode") String companyOrgCode, @Param("amosDealerCode") String amosDealerCode, @Param("list") List<String> userId);
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/WorkOrderPowerStationMapper.java
View file @ 25987157
...@@ -21,4 +21,6 @@ public interface WorkOrderPowerStationMapper extends BaseMapper<WorkOrderPowerSt ...@@ -21,4 +21,6 @@ public interface WorkOrderPowerStationMapper extends BaseMapper<WorkOrderPowerSt
List<Map<String, Object>> getSgCreateTime(); List<Map<String, Object>> getSgCreateTime();
List<Map<String, Object>> getSgEndTime(); List<Map<String, Object>> getSgEndTime();
String getStationName(@Param("workOrderId") Long workOrderId);
} }
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/ToDoTasksMapper.xml
View file @ 25987157
...@@ -52,4 +52,27 @@ ...@@ -52,4 +52,27 @@
GROUP BY amos_user_id GROUP BY amos_user_id
</select> </select>
<select id="filterUsersByAdmin" resultType="java.lang.String">
SELECT amos_user_id FROM std_user_empower sue
where (sue.amos_org_code like #{companyOrgCode} or sue.amos_org_code like '%all%')
and sue.permission_type='HYGF'
and amos_user_id in
<foreach item="item" collection="ids" separator="," open="(" close=")" index="">
#{item}
</foreach>
GROUP BY amos_user_id
</select>
<select id="filterUsersByAmosDealer" resultType="java.lang.String">
SELECT amos_user_id FROM std_user_biz sub
LEFT JOIN hygf_personnel_business hpb ON hpb.foundation_id=sub.sequence_nbr
where sub.amos_dealer_code = #{amosDealerCode}
and hpb.regional_companies_code like #{companyOrgCode}
and amos_user_id in
<foreach item="item" collection="ids" separator="," open="(" close=")" index="">
#{item}
</foreach>
GROUP BY amos_user_id
</select>
</mapper> </mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderPowerStationMapper.xml
View file @ 25987157
...@@ -31,5 +31,11 @@ ...@@ -31,5 +31,11 @@
WHERE power_station_construction_status='已完工' WHERE power_station_construction_status='已完工'
</select> </select>
<select id="getStationName" resultType="java.lang.String">
SELECT GROUP_CONCAT(hph.owners_name) from hygf_work_order_power_station hwops
LEFT JOIN hygf_peasant_household hph on hph.sequence_nbr=hwops.peasant_household_id
WHERE hwops.work_order_id =#{workOrderId}
</select>
</mapper> </mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java
View file @ 25987157
...@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.HygfRouthTypeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits; import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto; import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto; import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*; 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.mapper.*;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.*; import com.yeejoin.amos.boot.module.hygf.biz.service.impl.*;
...@@ -204,9 +204,13 @@ public class HouseholdContractController extends BaseController { ...@@ -204,9 +204,13 @@ public class HouseholdContractController extends BaseController {
householdContrac.setStatus(HouseholdContractEnum.合同状态_农户已签署.getCode()); householdContrac.setStatus(HouseholdContractEnum.合同状态_农户已签署.getCode());
//生成填报任务 //生成填报任务
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContrac.getSequenceNbr(), "用户"+householdContrac.getPartyA()+"合同盖章", householdContrac.getRegionalCompaniesCode()); RouthPathVO routhPathVO = new RouthPathVO();
List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(null, engineering); routhPathVO.setRouthPathId(String.valueOf(householdContrac.getSequenceNbr()));
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds, toDoTasks); String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTGZ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTGZ.getCode(), routhPathVO);
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), householdContrac.getSequenceNbr(), householdContrac.getPartyA()+"待合同盖章", householdContrac.getRegionalCompaniesCode(),routhPath,wxRouthPath);
List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(householdContrac.getRegionalCompaniesCode(), engineering);
toDoTasksServiceImpl.completeAndAddToDoTask(todoUserIds, toDoTasks,"");
return ResponseHelper.buildResponse(householdContractServiceImpl.updateById(householdContrac)); return ResponseHelper.buildResponse(householdContractServiceImpl.updateById(householdContrac));
} }
...@@ -236,9 +240,16 @@ public class HouseholdContractController extends BaseController { ...@@ -236,9 +240,16 @@ public class HouseholdContractController extends BaseController {
peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode()); peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
peasantHouseholdServiceImpl.getBaseMapper().updateById(peasantHousehold); peasantHouseholdServiceImpl.getBaseMapper().updateById(peasantHousehold);
System.out.println("更新成功"+householdContrac.getPeasantHouseholdId()); System.out.println("更新成功"+householdContrac.getPeasantHouseholdId());
//生成发货待办
RouthPathVO routhPathVO = new RouthPathVO();
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getCode(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getBusiness(), peasantHousehold.getOwnersName()+"待新增发货单",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksServiceImpl.getRoleIdByName("户用光伏-仓储");
List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
} }
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContrac.getSequenceNbr()); ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), householdContrac.getSequenceNbr());
toDoTasksServiceImpl.completeToDoTasks(toDoTasks,""); toDoTasksServiceImpl.completeToDoTasks(toDoTasks,"");
}catch (Exception e){ }catch (Exception e){
...@@ -265,7 +276,7 @@ public class HouseholdContractController extends BaseController { ...@@ -265,7 +276,7 @@ public class HouseholdContractController extends BaseController {
householdContrac= householdContractServiceImpl.getById(sequenceNbr); householdContrac= householdContractServiceImpl.getById(sequenceNbr);
householdContrac.setStatus(HouseholdContractEnum.合同状态_已作废.getCode()); householdContrac.setStatus(HouseholdContractEnum.合同状态_已作废.getCode());
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.合同填报.getCode()); wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.合同.getCode());
wrapper.eq(ToDoTasks::getState, "待办"); wrapper.eq(ToDoTasks::getState, "待办");
wrapper.eq(ToDoTasks::getBusinessId, householdContrac.getSequenceNbr()); wrapper.eq(ToDoTasks::getBusinessId, householdContrac.getSequenceNbr());
List<ToDoTasks> doTasks= toDoTasksMapper.selectList(wrapper); List<ToDoTasks> doTasks= toDoTasksMapper.selectList(wrapper);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/QiyuesuoController.java
View file @ 25987157
...@@ -15,10 +15,10 @@ import com.qiyuesuo.sdk.v2.response.MiniappTicketResult; ...@@ -15,10 +15,10 @@ import com.qiyuesuo.sdk.v2.response.MiniappTicketResult;
import com.qiyuesuo.sdk.v2.response.SdkResponse; import com.qiyuesuo.sdk.v2.response.SdkResponse;
import com.qiyuesuo.sdk.v2.utils.Algorithm; import com.qiyuesuo.sdk.v2.utils.Algorithm;
import com.qiyuesuo.sdk.v2.utils.Base64Utils; import com.qiyuesuo.sdk.v2.utils.Base64Utils;
import com.qiyuesuo.sdk.v2.utils.CollectionUtils;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.ArrivalStateeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.HygfRouthTypeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.CallbackDto; import com.yeejoin.amos.boot.module.hygf.api.dto.CallbackDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto; import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
...@@ -28,6 +28,7 @@ import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServi ...@@ -28,6 +28,7 @@ import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServi
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PeasantHouseholdServiceImpl; import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PeasantHouseholdServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl; import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ToDoTasksServiceImpl; import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ToDoTasksServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -193,9 +194,13 @@ public class QiyuesuoController extends BaseController { ...@@ -193,9 +194,13 @@ public class QiyuesuoController extends BaseController {
wrapper4.eq(HouseholdContract::getContractLockId, CallbackDto.getContractId()); wrapper4.eq(HouseholdContract::getContractLockId, CallbackDto.getContractId());
HouseholdContract householdContrac = householdContractMapper.selectOne(wrapper4); HouseholdContract householdContrac = householdContractMapper.selectOne(wrapper4);
// 生成填报任务 // 生成填报任务
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContrac.getSequenceNbr(), "用户" + householdContrac.getPartyA() + "合同盖章", householdContrac.getRegionalCompaniesCode()); RouthPathVO routhPathVO = new RouthPathVO();
List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(null, engineering); routhPathVO.setRouthPathId(String.valueOf(householdContrac.getSequenceNbr()));
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds, toDoTasks); String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTGZ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTGZ.getCode(), routhPathVO);
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), householdContrac.getSequenceNbr(), householdContrac.getPartyA() + "待合同盖章", householdContrac.getRegionalCompaniesCode(),routhPath,wxRouthPath);
List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(householdContrac.getRegionalCompaniesCode(), engineering);
toDoTasksServiceImpl.completeAndAddToDoTask(todoUserIds, toDoTasks,"");
} else if ("SEAL".equals(CallbackDto.getCallbackType())) { } else if ("SEAL".equals(CallbackDto.getCallbackType())) {
LambdaUpdateWrapper<HouseholdContract> wrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<HouseholdContract> wrapper = new LambdaUpdateWrapper<>();
...@@ -217,8 +222,16 @@ public class QiyuesuoController extends BaseController { ...@@ -217,8 +222,16 @@ public class QiyuesuoController extends BaseController {
peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode()); peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
peasantHouseholdServiceImpl.getBaseMapper().updateById(peasantHousehold); peasantHouseholdServiceImpl.getBaseMapper().updateById(peasantHousehold);
logger.info("更新成功"); logger.info("更新成功");
//生成发货待办
RouthPathVO routhPathVO = new RouthPathVO();
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getCode(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getBusiness(), peasantHousehold.getOwnersName()+"待新增发货单",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksServiceImpl.getRoleIdByName("户用光伏-仓储");
List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
} }
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), contract.getSequenceNbr()); ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), contract.getSequenceNbr());
toDoTasksServiceImpl.completeToDoTasks(toDoTasks,""); toDoTasksServiceImpl.completeToDoTasks(toDoTasks,"");
} }
try { try {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceCheckServiceImpl.java
View file @ 25987157
...@@ -180,21 +180,25 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -180,21 +180,25 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
long idsk = basicGridRecord.getPeasantHouseholdId(); long idsk = basicGridRecord.getPeasantHouseholdId();
up.eq(PeasantHousehold::getSequenceNbr, idsk); up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up); peasantHouseholdMapper.update(null, up);
//完成验收
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
//发起待办 //发起待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridRecord.getPeasantHouseholdId()); PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridRecord.getPeasantHouseholdId());
String taskName="您有一条验收的待办"; String taskName="您有一条验收的待办";
String orgCode=""; String orgCode="";
if(Objects.nonNull(peasantHousehold)){ if(Objects.nonNull(peasantHousehold)){
taskName="电站名称" + peasantHousehold.getOwnersName() + "有一条验收状态为" +peasantHousehold.getConstructionState() + "待办" ; taskName=peasantHousehold.getOwnersName() + "待经销商管理员审核" ;
orgCode=peasantHousehold.getRegionalCompaniesCode(); orgCode=peasantHousehold.getRegionalCompaniesCode();
} }
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridRecord.getPeasantHouseholdId())); routhPathVO.setRouthPathId(String.valueOf(basicGridRecord.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收管理.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO); String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收管理.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO); String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.验收管理.getCode(), basicGridRecord.getPeasantHouseholdId(), taskName, orgCode,routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridRecord.getPeasantHouseholdId(), taskName, orgCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks); List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(),userIds, orgCode, peasantHousehold.getDeveloperCode());
toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks);
} }
//防止重复提交 //防止重复提交
...@@ -260,21 +264,59 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -260,21 +264,59 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
basicGridAuditingDto.setInstanceId(basicGridAuditing.getInstanceId()); basicGridAuditingDto.setInstanceId(basicGridAuditing.getInstanceId());
} }
acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto); acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
if(BusinessWorkflowKey.法务审核.getCode().equals(taskKey)){
//完成法务
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSFWSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
}
if(BusinessWorkflowKey.投融审核.getCode().equals(taskKey)){
//完成投融
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSTRSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
}
if("Activity_1rjn5s1".equals(workflowResultDto.getNextNodeKey())){
//完成待办
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
//此处产生两条待办 投融、法务
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAuditing.getPeasantHouseholdId());
String taskName="您有一条验收的待办";
String orgCode="";
if(Objects.nonNull(peasantHousehold)){
taskName= peasantHousehold.getOwnersName() ;
orgCode=peasantHousehold.getRegionalCompaniesCode();
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
//投融
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSTRSH.getBusiness(), taskName+ "待投融审核",orgCode,routhPath,wxRouthPath);
List<String> todoUserIds = toDoTasksService.getTodoUserIds(orgCode, "户用光伏-投融");
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks);
//法务
ToDoTasks toDoTasks2= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSFWSH.getBusiness(), taskName+ "待法务审核",orgCode,routhPath,wxRouthPath);
List<String> todoUserIds1 = toDoTasksService.getTodoUserIds(orgCode, "户用光伏-法务");
toDoTasksService.addToDoTasksByUserIds(todoUserIds1,toDoTasks2);
}else {
//更新待办 //更新待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAuditing.getPeasantHouseholdId()); PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAuditing.getPeasantHouseholdId());
String taskName="您有一条验收的待办"; String taskName="您有一条验收的待办";
String orgCode=""; String orgCode="";
if(Objects.nonNull(peasantHousehold)){ if(Objects.nonNull(peasantHousehold)){
taskName="电站名称" + peasantHousehold.getOwnersName() + "流程流转到" +workflowResultDto.getNextNodeName() + "需待办" ; taskName=peasantHousehold.getOwnersName() + "待" +workflowResultDto.getNextNodeName();
orgCode=peasantHousehold.getRegionalCompaniesCode(); orgCode=peasantHousehold.getRegionalCompaniesCode();
} }
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId())); routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收管理.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO); String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收管理.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO); String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.验收管理.getCode(), basicGridAuditing.getPeasantHouseholdId(), taskName,orgCode,routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), basicGridAuditing.getPeasantHouseholdId(), taskName,orgCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks,""); List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(),userIds, orgCode, peasantHousehold.getDeveloperCode());
toDoTasksService.completeAndAddToDoTask(filterUsers,toDoTasks,"");
}
} }
...@@ -364,6 +406,9 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -364,6 +406,9 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query2); HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query2);
if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){ if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.TRDSH.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.TRDSH.getCode());
//完成法务
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSFWSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
}else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){ }else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
}else { }else {
...@@ -395,6 +440,9 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -395,6 +440,9 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query1); HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query1);
if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){ if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.FWDSH.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.FWDSH.getCode());
//完成投融
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSTRSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
}else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){ }else if (hygfRectificationOrder.getRectificationStatus().equals("待整改")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode()); up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
}else { }else {
...@@ -439,6 +487,15 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -439,6 +487,15 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
long idsk = basicGridRecord.getPeasantHouseholdId(); long idsk = basicGridRecord.getPeasantHouseholdId();
up1.eq(PeasantHousehold::getSequenceNbr, idsk); up1.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up1); peasantHouseholdMapper.update(null, up1);
//生成新增投融资待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridRecord.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getBusiness(), peasantHousehold.getOwnersName()+"待新增推送融资",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesName(), roleId);
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
} }
if (approvalStatus.equals("1") ){ if (approvalStatus.equals("1") ){
up.eq(BaseEntity::getSequenceNbr,sequenceNbr); up.eq(BaseEntity::getSequenceNbr,sequenceNbr);
......
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 @ 25987157
...@@ -2,23 +2,17 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl; ...@@ -2,23 +2,17 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.hygf.api.Enum.*; import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto; import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAuditingDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridRecordDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*; 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.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.service.IBasicGridAcceptanceService; import com.yeejoin.amos.boot.module.hygf.api.service.IBasicGridAcceptanceService;
...@@ -31,10 +25,6 @@ import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO; ...@@ -31,10 +25,6 @@ import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
import com.yeejoin.amos.feign.workflow.model.TaskResultDTO; import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil; import com.yeejoin.amos.boot.module.hygf.api.util.RedisLockUtil;
import com.yeejoin.amos.component.robot.BadRequest; import com.yeejoin.amos.component.robot.BadRequest;
import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -260,21 +250,25 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta ...@@ -260,21 +250,25 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
long idsk = basicGridRecord.getPeasantHouseholdId(); long idsk = basicGridRecord.getPeasantHouseholdId();
up.eq(PeasantHousehold::getSequenceNbr, idsk); up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up); peasantHouseholdMapper.update(null, up);
//完成新增并网
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
//发起待办 //发起待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(grid.getPeasantHouseholdId()); PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(grid.getPeasantHouseholdId());
String taskName="您有一条并网的待办"; String taskName="您有一条并网的待办";
String orgCode=""; String orgCode="";
if(Objects.nonNull(peasantHousehold)){ if(Objects.nonNull(peasantHousehold)){
taskName="电站名称" + peasantHousehold.getOwnersName() + "有一条并网状态为" +peasantHousehold.getConstructionState() + "待办" ; taskName=peasantHousehold.getOwnersName() +"待经销商管理审核" ;
orgCode=peasantHousehold.getRegionalCompaniesCode(); orgCode=peasantHousehold.getRegionalCompaniesCode();
} }
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(grid.getPeasantHouseholdId())); routhPathVO.setRouthPathId(String.valueOf(grid.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.并网管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.并网.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.并网管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.并网.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.并网管理.getCode(), grid.getPeasantHouseholdId(), taskName, orgCode,routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), grid.getPeasantHouseholdId(), taskName, orgCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks); List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.并网.getCode(), workflowResultDto.getNextNodeKey(),userIds, orgCode, peasantHousehold.getDeveloperCode());
toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks);
} }
// 防止重复提交 // 防止重复提交
...@@ -363,6 +357,16 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta ...@@ -363,6 +357,16 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
up.eq(PeasantHousehold::getSequenceNbr, idsk); up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up); peasantHouseholdMapper.update(null, up);
//生成验收待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAcceptanc.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getBusiness(), peasantHousehold.getOwnersName()+"待新增验收提交",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-工程");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesName(), roleId);
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks1);
} else { } else {
AcceptanceStatusEnum acceptanceStatus = AcceptanceStatusEnum.getAcceptanceStatusByKey(nextNodeKey, AcceptanceStatusEnum acceptanceStatus = AcceptanceStatusEnum.getAcceptanceStatusByKey(nextNodeKey,
dto.getApprovalStatus()); dto.getApprovalStatus());
...@@ -475,7 +479,15 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta ...@@ -475,7 +479,15 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
long idsk = basicGridAcceptanc.getPeasantHouseholdId(); long idsk = basicGridAcceptanc.getPeasantHouseholdId();
up.eq(PeasantHousehold::getSequenceNbr, idsk); up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up); peasantHouseholdMapper.update(null, up);
//生成新增投融资待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAcceptanc.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(), HygfRouthTypeEnum.HYGF_XZTSRZ.getBusiness(), peasantHousehold.getOwnersName()+"待新增推送融资",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesName(), roleId);
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
} }
basicGridAcceptanceMapper.updateById(basicGridAcceptanc); basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
...@@ -522,21 +534,60 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta ...@@ -522,21 +534,60 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
basicGridAuditingDto.setInstanceId(basicGridAuditing.getInstanceId()); basicGridAuditingDto.setInstanceId(basicGridAuditing.getInstanceId());
} }
basicGridAuditingService.createWithModel(basicGridAuditingDto); basicGridAuditingService.createWithModel(basicGridAuditingDto);
if(BusinessWorkflowKey.设计审核.getCode().equals(taskKey)){
//完成设计
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_BWSJSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
}
if(BusinessWorkflowKey.工程审核.getCode().equals(taskKey)){
//完成工程
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_BWGCSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
}
if("Activity_0k4o46e".equals(workflowResultDto.getNextNodeKey())){
//完成待办
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), basicGridAuditing.getPeasantHouseholdId());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
//此处产生两条待办 设计、工程
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAuditing.getPeasantHouseholdId());
String taskName="您有一条并网的待办";
String orgCode="";
if(Objects.nonNull(peasantHousehold)){
taskName= peasantHousehold.getOwnersName() ;
orgCode=peasantHousehold.getRegionalCompaniesCode();
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.并网.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.并网.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
//设计
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_BWSJSH.getBusiness(), taskName+ "待设计审核",orgCode,routhPath,wxRouthPath);
List<String> todoUserIds = toDoTasksService.getTodoUserIds(orgCode, "户用光伏-设计");
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks);
//工程
ToDoTasks toDoTasks2= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_BWGCSH.getBusiness(), taskName+ "待工程审核",orgCode,routhPath,wxRouthPath);
List<String> todoUserIds1 = toDoTasksService.getTodoUserIds(orgCode, "户用光伏-工程");
toDoTasksService.addToDoTasksByUserIds(todoUserIds1,toDoTasks2);
}else {
//更新待办 //更新待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAuditing.getPeasantHouseholdId()); PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridAuditing.getPeasantHouseholdId());
String taskName="您有一条并网的待办"; String taskName="您有一条并网的待办";
String orgCode=""; String orgCode="";
if(Objects.nonNull(peasantHousehold)){ if(Objects.nonNull(peasantHousehold)){
taskName="电站名称" + peasantHousehold.getOwnersName() + "流程流转到" +workflowResultDto.getNextNodeName() + "需待办" ; taskName= peasantHousehold.getOwnersName() + "待" +workflowResultDto.getNextNodeName() ;
orgCode=peasantHousehold.getRegionalCompaniesCode(); orgCode=peasantHousehold.getRegionalCompaniesCode();
} }
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId())); routhPathVO.setRouthPathId(String.valueOf(basicGridAuditing.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.并网管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.并网.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.并网管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.并网.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.并网管理.getCode(), basicGridAuditing.getPeasantHouseholdId(), taskName,orgCode,routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), basicGridAuditing.getPeasantHouseholdId(), taskName,orgCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks,""); List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.并网.getCode(), workflowResultDto.getNextNodeKey(),userIds, orgCode, peasantHousehold.getDeveloperCode());
toDoTasksService.completeAndAddToDoTask(filterUsers,toDoTasks,"");
}
} }
public void completeAdminAudit(Map<String, String> kv) { public void completeAdminAudit(Map<String, String> kv) {
...@@ -630,12 +681,25 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta ...@@ -630,12 +681,25 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
acceptanceCheck.setPowerStationAreaStatus(null); acceptanceCheck.setPowerStationAreaStatus(null);
acceptanceCheck.setAcceptanceCheckStatus(GridStatusEnum.DTJYS.getCode()); acceptanceCheck.setAcceptanceCheckStatus(GridStatusEnum.DTJYS.getCode());
acceptanceCheckService.saveOrUpdate(acceptanceCheck); acceptanceCheckService.saveOrUpdate(acceptanceCheck);
//生成验收待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridRecord.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getBusiness(), peasantHousehold.getOwnersName()+"待新增验收提交",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-工程");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesName(), roleId);
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks1);
} else if (null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") } else if (null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0")
&& (Objects.isNull(basicGridRecord.getRectificationStatus()) && (Objects.isNull(basicGridRecord.getRectificationStatus())
|| (!basicGridRecord.getRectificationStatus().contains("bw-engineering")))) { || (!basicGridRecord.getRectificationStatus().contains("bw-engineering")))) {
up.set(BasicGridRecord::getBasicGridNode, "bw-engineering"); up.set(BasicGridRecord::getBasicGridNode, "bw-engineering");
up.set(BasicGridRecord::getGridStatus, GridStatusEnum.GCDSH.getCode()); up.set(BasicGridRecord::getGridStatus, GridStatusEnum.GCDSH.getCode());
//完成设计
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_BWSJSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
} else if (null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0") } else if (null == basicGridRecord.getPowerStationEngineeringStatus() && approvalStatus.equals("0")
&& basicGridRecord.getRectificationStatus().contains("bw-engineering")) { && basicGridRecord.getRectificationStatus().contains("bw-engineering")) {
up.set(BasicGridRecord::getBasicGridNode, "bw-engineering"); up.set(BasicGridRecord::getBasicGridNode, "bw-engineering");
...@@ -682,12 +746,25 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta ...@@ -682,12 +746,25 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
acceptanceCheck.setInstanceId(null); acceptanceCheck.setInstanceId(null);
acceptanceCheck.setAcceptanceCheckStatus(GridStatusEnum.DTJYS.getCode()); acceptanceCheck.setAcceptanceCheckStatus(GridStatusEnum.DTJYS.getCode());
acceptanceCheckService.saveOrUpdate(acceptanceCheck); acceptanceCheckService.saveOrUpdate(acceptanceCheck);
//生成验收待办
PeasantHousehold peasantHousehold = peasantHouseholdMapper.selectById(basicGridRecord.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO();
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getBusiness(), peasantHousehold.getOwnersName()+"待新增验收提交",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-工程");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesName(), roleId);
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks1);
} else if (null == basicGridRecord.getPowerStationDesignStatus() && approvalStatus.equals("0") } else if (null == basicGridRecord.getPowerStationDesignStatus() && approvalStatus.equals("0")
&& (Objects.isNull(basicGridRecord.getRectificationStatus()) && (Objects.isNull(basicGridRecord.getRectificationStatus())
|| (!basicGridRecord.getRectificationStatus().contains("bw-design")))) { || (!basicGridRecord.getRectificationStatus().contains("bw-design")))) {
up.set(BasicGridRecord::getBasicGridNode, "bw-design"); up.set(BasicGridRecord::getBasicGridNode, "bw-design");
up.set(BasicGridRecord::getGridStatus, GridStatusEnum.SJDSH.getCode()); up.set(BasicGridRecord::getGridStatus, GridStatusEnum.SJDSH.getCode());
//完成工程
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_BWGCSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
} else if (null == basicGridRecord.getPowerStationDesignStatus() && approvalStatus.equals("0") } else if (null == basicGridRecord.getPowerStationDesignStatus() && approvalStatus.equals("0")
&& !Objects.isNull(basicGridRecord.getRectificationStatus()) && !Objects.isNull(basicGridRecord.getRectificationStatus())
&& basicGridRecord.getRectificationStatus().contains("bw-design")) { && basicGridRecord.getRectificationStatus().contains("bw-design")) {
......
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 @ 25987157
...@@ -93,7 +93,7 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer ...@@ -93,7 +93,7 @@ public class DealerReviewServiceImpl extends BaseService<DealerReviewDto, Dealer
routhPathVO.setRouthPathId(String.valueOf(dealerReview.getUnitInfoId())); routhPathVO.setRouthPathId(String.valueOf(dealerReview.getUnitInfoId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.经销商审核.getCode(),dealerReview.getNextProcessNode(), routhPathVO); String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.经销商审核.getCode(),dealerReview.getNextProcessNode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.经销商审核.getCode(),dealerReview.getNextProcessNode(), routhPathVO); String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.经销商审核.getCode(),dealerReview.getNextProcessNode(), routhPathVO);
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.经销商审核.getCode(), dealerReview.getUnitInfoId(), "经销商"+ name +"待经销商审核", regionalCompaniesCode, routhPath,wxRouthPath); ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.经销商审核.getCode(), dealerReview.getUnitInfoId(), name +"待审核", regionalCompaniesCode, routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-管理员"); String roleId = toDoTasksService.getRoleIdByName("户用光伏-管理员");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(null, roleId); List<String> todoUserIds = toDoTasksService.getTodoUserIds(null, roleId);
toDoTasksService.addToDoTasksByUserIds(todoUserIds, toDoTasks); toDoTasksService.addToDoTasksByUserIds(todoUserIds, toDoTasks);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingInfoServiceImpl.java
View file @ 25987157
...@@ -4,12 +4,10 @@ import cn.hutool.core.bean.BeanUtil; ...@@ -4,12 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
...@@ -22,7 +20,6 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.*; ...@@ -22,7 +20,6 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits; import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingAuditingDto; import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingAuditingDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingInfoDto; import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingInfoDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.TaskModelDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto; import com.yeejoin.amos.boot.module.hygf.api.dto.WorkflowResultDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*; import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingInfoMapper; import com.yeejoin.amos.boot.module.hygf.api.mapper.FinancingInfoMapper;
...@@ -39,13 +36,11 @@ import org.apache.commons.lang3.BooleanUtils; ...@@ -39,13 +36,11 @@ import org.apache.commons.lang3.BooleanUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigInteger;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -224,20 +219,22 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina ...@@ -224,20 +219,22 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
financingAuditingDto.setPeasantHouseholdId(Long.valueOf(e)); financingAuditingDto.setPeasantHouseholdId(Long.valueOf(e));
financingAuditingDto.setPromoter(RequestContext.getExeUserId()); financingAuditingDto.setPromoter(RequestContext.getExeUserId());
financingAuditingService.createWithModel(financingAuditingDto); financingAuditingService.createWithModel(financingAuditingDto);
//完成新增投融
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(),HygfRouthTypeEnum.HYGF_XZTSRZ.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
//发起待办 //发起待办
String taskName="您有一条验收的待办"; String taskName="您有一条投融的待办";
String orgCode="";
if(Objects.nonNull(peasantHousehold)){ if(Objects.nonNull(peasantHousehold)){
taskName="电站名称" + peasantHousehold.getOwnersName() + "有一条投融资状态为" +FinancingAuditEnum.待融资审核.getName() + "待办" ; taskName= peasantHousehold.getOwnersName() +"待融资审核" ;
orgCode=peasantHousehold.getRegionalCompaniesCode();
} }
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr())); routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.投融资管理.getCode(), peasantHousehold.getSequenceNbr(), taskName, orgCode,routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(), peasantHousehold.getSequenceNbr(), taskName, model.getFinancingCompaniesCode(),routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks); List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.投融资.getCode(), workflowResultDto.getNextNodeKey(),userIds, model.getFinancingCompaniesCode(), peasantHousehold.getDeveloperCode());
toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks);
} }
//批量 兼容审核不通过及整改待推送 //批量 兼容审核不通过及整改待推送
else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals("待推送") ){ else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals("待推送") ){
...@@ -287,7 +284,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina ...@@ -287,7 +284,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
this.deleteBySeq(financingInfo.getSequenceNbr()); this.deleteBySeq(financingInfo.getSequenceNbr());
//停止流程 //停止流程
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.投融资管理.getCode(), financingInfo.getPeasantHouseholdId()); ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.投融资.getCode(), financingInfo.getPeasantHouseholdId());
toDoTasksService.completeToDoTasks(toDoTasks,""); toDoTasksService.completeToDoTasks(toDoTasks,"");
} }
...@@ -377,16 +374,17 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina ...@@ -377,16 +374,17 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
String taskName="您有一条投融资的待办"; String taskName="您有一条投融资的待办";
String orgCode=""; String orgCode="";
if(Objects.nonNull(peasantHousehold)){ if(Objects.nonNull(peasantHousehold)){
taskName="电站名称" + peasantHousehold.getOwnersName() + "流程流转到" +workflowResultDto.getNextNodeName() + "需待办" ; taskName=peasantHousehold.getOwnersName() + "待" +workflowResultDto.getNextNodeName() ;
orgCode=peasantHousehold.getRegionalCompaniesCode(); orgCode=peasantHousehold.getRegionalCompaniesCode();
} }
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(financingAuditing.getPeasantHouseholdId())); routhPathVO.setRouthPathId(String.valueOf(financingAuditing.getPeasantHouseholdId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.投融资管理.getCode(), peasantHousehold.getSequenceNbr(), taskName,orgCode,routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.投融资.getCode(), peasantHousehold.getSequenceNbr(), taskName,orgCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks,""); List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.投融资.getCode(), workflowResultDto.getNextNodeKey(),userIds, orgCode, peasantHousehold.getDeveloperCode());
toDoTasksService.completeAndAddToDoTask(filterUsers,toDoTasks,"");
//节点为待整改时生成整改单 //节点为待整改时生成整改单
if (params.containsKey("isFlag") && params.get("isFlag").equals("1") && workflowResultDto.getNextNodeKey().equals(FinancingAuditEnum.待整改.getCode())) { if (params.containsKey("isFlag") && params.get("isFlag").equals("1") && workflowResultDto.getNextNodeKey().equals(FinancingAuditEnum.待整改.getCode())) {
if (params.containsKey("isHistory")){ if (params.containsKey("isHistory")){
......
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 @ 25987157
...@@ -9,12 +9,14 @@ import com.github.pagehelper.PageInfo; ...@@ -9,12 +9,14 @@ import com.github.pagehelper.PageInfo;
import com.qiyuesuo.sdk.v2.bean.User; import com.qiyuesuo.sdk.v2.bean.User;
import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.HygfRouthTypeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum; 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.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.*; 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.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.service.IHouseholdContractService; import com.yeejoin.amos.boot.module.hygf.api.service.IHouseholdContractService;
import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil; import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -247,9 +249,13 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD ...@@ -247,9 +249,13 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
householdContractMapper.updateById(householdContract); householdContractMapper.updateById(householdContract);
//创建农户待办 //创建农户待办
ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户" + householdContract.getPartyA() + "的合同填写", householdContract.getDealerCode()); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(householdContract.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTQS.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTQS.getCode(), routhPathVO);
ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), householdContract.getSequenceNbr(), householdContract.getPartyA() + "待合同签署", householdContract.getDealerCode(),routhPath,wxRouthPath);
PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId()); PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getAmosUserId(), toDoTasks1, "任务明细：合同发起成功"); toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getAmosUserId(), toDoTasks1, "");
return householdContract; return householdContract;
} }
...@@ -387,9 +393,13 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD ...@@ -387,9 +393,13 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
householdContractMapper.updateById(householdContract); householdContractMapper.updateById(householdContract);
//生成填报任务 //生成填报任务
ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户" + householdContract.getPartyA() + "的合同填写", householdContract.getDealerCode()); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(householdContract.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTQS.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTQS.getCode(), routhPathVO);
ToDoTasks toDoTasks1 = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), householdContract.getSequenceNbr(), "用户" + householdContract.getPartyA() + "的合同填写", householdContract.getDealerCode(),routhPath,wxRouthPath);
PeasantHousehold peasan = peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId()); PeasantHousehold peasan = peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
toDoTasksServiceImpl.addToDoTasksByUserId(peasan.getAmosUserId(), toDoTasks1, "任务明细：合同发起成功"); toDoTasksServiceImpl.addToDoTasksByUserId(peasan.getAmosUserId(), toDoTasks1, "");
return householdContract; return householdContract;
......
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 @ 25987157
...@@ -2,30 +2,24 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl; ...@@ -2,30 +2,24 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.util.BooleanUtil; import cn.hutool.core.util.BooleanUtil;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.Enum.*; import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.dto.*; 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.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.*; import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.service.IPeasantHouseholdService; import com.yeejoin.amos.boot.module.hygf.api.service.IPeasantHouseholdService;
import com.yeejoin.amos.boot.module.hygf.api.service.IWxService; import com.yeejoin.amos.boot.module.hygf.api.service.IWxService;
import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil; import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO; import com.yeejoin.amos.boot.module.hygf.biz.vo.RouthPathVO;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
...@@ -33,7 +27,6 @@ import com.yeejoin.amos.component.robot.AmosRequestContext; ...@@ -33,7 +27,6 @@ import com.yeejoin.amos.component.robot.AmosRequestContext;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.*; import com.yeejoin.amos.feign.privilege.model.*;
import com.yeejoin.amos.feign.privilege.util.DesUtil; import com.yeejoin.amos.feign.privilege.util.DesUtil;
import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -204,12 +197,16 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto ...@@ -204,12 +197,16 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
todoUserIds.add(peasantHousehold.getDeveloperUserId()); todoUserIds.add(peasantHousehold.getDeveloperUserId());
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr())); routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.电站勘察.getCode(),HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO); String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.勘察.getCode(),HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.电站勘察.getCode(),HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO); String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.勘察.getCode(),HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.电站勘察.getCode(), peasantHousehold.getSequenceNbr(), "用户"+householdContract.getPartyA()+"电站信息勘察",householdContract.getDealerCode(),routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.勘察.getCode(), peasantHousehold.getSequenceNbr(), "用户"+householdContract.getPartyA()+"电站信息勘察",householdContract.getDealerCode(),routhPath,wxRouthPath);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks); toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户"+householdContract.getPartyA()+"的合同待发起",householdContract.getDealerCode()); RouthPathVO routhPathVO1 = new RouthPathVO();
routhPathVO1.setRouthPathId(String.valueOf(householdContract.getSequenceNbr()));
String routhPath1 = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO);
String wxRouthPath1 = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.合同.getCode(), householdContract.getSequenceNbr(), householdContract.getPartyA()+"待合同发起",householdContract.getDealerCode(),routhPath1,wxRouthPath1);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks1); toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
return model; return model;
} }
...@@ -965,16 +962,16 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto ...@@ -965,16 +962,16 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
todoUserIds.add(peasantHousehold.getDeveloperUserId()); todoUserIds.add(peasantHousehold.getDeveloperUserId());
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr())); routhPathVO.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.电站勘察.getCode(), HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO); String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.勘察.getCode(), HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.电站勘察.getCode(), HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO); String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.勘察.getCode(), HygfRouthTypeEnum.HYGF_DZKC.getCode(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.电站勘察.getCode(), peasantHousehold.getSequenceNbr(), "用户"+householdContract.getPartyA()+"电站信息勘察",householdContract.getDealerCode(),routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.勘察.getCode(), peasantHousehold.getSequenceNbr(), "用户"+householdContract.getPartyA()+"电站信息勘察",householdContract.getDealerCode(),routhPath,wxRouthPath);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks); toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
RouthPathVO routhPathVO1 = new RouthPathVO(); RouthPathVO routhPathVO1 = new RouthPathVO();
routhPathVO1.setRouthPathId(String.valueOf(peasantHousehold.getSequenceNbr())); routhPathVO1.setRouthPathId(String.valueOf(householdContract.getSequenceNbr()));
String routhPath1 = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同填报.getCode(), HygfRouthTypeEnum.HYGF_HTTB.getCode(), routhPathVO1); String routhPath1 = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO);
String wxRouthPath1 = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同填报.getCode(), HygfRouthTypeEnum.HYGF_HTTB.getCode(), routhPathVO1); String wxRouthPath1 = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), "用户"+householdContract.getPartyA()+"的合同待发起",householdContract.getDealerCode(),routhPath1,wxRouthPath1); ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.合同.getCode(), householdContract.getSequenceNbr(), householdContract.getPartyA()+"待合同发起",householdContract.getDealerCode(),routhPath1,wxRouthPath1);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks1); toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
......
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 @ 25987157
package com.yeejoin.amos.boot.module.hygf.biz.service.impl; package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
...@@ -10,7 +9,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; ...@@ -10,7 +9,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.module.hygf.api.Enum.*; import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
import com.yeejoin.amos.boot.module.hygf.api.dto.*; 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.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService; import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
...@@ -27,11 +25,9 @@ import com.yeejoin.amos.feign.workflow.model.TaskResultDTO; ...@@ -27,11 +25,9 @@ import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.BooleanUtils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;
import org.typroject.tyboot.component.emq.EmqKeeper; import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.exception.BaseException; import org.typroject.tyboot.core.foundation.exception.BaseException;
import org.typroject.tyboot.core.rdbms.annotation.Condition; import org.typroject.tyboot.core.rdbms.annotation.Condition;
...@@ -229,20 +225,21 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -229,20 +225,21 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
PeasantHousehold peasantHousehold = peasantHouseholdService.getById(powerStation.getPeasantHouseholdId()); PeasantHousehold peasantHousehold = peasantHouseholdService.getById(powerStation.getPeasantHouseholdId());
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(powerStation.getSequenceNbr())); routhPathVO.setRouthPathId(String.valueOf(powerStation.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.电站审核.getCode(),powerStation.getNextProcessNode(), routhPathVO); String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.勘察.getCode(),powerStation.getNextProcessNode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.电站审核.getCode(),powerStation.getNextProcessNode(), routhPathVO); String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.勘察.getCode(),powerStation.getNextProcessNode(), routhPathVO);
if (PowerStationNodeEnum.经销商确认.getCode().equals(powerStationNodeEnum.getCode())) { if (PowerStationNodeEnum.经销商确认.getCode().equals(powerStationNodeEnum.getCode())) {
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(), "用户" + name + "电站勘察待" + powerStationNodeEnum.getName(), peasantHousehold.getDeveloperCode(),routhPath,wxRouthPath); ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.勘察.getCode(), powerStation.getSequenceNbr(), name + "勘察待" + powerStationNodeEnum.getName(), peasantHousehold.getDeveloperCode(),routhPath,wxRouthPath);
List<String> userIds = new ArrayList<>(); List<String> userIds = new ArrayList<>();
userIds.add(peasantHousehold.getDeveloperUserId()); userIds.add(peasantHousehold.getDeveloperUserId());
toDoTasksServiceImpl.addToDoTasksByUserIds(userIds, toDoTasks); toDoTasksServiceImpl.addToDoTasksByUserIds(userIds, toDoTasks);
}else { }else {
ToDoTasks toDoTasks= new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(), "用户" + name + "电站勘察待" + powerStationNodeEnum.getName(), peasantHousehold.getDeveloperCode(),routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks(TaskTypeStationEnum.勘察.getCode(), powerStation.getSequenceNbr(), name + "勘察待" + powerStationNodeEnum.getName(), peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
List<String> todoUserIds = Arrays.asList(Optional.ofNullable(powerStation.getNextExecuteUserIds()).orElse("").split(",")); List<String> todoUserIds = Arrays.asList(Optional.ofNullable(powerStation.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksServiceImpl.completeAndAddToDoTask(todoUserIds, toDoTasks,meg); List<String> filterUsers = toDoTasksServiceImpl.filterUsers(TaskTypeStationEnum.勘察.getCode(),powerStation.getNextProcessNode(),todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
toDoTasksServiceImpl.completeAndAddToDoTask(filterUsers, toDoTasks,meg);
} }
} else { } else {
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr()); ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.勘察.getCode(), powerStation.getSequenceNbr());
toDoTasksServiceImpl.completeToDoTasks(toDoTasks,meg); toDoTasksServiceImpl.completeToDoTasks(toDoTasks,meg);
} }
...@@ -429,6 +426,14 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -429,6 +426,14 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
List<HouseholdContract> householdContracts = householdContractMapper.selectList(queryWrapper); List<HouseholdContract> householdContracts = householdContractMapper.selectList(queryWrapper);
if (CollectionUtil.isNotEmpty(householdContracts) && householdContracts.size()>0 ){ if (CollectionUtil.isNotEmpty(householdContracts) && householdContracts.size()>0 ){
peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode()); peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
//生成发货待办
RouthPathVO routhPathVO = new RouthPathVO();
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getCode(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getBusiness(), peasantHousehold.getOwnersName()+"待新增发货单",peasantHousehold.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksServiceImpl.getRoleIdByName("户用光伏-仓储");
List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java
View file @ 25987157
...@@ -2,26 +2,20 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl; ...@@ -2,26 +2,20 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils; import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.Enum.*; import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
import com.yeejoin.amos.boot.module.hygf.api.dto.*; 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.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.*; import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.service.IHygfPreparationMoneyAuditingService;
import com.yeejoin.amos.boot.module.hygf.api.service.IPreparationMoneyService; import com.yeejoin.amos.boot.module.hygf.api.service.IPreparationMoneyService;
import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil; import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient; import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
...@@ -40,7 +34,6 @@ import org.springframework.beans.BeanUtils; ...@@ -40,7 +34,6 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.Bean; import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
...@@ -669,14 +662,18 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -669,14 +662,18 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
hygfPreparationMoneyAuditingDto.setPreparationMoneyId(model.getSequenceNbr()); hygfPreparationMoneyAuditingDto.setPreparationMoneyId(model.getSequenceNbr());
hygfPreparationMoneyAuditingDto.setPromoter(RequestContext.getExeUserId()); hygfPreparationMoneyAuditingDto.setPromoter(RequestContext.getExeUserId());
hygfPreparationMoneyAuditingService.createWithModel(hygfPreparationMoneyAuditingDto); hygfPreparationMoneyAuditingService.createWithModel(hygfPreparationMoneyAuditingDto);
//完成新增待办
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getBusiness());
toDoTasksServiceImpl.completeToDoTasks(toDoTasks1,"");
//发起待办 //发起待办
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr())); routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货管理.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO); String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货管理.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO); String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货.getCode(), workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.发货管理.getCode(), model.getSequenceNbr(), "下单人"+model.getOrderUser()+"发货待确认",model.getRegionalCompaniesCode(),routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.发货.getCode(), model.getSequenceNbr(), model.getOrderUser()+"待确认收货单",model.getRegionalCompaniesCode(),routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksServiceImpl.completeAndAddToDoTask(userIds,toDoTasks,""); List<String> filterUsers = toDoTasksServiceImpl.filterUsers(TaskTypeStationEnum.发货.getCode(), workflowResultDto.getNextNodeKey(),userIds, model.getRegionalCompaniesCode(), model.getAmosUnitOrgCode());
toDoTasksServiceImpl.addToDoTasksByUserIds(filterUsers,toDoTasks);
//提交时 赋值发货时间及订单状态 //提交时 赋值发货时间及订单状态
model.setDeliveryTime(new Date()); model.setDeliveryTime(new Date());
model.setDeliveryState(DeliveryStateeEnum.已发货.getName()); model.setDeliveryState(DeliveryStateeEnum.已发货.getName());
...@@ -770,14 +767,18 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -770,14 +767,18 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
hygfPreparationMoneyAuditingDto.setPreparationMoneyId(model.getSequenceNbr()); hygfPreparationMoneyAuditingDto.setPreparationMoneyId(model.getSequenceNbr());
hygfPreparationMoneyAuditingDto.setPromoter(RequestContext.getExeUserId()); hygfPreparationMoneyAuditingDto.setPromoter(RequestContext.getExeUserId());
hygfPreparationMoneyAuditingService.createWithModel(hygfPreparationMoneyAuditingDto); hygfPreparationMoneyAuditingService.createWithModel(hygfPreparationMoneyAuditingDto);
//完成新增待办
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getBusiness());
toDoTasksServiceImpl.completeToDoTasks(toDoTasks1,"");
//发起待办 //发起待办
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr())); routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.发货管理.getCode(), model.getSequenceNbr(), "下单人"+model.getOrderUser()+"发货待确认",model.getRegionalCompaniesCode(),routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.发货.getCode(), model.getSequenceNbr(), model.getOrderUser()+"待确认收货单",model.getRegionalCompaniesCode(),routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksServiceImpl.addToDoTasksByUserIds(userIds,toDoTasks); List<String> filterUsers = toDoTasksServiceImpl.filterUsers(TaskTypeStationEnum.发货.getCode(),workflowResultDto.getNextNodeKey(),userIds, model.getRegionalCompaniesCode(), model.getAmosUnitOrgCode());
toDoTasksServiceImpl.addToDoTasksByUserIds(filterUsers,toDoTasks);
}else { }else {
up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.暂存发货.getCode()); up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.暂存发货.getCode());
up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.暂存发货.getCode()); up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.暂存发货.getCode());
...@@ -997,16 +998,28 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -997,16 +998,28 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
LambdaQueryWrapper<DocumentStation> stations = new LambdaQueryWrapper<>(); LambdaQueryWrapper<DocumentStation> stations = new LambdaQueryWrapper<>();
stations.eq(DocumentStation::getPreparationMoneyId,model.getSequenceNbr()); stations.eq(DocumentStation::getPreparationMoneyId,model.getSequenceNbr());
List<DocumentStation> documentStations = documentStationMapper.selectList(stations); List<DocumentStation> documentStations = documentStationMapper.selectList(stations);
String taskName= "";
if(CollectionUtil.isNotEmpty(documentStations)){
taskName = "[";
for (DocumentStation documentStation : documentStations) { for (DocumentStation documentStation : documentStations) {
idsH.add(documentStation.getStationId()); idsH.add(documentStation.getStationId());
taskName= taskName + documentStation.getOwnersName() + ",";
}
taskName= taskName.substring(0,taskName.length()-1)+"]";
} }
if (kv.getOrDefault("approvalStatus", "").equals("0")) { if (kv.getOrDefault("approvalStatus", "").equals("0")) {
up.set(PeasantHousehold::getPreparationMoneyState, ArrivalStateeEnum.备货完成.getName()); up.set(PeasantHousehold::getPreparationMoneyState, ArrivalStateeEnum.备货完成.getName());
up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.备货完成.getName()); up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.备货完成.getName());
model.setOrderStatus(DeliveryStateeEnum.已完成.getName()); model.setOrderStatus(DeliveryStateeEnum.已完成.getName());
model.setArrivalTime(new Date()); model.setArrivalTime(new Date());
//生成施工待办
RouthPathVO routhPathVO = new RouthPathVO();
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.施工.getCode(), HygfRouthTypeEnum.HYGF_XZPGD.getCode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.施工.getCode(), HygfRouthTypeEnum.HYGF_XZPGD.getCode(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.施工.getCode(), HygfRouthTypeEnum.HYGF_XZPGD.getBusiness(), taskName+"待新增派工单",model.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksServiceImpl.getRoleIdByName("户用光伏-经销商-工程");
List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(model.getRegionalCompaniesCode(), roleId,String.valueOf(model.getAmosUnitId()));
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
} else if (kv.getOrDefault("approvalStatus", "").equals("1")) { } else if (kv.getOrDefault("approvalStatus", "").equals("1")) {
up.set(PeasantHousehold::getPreparationMoneyState, ArrivalStateeEnum.待收货.getName()); up.set(PeasantHousehold::getPreparationMoneyState, ArrivalStateeEnum.待收货.getName());
up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.待收货.getName()); up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.待收货.getName());
...@@ -1051,13 +1064,25 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -1051,13 +1064,25 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
if( model instanceof PreparationMoney){ if( model instanceof PreparationMoney){
PreparationMoney preparationMoney = (PreparationMoney) model; PreparationMoney preparationMoney = (PreparationMoney) model;
//更新待办 //更新待办
String taskName="[";
LambdaQueryWrapper<DocumentStation> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(DocumentStation::getPreparationMoneyId,preparationMoney.getSequenceNbr());
List<DocumentStation> documentStations = documentStationMapper.selectList(wrapper);
if (CollectionUtil.isNotEmpty(documentStations)){
taskName="[";
for (DocumentStation documentStation : documentStations) {
taskName= taskName + documentStation.getOwnersName() + ",";
}
taskName= taskName.substring(0,taskName.length()-1)+"]";
}
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(preparationMoney.getSequenceNbr())); routhPathVO.setRouthPathId(String.valueOf(preparationMoney.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.发货.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货管理.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.发货管理.getCode(), preparationMoney.getSequenceNbr(), "下单人"+preparationMoney.getOrderUser()+"发货"+preparationMoney.getOrderStatus(),preparationMoney.getRegionalCompaniesCode(),routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.发货.getCode(), preparationMoney.getSequenceNbr(), taskName + preparationMoney.getOrderStatus()+"收货单",preparationMoney.getRegionalCompaniesCode(),routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksServiceImpl.completeAndAddToDoTask(userIds,toDoTasks,""); List<String> filterUsers = toDoTasksServiceImpl.filterUsers(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(),userIds, preparationMoney.getRegionalCompaniesCode(), preparationMoney.getAmosUnitOrgCode());
toDoTasksServiceImpl.completeAndAddToDoTask(filterUsers,toDoTasks,"");
} }
BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto); BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto);
preparationMoneyAuditpDto.setPreparationMoneyId(hygfPreparationMoneyAuditing.getPreparationMoneyId()); preparationMoneyAuditpDto.setPreparationMoneyId(hygfPreparationMoneyAuditing.getPreparationMoneyId());
......
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 @ 25987157
package com.yeejoin.amos.boot.module.hygf.biz.service.impl; package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
...@@ -36,18 +34,15 @@ import org.apache.commons.lang3.StringUtils; ...@@ -36,18 +34,15 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.component.emq.EmqKeeper; import org.typroject.tyboot.component.emq.EmqKeeper;
import org.typroject.tyboot.core.foundation.exception.BaseException;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest; import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* 勘察信息服务实现类 * 勘察信息服务实现类
...@@ -304,7 +299,7 @@ public class SurveyInformationServiceImpl ...@@ -304,7 +299,7 @@ public class SurveyInformationServiceImpl
// peasantHousehold.setSurveyOrNot(1); // peasantHousehold.setSurveyOrNot(1);
} else if (OPERATION_TYPE_APPLY.equals(operationType)) { } else if (OPERATION_TYPE_APPLY.equals(operationType)) {
// 提交审核 // 提交审核
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.电站勘察.getCode(), peasantHousehold.getSequenceNbr()); ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.勘察.getCode(), peasantHousehold.getSequenceNbr());
toDoTasksService.completeToDoTasks(toDoTasks,""); toDoTasksService.completeToDoTasks(toDoTasks,"");
submitExamine(peasantHousehold); submitExamine(peasantHousehold);
} }
......
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 @ 25987157
...@@ -35,6 +35,7 @@ import java.io.UnsupportedEncodingException; ...@@ -35,6 +35,7 @@ import java.io.UnsupportedEncodingException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -61,9 +62,9 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T ...@@ -61,9 +62,9 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
@Autowired @Autowired
Sequence sequence; Sequence sequence;
@Value("classpath:/json/hygfRouth.json") @Value("classpath:/json/hygfRouth.json")
private Resource urlInfo; private Resource hygfRouth;
@Value("classpath:/json/wxHygfRouth.json") @Value("classpath:/json/wxHygfRouth.json")
private Resource wxUrlInfo; private Resource wxHygfRouth;
/** /**
* 分页查询 * 分页查询
...@@ -324,14 +325,34 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T ...@@ -324,14 +325,34 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
} }
//获取路由地址 //获取路由地址
public List<String> filterUsers(String taskType, String key, List<String> userId, String companyOrgCode, String amosDealerCode) {
List<String> filterUsers = new ArrayList<>();
List<Map> hygfRouthList = JsonUtils.getResourceList(hygfRouth);
if (CollectionUtils.isNotEmpty(userId) && CollectionUtils.isNotEmpty(hygfRouthList)) {
for (Map map : hygfRouthList) {
if (map.get("taskType").equals(taskType) && map.get("key").equals(key) && "0".equals(map.get("isNeedSpecialDeal"))) {
String isAdminRole = (String) map.get("isAdminRole");
if ("1".equals(isAdminRole)) {
filterUsers = toDoTasksMapper.filterUsersByAdmin(companyOrgCode, userId);
} else if ("0".equals(isAdminRole)) {
filterUsers = toDoTasksMapper.filterUsersByAmosDealer(companyOrgCode, amosDealerCode, userId);
}
break;
}
}
}
return filterUsers;
}
//获取路由地址
public String getRouthPath(String taskType, String key, Object model) { public String getRouthPath(String taskType, String key, Object model) {
List<Map> urlList = JsonUtils.getResourceList(urlInfo); List<Map> urlList = JsonUtils.getResourceList(hygfRouth);
return getRouthPath(taskType, key, urlList, model); return getRouthPath(taskType, key, urlList, model);
} }
//获取微信路由地址 //获取微信路由地址
public String getWxRouthPath(String taskType, String key, Object model) { public String getWxRouthPath(String taskType, String key, Object model) {
List<Map> urlList = JsonUtils.getResourceList(wxUrlInfo); List<Map> urlList = JsonUtils.getResourceList(wxHygfRouth);
return getRouthPath(taskType, key, urlList, model); return getRouthPath(taskType, key, urlList, model);
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java
View file @ 25987157
...@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil; ...@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
...@@ -16,7 +15,6 @@ import com.yeejoin.amos.boot.module.hygf.api.Enum.*; ...@@ -16,7 +15,6 @@ 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.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.*; 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.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.service.IHygfWorkOrderStationAuditingService;
import com.yeejoin.amos.boot.module.hygf.api.service.IWorkOrderService; import com.yeejoin.amos.boot.module.hygf.api.service.IWorkOrderService;
import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils; import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil; import com.yeejoin.amos.boot.module.hygf.api.util.CommonResponseNewUtil;
...@@ -167,6 +165,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W ...@@ -167,6 +165,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
throw new Exception("电站" + names + ",已被工单关联,请重新选择电站"); throw new Exception("电站" + names + ",已被工单关联,请重新选择电站");
} }
// 保存派工单 // 保存派工单
RegionalCompanies regionalCompanies = regionalCompaniesMapper.selectRegionName(model.getRegionCompanyId()); RegionalCompanies regionalCompanies = regionalCompaniesMapper.selectRegionName(model.getRegionCompanyId());
String code = NumberUtil.getCode(CodeEnum.派工单.getCode(), regionalCompanies.getCompanyCode(), String code = NumberUtil.getCode(CodeEnum.派工单.getCode(), regionalCompanies.getCompanyCode(),
...@@ -215,12 +214,20 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W ...@@ -215,12 +214,20 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
} }
constructionRecordsServiceImpl.saveBatch(constructionRecordlist); constructionRecordsServiceImpl.saveBatch(constructionRecordlist);
//完成新增派工单待办
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.施工.getCode(), HygfRouthTypeEnum.HYGF_XZPGD.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
//新增待办 //新增待办
String taskName="";
if(CollectionUtil.isNotEmpty(peasantHouseholdId)){
taskName="["+peasantHouseholdId.stream().map(i -> i.getOwnersName()).collect(Collectors.joining(","));
taskName=taskName+"]";
}
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr())); routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.派工发料.getCode(), HygfRouthTypeEnum.HYGF_DSG.getCode(), routhPathVO); String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.施工.getCode(), HygfRouthTypeEnum.HYGF_DSG.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.派工发料.getCode(), HygfRouthTypeEnum.HYGF_DSG.getCode(), routhPathVO); String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.施工.getCode(), HygfRouthTypeEnum.HYGF_DSG.getCode(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.派工发料.getCode(), model.getSequenceNbr(), "有一个派单编号"+model.getWorkOrderNum()+"待施工",model.getRegionCode(),routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.施工.getCode(), model.getSequenceNbr(), taskName +"待施工",model.getRegionCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-施工"); String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-施工");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(model.getRegionCode(), roleId, String.valueOf(model.getAmosDealerId())); List<String> todoUserIds = toDoTasksService.getTodoUserIds(model.getRegionCode(), roleId, String.valueOf(model.getAmosDealerId()));
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks); toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks);
...@@ -391,19 +398,21 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W ...@@ -391,19 +398,21 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
hygfWorkOrderStationAuditingService.createWithModel(hygfWorkOrderStationAuditingDto); hygfWorkOrderStationAuditingService.createWithModel(hygfWorkOrderStationAuditingDto);
//发起待办 //发起待办
WorkOrder workOrder = this.selectOne(powerStationConstructionData.getWorkOrderId()); WorkOrder workOrder = this.selectOne(powerStationConstructionData.getWorkOrderId());
String taskName="派工发料提交完成,需处理";
String regionalCompaniesCode=""; String regionalCompaniesCode="";
String amosDealerOrgCode="";
if(Objects.nonNull(workOrder)){ if(Objects.nonNull(workOrder)){
taskName="工程负责人"+workOrder.getPreparer() +"派工单"+ WorkOrderEnum.待登记.getCode();
regionalCompaniesCode=workOrder.getRegionCode(); regionalCompaniesCode=workOrder.getRegionCode();
amosDealerOrgCode=workOrder.getAmosDealerOrgCode();
} }
String taskName = "["+workOrderPowerStationMapper.getStationName(powerStationConstructionData.getWorkOrderId())+"]"+WorkOrderEnum.待登记.getCode();
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(powerStationConstructionData.getWorkOrderPowerStationId())); routhPathVO.setRouthPathId(String.valueOf(powerStationConstructionData.getWorkOrderPowerStationId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.施工完工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.施工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.施工完工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.施工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.施工完工.getCode(), powerStationConstructionData.getWorkOrderPowerStationId(), taskName, regionalCompaniesCode,routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.施工.getCode(), powerStationConstructionData.getWorkOrderPowerStationId(), taskName, regionalCompaniesCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks); List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.施工.getCode(),workflowResultDto.getNextNodeKey(),userIds, regionalCompaniesCode, amosDealerOrgCode);
toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks);
}else { }else {
this.wofkflowExcute(workOrderStationAuditing.getInstanceId(),"0","通过",BusinessWorkflowKey.施工完成提交.getCode()); this.wofkflowExcute(workOrderStationAuditing.getInstanceId(),"0","通过",BusinessWorkflowKey.施工完成提交.getCode());
} }
...@@ -551,19 +560,21 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W ...@@ -551,19 +560,21 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
//更新待办 //更新待办
WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectById(hygfWorkOrderStationAuditing.getWorkOrderPowerStationId()); WorkOrderPowerStation workOrderPowerStation = workOrderPowerStationMapper.selectById(hygfWorkOrderStationAuditing.getWorkOrderPowerStationId());
WorkOrder workOrder = this.selectOne(workOrderPowerStation.getWorkOrderId()); WorkOrder workOrder = this.selectOne(workOrderPowerStation.getWorkOrderId());
String taskName="";
String regionalCompaniesCode=""; String regionalCompaniesCode="";
String amosDealerOrgCode="";
if(Objects.nonNull(workOrder)){ if(Objects.nonNull(workOrder)){
taskName="工程负责人"+workOrder.getPreparer() +"派工单"+ workflowResultDto.getNextNodeName();
regionalCompaniesCode=workOrder.getRegionCode(); regionalCompaniesCode=workOrder.getRegionCode();
amosDealerOrgCode = workOrder.getAmosDealerOrgCode();
} }
String taskName = "["+workOrderPowerStationMapper.getStationName(workOrderPowerStation.getWorkOrderId())+"]待"+workflowResultDto.getNextNodeName();
RouthPathVO routhPathVO = new RouthPathVO(); RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(hygfWorkOrderStationAuditing.getWorkOrderPowerStationId())); routhPathVO.setRouthPathId(String.valueOf(hygfWorkOrderStationAuditing.getWorkOrderPowerStationId()));
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.施工完工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.施工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.施工完工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO); String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.施工.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.施工完工.getCode(), hygfWorkOrderStationAuditing.getWorkOrderPowerStationId(), taskName,regionalCompaniesCode,routhPath,wxRouthPath); ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.施工.getCode(), hygfWorkOrderStationAuditing.getWorkOrderPowerStationId(), taskName,regionalCompaniesCode,routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(",")); List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
toDoTasksService.completeAndAddToDoTask(userIds,toDoTasks,""); List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.施工.getCode(), workflowResultDto.getNextNodeKey(),userIds, regionalCompaniesCode, amosDealerOrgCode);
toDoTasksService.completeAndAddToDoTask(filterUsers,toDoTasks,"");
} }
public Page<WorkOrder> selectPage(int pageNum, int pageSize, WorkOrder workOrder) { public Page<WorkOrder> selectPage(int pageNum, int pageSize, WorkOrder workOrder) {
...@@ -1442,8 +1453,19 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W ...@@ -1442,8 +1453,19 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.已完工.getCode()); upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.已完工.getCode());
workOrderMapper.update(null, upq); workOrderMapper.update(null, upq);
//完成待办 //完成待办
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.派工发料.getCode(), workOrderPowerStation.getWorkOrderId()); ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.施工.getCode(), workOrderPowerStation.getWorkOrderId());
toDoTasksService.completeToDoTasks(toDoTasks,""); toDoTasksService.completeToDoTasks(toDoTasks,"");
//生成并网待办
String taskName = "["+workOrderPowerStationMapper.getStationName(workOrderPowerStation.getWorkOrderId())+"]";
WorkOrderDto workOrderDto = queryBySeq(workOrderPowerStation.getWorkOrderId());
RouthPathVO routhPathVO = new RouthPathVO();
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), routhPathVO);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getBusiness(), taskName+"待新增并网登记",workOrderDto.getRegionCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-经销商-开发");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(workOrderDto.getRegionCode(), roleId,String.valueOf(workOrderDto.getAmosDealerId()));
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/hygfRouth.json
View file @ 25987157
...@@ -3,210 +3,336 @@ ...@@ -3,210 +3,336 @@
"key": "jxs_03", "key": "jxs_03",
"taskType": "经销商审核", "taskType": "经销商审核",
"name": "经销商管理员审核", "name": "经销商管理员审核",
"url": "/mixuap?appId=1678340647909617665&id=1678365817248444417" "url": "/mixuap?appId=1678340647909617665&id=1678365817248444417",
"isNeedSpecialDeal": "1",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_dzkc", "key": "hygf_dzkc",
"taskType": "电站勘察", "taskType": "勘察",
"name": "电站勘察", "name": "电站勘察",
"url": "/mixuap?appId=1677158789557547009&id=1678284514217979905" "url": "/mixuap?appId=1677158789557547009&id=1678284514217979905",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
}, },
{ {
"key": "hygf_02", "key": "hygf_02",
"taskType": "电站审核", "taskType": "勘察",
"name": "经销商确认", "name": "经销商确认",
"url": "/mixuap?appId=1677158789557547009&id=1783749877520404481" "url": "/mixuap?appId=1677158789557547009&id=1783749877520404481",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
}, },
{ {
"key": "hygf_03", "key": "hygf_03",
"taskType": "电站审核", "taskType": "勘察",
"name": "设计审核", "name": "设计审核",
"url": "/mixuap?appId=1678340647909617665&id=1784391744234721281" "url": "/mixuap?appId=1678340647909617665&id=1784391744234721281",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_05", "key": "hygf_05",
"taskType": "电站审核", "taskType": "勘察",
"name": "投融审核", "name": "投融审核",
"url": "/mixuap?appId=1678340647909617665&id=1784391744234721281" "url": "/mixuap?appId=1678340647909617665&id=1784391744234721281",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_07", "key": "hygf_07",
"taskType": "电站审核", "taskType": "勘察",
"name": "法务审核", "name": "法务审核",
"url": "/mixuap?appId=1678340647909617665&id=1784391744234721281" "url": "/mixuap?appId=1678340647909617665&id=1784391744234721281",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_09", "key": "hygf_09",
"taskType": "电站审核", "taskType": "勘察",
"name": "设计上传典型图库", "name": "设计上传典型图库",
"url": "/mixuap?appId=1678340647909617665&id=1784391744234721281" "url": "/mixuap?appId=1678340647909617665&id=1784391744234721281",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_10", "key": "hygf_10",
"taskType": "电站审核", "taskType": "勘察",
"name": "经销商设计人员上传设计图", "name": "经销商设计人员上传设计图",
"url": "/mixuap?appId=1677158789557547009&id=1783750128415281153" "url": "/mixuap?appId=1677158789557547009&id=1783750128415281153",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "hygf_11", "key": "hygf_11",
"taskType": "电站审核", "taskType": "勘察",
"name": "设计图纸审核", "name": "设计图纸审核",
"url": "/mixuap?appId=1678340647909617665&id=1784391744234721281" "url": "/mixuap?appId=1678340647909617665&id=1784391744234721281",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_httb", "key": "hygf_htfq",
"taskType": "合同填报", "taskType": "合同",
"name": "合同填报", "name": "合同发起",
"url": "" "url": "",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
},
{
"key": "hygf_htqs",
"taskType": "合同",
"name": "合同签署",
"url": "",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
},
{
"key": "hygf_htgz",
"taskType": "合同",
"name": "合同盖章",
"url": "",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
},
{
"key": "fh_xzfhd",
"taskType": "发货",
"name": "新增发货单",
"url": "/mixuap?appId=1678340647909617665&id=1802911589028859905",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "fh_dtj", "key": "fh_dtj",
"taskType": "发货管理", "taskType": "发货",
"name": "待发货", "name": "待发货",
"url": "/mixuap?appId=1678340647909617665&id=1802911589028859905" "url": "/mixuap?appId=1678340647909617665&id=1802911589028859905",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "fh_dyr", "key": "fh_dyr",
"taskType": "发货管理", "taskType": "发货",
"name": "待确认", "name": "待确认",
"url": "/mixuap?appId=1677158789557547009&id=1808437079118450689" "url": "/mixuap?appId=1677158789557547009&id=1808437079118450689",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "fh_dsh", "key": "fh_dsh",
"taskType": "发货管理", "taskType": "发货",
"name": "待审核", "name": "待审核",
"url": "/mixuap?appId=1678340647909617665&id=1784391442173530113" "url": "/mixuap?appId=1678340647909617665&id=1784391442173530113",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "fh_sqbh", "key": "fh_sqbh",
"taskType": "发货管理", "taskType": "发货",
"name": "申请补货", "name": "申请补货",
"url": "/mixuap?appId=1677158789557547009&id=1808437079118450689" "url": "/mixuap?appId=1677158789557547009&id=1808437079118450689",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
},
{
"key": "hygf_xzfgd",
"taskType": "施工",
"name": "新增派工单",
"url": "/mixuap?appId=1677158789557547009&id=1742435224567967746",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "hygf_dsg", "key": "hygf_dsg",
"taskType": "派工发料", "taskType": "施工",
"name": "待施工", "name": "待施工",
"url": "" "url": "",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_0bs6t4g", "key": "Activity_0bs6t4g",
"taskType": "施工完工", "taskType": "施工",
"name": "施工完成提交", "name": "施工完成提交",
"url": "" "url": "",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_1spujef", "key": "Activity_1spujef",
"taskType": "施工完工", "taskType": "施工",
"name": "完工登记提交", "name": "完工登记提交",
"url": "/mixuap?appId=1677158789557547009&id=1742435340745994242" "url": "/mixuap?appId=1677158789557547009&id=1742435340745994242",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_16r1828", "key": "Activity_16r1828",
"taskType": "施工完工", "taskType": "施工",
"name": "完工自审", "name": "完工自审",
"url": "/mixuap?appId=1677158789557547009&id=1742435400158310401" "url": "/mixuap?appId=1677158789557547009&id=1742435400158310401",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_1bldcno", "key": "Activity_1bldcno",
"taskType": "施工完工", "taskType": "施工",
"name": "完工自审-片区运营中心", "name": "完工自审-片区运营中心",
"url": "/mixuap?appId=1678340647909617665&id=1823622039500492802" "url": "/mixuap?appId=1678340647909617665&id=1823622039500492802",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "Activity_1yftt2k", "key": "Activity_1yftt2k",
"taskType": "施工完工", "taskType": "施工",
"name": "工程审核", "name": "工程审核",
"url": "/mixuap?appId=1678340647909617665&id=1823622039500492802" "url": "/mixuap?appId=1678340647909617665&id=1823622039500492802",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "Activity_095if3p", "key": "Activity_095if3p",
"taskType": "施工完工", "taskType": "施工",
"name": "设计审核", "name": "设计审核",
"url": "/mixuap?appId=1678340647909617665&id=1823622039500492802" "url": "/mixuap?appId=1678340647909617665&id=1823622039500492802",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
},
{
"key": "bw_xzbwdj",
"taskType": "并网",
"name": "新增并网登记",
"url": "/mixuap?appId=1677158789557547009&id=1747137335817957378",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_0bs6t4g", "key": "Activity_0bs6t4g",
"taskType": "并网管理", "taskType": "并网",
"name": "并网登记提交", "name": "并网登记提交",
"url": "/mixuap?appId=1677158789557547009&id=1747137335817957378" "url": "/mixuap?appId=1677158789557547009&id=1747137335817957378",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_0r2x1es", "key": "Activity_0r2x1es",
"taskType": "并网管理", "taskType": "并网",
"name": "经销商管理审核", "name": "经销商管理审核",
"url": "/mixuap?appId=1677158789557547009&id=1747137335817957378" "url": "/mixuap?appId=1677158789557547009&id=1747137335817957378",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_05nlkey", "key": "Activity_05nlkey",
"taskType": "并网管理", "taskType": "并网",
"name": "片区审核", "name": "片区审核",
"url": "/mixuap?appId=1678340647909617665&id=1827892888785129474" "url": "/mixuap?appId=1678340647909617665&id=1827892888785129474",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "Activity_0k4o46e", "key": "Activity_0k4o46e",
"taskType": "并网管理", "taskType": "并网",
"name": "设计审核/工程审核", "name": "设计审核/工程审核",
"url": "/mixuap?appId=1678340647909617665&id=1827892888785129474" "url": "/mixuap?appId=1678340647909617665&id=1827892888785129474",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
},
{
"key": "ys_xzystj",
"taskType": "验收",
"name": "新增验收提交",
"url": "/mixuap?appId=1677158789557547009&id=1828973864328105986",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_0bs6t4g", "key": "Activity_0bs6t4g",
"taskType": "验收管理", "taskType": "验收",
"name": "验收提交", "name": "验收提交",
"url": "/mixuap?appId=1677158789557547009&id=1828973864328105986" "url": "/mixuap?appId=1677158789557547009&id=1828973864328105986",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_0ojajec", "key": "Activity_0ojajec",
"taskType": "验收管理", "taskType": "验收",
"name": "经销商管理员审核", "name": "经销商管理员审核",
"url": "/mixuap?appId=1677158789557547009&id=1828973864328105986" "url": "/mixuap?appId=1677158789557547009&id=1828973864328105986",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_0edftmv", "key": "Activity_0edftmv",
"taskType": "验收管理", "taskType": "验收",
"name": "片区审核", "name": "片区审核",
"url": "/mixuap?appId=1678340647909617665&id=1828979740128579585" "url": "/mixuap?appId=1678340647909617665&id=1828979740128579585",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_1rjn5s1", "key": "Activity_1rjn5s1",
"taskType": "验收管理", "taskType": "验收",
"name": "投融/法务审核", "name": "投融/法务审核",
"url": "/mixuap?appId=1678340647909617665&id=1828979740128579585" "url": "/mixuap?appId=1678340647909617665&id=1828979740128579585",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "Activity_0rbc0gc", "key": "Activity_0rbc0gc",
"taskType": "验收管理", "taskType": "验收",
"name": "资产审核", "name": "资产审核",
"url": "/mixuap?appId=1678340647909617665&id=1828979740128579585" "url": "/mixuap?appId=1678340647909617665&id=1828979740128579585",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
},
{
"key": "hygf_xztsrz",
"taskType": "投融资",
"name": "新增推送融资",
"url": "/mixuap?appId=1677158789557547009&id=1776873272973987842",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "AbarbeitungWaitPush", "key": "AbarbeitungWaitPush",
"taskType": "投融资管理", "taskType": "投融资",
"name": "推送融资", "name": "推送融资",
"url": "/mixuap?appId=1677158789557547009&id=1776873272973987842" "url": "/mixuap?appId=1677158789557547009&id=1776873272973987842",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "WaitAbarbeitung", "key": "WaitAbarbeitung",
"taskType": "投融资管理", "taskType": "投融资",
"name": "经销商重新提交验收/退回建档", "name": "经销商重新提交验收/退回建档",
"url": "/mixuap?appId=1677158789557547009&id=1776873272973987842" "url": "/mixuap?appId=1677158789557547009&id=1776873272973987842",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "FinancingAudit", "key": "FinancingAudit",
"taskType": "投融资管理", "taskType": "投融资",
"name": "融资审核", "name": "融资审核",
"url": "/mixuap?appId=1678340647909617665&id=1774974009419501569" "url": "/mixuap?appId=1678340647909617665&id=1774974009419501569",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "AuditPass", "key": "AuditPass",
"taskType": "投融资管理", "taskType": "投融资",
"name": "放款确认", "name": "放款确认",
"url": "/mixuap?appId=1678340647909617665&id=1831226627237875713" "url": "/mixuap?appId=1678340647909617665&id=1831226627237875713",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_repayment", "key": "hygf_repayment",
"taskType": "还款", "taskType": "还款",
"name": "还款管理", "name": "还款管理",
"url": "/mixuap?appId=1678340647909617665&id=1846106343904120833" "url": "/mixuap?appId=1678340647909617665&id=1846106343904120833",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
} }
] ]
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/wxHygfRouth.json
View file @ 25987157
...@@ -3,210 +3,336 @@ ...@@ -3,210 +3,336 @@
"key": "jxs_03", "key": "jxs_03",
"taskType": "经销商审核", "taskType": "经销商审核",
"name": "经销商管理员审核", "name": "经销商管理员审核",
"url": "" "url": "",
"isNeedSpecialDeal": "1",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_dzkc", "key": "hygf_dzkc",
"taskType": "电站勘察", "taskType": "勘察",
"name": "电站勘察", "name": "电站勘察",
"url": "/view/mine/minepage/PeasantManage" "url": "/view/mine/minepage/PeasantManage",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
}, },
{ {
"key": "hygf_02", "key": "hygf_02",
"taskType": "电站审核", "taskType": "勘察",
"name": "经销商确认", "name": "经销商确认",
"url": "/view/mine/minepage/SurveyList" "url": "/view/mine/minepage/SurveyList",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
}, },
{ {
"key": "hygf_03", "key": "hygf_03",
"taskType": "电站审核", "taskType": "勘察",
"name": "设计审核", "name": "设计审核",
"url": "/view/mine/minepage/SurveyListgld" "url": "/view/mine/minepage/SurveyListgld",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_05", "key": "hygf_05",
"taskType": "电站审核", "taskType": "勘察",
"name": "投融审核", "name": "投融审核",
"url": "/view/mine/minepage/SurveyListgld" "url": "/view/mine/minepage/SurveyListgld",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_07", "key": "hygf_07",
"taskType": "电站审核", "taskType": "勘察",
"name": "法务审核", "name": "法务审核",
"url": "/view/mine/minepage/SurveyListgld" "url": "/view/mine/minepage/SurveyListgld",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_09", "key": "hygf_09",
"taskType": "电站审核", "taskType": "勘察",
"name": "设计上传典型图库", "name": "设计上传典型图库",
"url": "/view/mine/minepage/SurveyListgld" "url": "/view/mine/minepage/SurveyListgld",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_10", "key": "hygf_10",
"taskType": "电站审核", "taskType": "勘察",
"name": "经销商设计人员上传设计图", "name": "经销商设计人员上传设计图",
"url": "/view/mine/minepage/SurveyList" "url": "/view/mine/minepage/SurveyList",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "hygf_11", "key": "hygf_11",
"taskType": "电站审核", "taskType": "勘察",
"name": "设计图纸审核", "name": "设计图纸审核",
"url": "/view/mine/minepage/SurveyListgld" "url": "/view/mine/minepage/SurveyListgld",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_httb", "key": "hygf_htfq",
"taskType": "合同填报", "taskType": "合同",
"name": "合同填报", "name": "合同发起",
"url": "/view/mine/minepage/SurveyListgld" "url": "",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
},
{
"key": "hygf_htqs",
"taskType": "合同",
"name": "合同签署",
"url": "",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
},
{
"key": "hygf_htgz",
"taskType": "合同",
"name": "合同盖章",
"url": "",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
},
{
"key": "fh_xzfhd",
"taskType": "发货",
"name": "新增发货单",
"url": "",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "fh_dtj", "key": "fh_dtj",
"taskType": "发货管理", "taskType": "发货",
"name": "待发货", "name": "待发货",
"url": "" "url": "",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "fh_dyr", "key": "fh_dyr",
"taskType": "发货管理", "taskType": "发货",
"name": "待确认", "name": "待确认",
"url": "/view/mine/subPackageA/menus/shippingOrder/shippingOrderList/index" "url": "/view/mine/subPackageA/menus/shippingOrder/shippingOrderList/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "fh_dsh", "key": "fh_dsh",
"taskType": "发货管理", "taskType": "发货",
"name": "待审核", "name": "待审核",
"url": "/view/mine/subPackageA/menus/shippingOrder/shippingOrderList/index" "url": "/view/mine/subPackageA/menus/shippingOrder/shippingOrderList/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "fh_sqbh", "key": "fh_sqbh",
"taskType": "发货管理", "taskType": "发货",
"name": "申请补货", "name": "申请补货",
"url": "/view/mine/subPackageA/menus/shippingOrder/shippingOrderList/index" "url": "/view/mine/subPackageA/menus/shippingOrder/shippingOrderList/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
},
{
"key": "hygf_xzfgd",
"taskType": "施工",
"name": "新增派工单",
"url": "",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "hygf_dsg", "key": "hygf_dsg",
"taskType": "派工发料", "taskType": "施工",
"name": "待施工", "name": "待施工",
"url": "" "url": "",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_0bs6t4g", "key": "Activity_0bs6t4g",
"taskType": "施工完工", "taskType": "施工",
"name": "施工完成提交", "name": "施工完成提交",
"url": "/view/mine/sggl/SgglList" "url": "/view/mine/sggl/SgglList",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_1spujef", "key": "Activity_1spujef",
"taskType": "施工完工", "taskType": "施工",
"name": "完工登记提交", "name": "完工登记提交",
"url": "/view/mine/wgdj/WgdjList" "url": "/view/mine/wgdj/WgdjList",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_16r1828", "key": "Activity_16r1828",
"taskType": "施工完工", "taskType": "施工",
"name": "完工自审", "name": "完工自审",
"url": "/view/mine/wgzs/WgzsList" "url": "/view/mine/wgzs/WgzsList",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_1bldcno", "key": "Activity_1bldcno",
"taskType": "施工完工", "taskType": "施工",
"name": "完工自审-片区运营中心", "name": "完工自审-片区运营中心",
"url": "/view/mine/subPackageA/menus/constructionAcceptance/index" "url": "/view/mine/subPackageA/menus/constructionAcceptance/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "Activity_1yftt2k", "key": "Activity_1yftt2k",
"taskType": "施工完工", "taskType": "施工",
"name": "工程审核", "name": "工程审核",
"url": "/view/mine/subPackageA/menus/constructionAcceptance/index" "url": "/view/mine/subPackageA/menus/constructionAcceptance/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "Activity_095if3p", "key": "Activity_095if3p",
"taskType": "施工完工", "taskType": "施工",
"name": "设计审核", "name": "设计审核",
"url": "/view/mine/subPackageA/menus/constructionAcceptance/index" "url": "/view/mine/subPackageA/menus/constructionAcceptance/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
},
{
"key": "bw_xzbwdj",
"taskType": "并网",
"name": "新增并网登记",
"url": "",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_0bs6t4g", "key": "Activity_0bs6t4g",
"taskType": "并网管理", "taskType": "并网",
"name": "并网登记提交", "name": "并网登记提交",
"url": "/view/mine/bwgl/BwglList" "url": "/view/mine/bwgl/BwglList",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_0r2x1es", "key": "Activity_0r2x1es",
"taskType": "并网管理", "taskType": "并网",
"name": "经销商管理审核", "name": "经销商管理审核",
"url": "/view/mine/bwgl/BwglList" "url": "/view/mine/bwgl/BwglList",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_05nlkey", "key": "Activity_05nlkey",
"taskType": "并网管理", "taskType": "并网",
"name": "片区审核", "name": "片区审核",
"url": "/view/mine/subPackageA/menus/onGridAcceptance/index" "url": "/view/mine/subPackageA/menus/onGridAcceptance/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "Activity_0k4o46e", "key": "Activity_0k4o46e",
"taskType": "并网管理", "taskType": "并网",
"name": "设计审核/工程审核", "name": "设计审核/工程审核",
"url": "/view/mine/subPackageA/menus/onGridAcceptance/index" "url": "/view/mine/subPackageA/menus/onGridAcceptance/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
},
{
"key": "ys_xzystj",
"taskType": "验收",
"name": "新增验收提交",
"url": "",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_0bs6t4g", "key": "Activity_0bs6t4g",
"taskType": "验收管理", "taskType": "验收",
"name": "验收提交", "name": "验收提交",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/ysgl" "url": "/view/mine/subPackageA/menus/acceptanceCheck/ysgl",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_0ojajec", "key": "Activity_0ojajec",
"taskType": "验收管理", "taskType": "验收",
"name": "经销商管理员审核", "name": "经销商管理员审核",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/ysgl" "url": "/view/mine/subPackageA/menus/acceptanceCheck/ysgl",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_0edftmv", "key": "Activity_0edftmv",
"taskType": "验收管理", "taskType": "验收",
"name": "片区审核", "name": "片区审核",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/index" "url": "/view/mine/subPackageA/menus/acceptanceCheck/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "Activity_1rjn5s1", "key": "Activity_1rjn5s1",
"taskType": "验收管理", "taskType": "验收",
"name": "投融/法务审核", "name": "投融/法务审核",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/index" "url": "/view/mine/subPackageA/menus/acceptanceCheck/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "Activity_0rbc0gc", "key": "Activity_0rbc0gc",
"taskType": "验收管理", "taskType": "验收",
"name": "资产审核", "name": "资产审核",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/index" "url": "/view/mine/subPackageA/menus/acceptanceCheck/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
},
{
"key": "hygf_xztsrz",
"taskType": "投融资",
"name": "新增推送融资",
"url": "",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "AbarbeitungWaitPush", "key": "AbarbeitungWaitPush",
"taskType": "投融资管理", "taskType": "投融资",
"name": "推送融资", "name": "推送融资",
"url": "/view/mine/subPackageA/InvestmentAndFinancing/investment/index" "url": "/view/mine/subPackageA/InvestmentAndFinancing/investment/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "WaitAbarbeitung", "key": "WaitAbarbeitung",
"taskType": "投融资管理", "taskType": "投融资",
"name": "经销商重新提交验收/退回建档", "name": "经销商重新提交验收/退回建档",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/ysgl" "url": "/view/mine/subPackageA/menus/acceptanceCheck/ysgl",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
}, },
{ {
"key": "FinancingAudit", "key": "FinancingAudit",
"taskType": "投融资管理", "taskType": "投融资",
"name": "融资审核", "name": "融资审核",
"url": "/view/mine/subPackageA/InvestmentAndFinancing/financing/index" "url": "/view/mine/subPackageA/InvestmentAndFinancing/financing/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "AuditPass", "key": "AuditPass",
"taskType": "投融资管理", "taskType": "投融资",
"name": "放款确认", "name": "放款确认",
"url": "/view/mine/subPackageA/InvestmentAndFinancing/investment/index" "url": "/view/mine/subPackageA/InvestmentAndFinancing/investment/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
}, },
{ {
"key": "hygf_repayment", "key": "hygf_repayment",
"taskType": "还款", "taskType": "还款",
"name": "还款管理", "name": "还款管理",
"url": "" "url": "/mixuap?appId=1678340647909617665&id=1846106343904120833",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
} }
] ]
\ No newline at end of file
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