Skip to content

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

工作台

parent 95ee3b79
Hide whitespace changes
Inline Side-by-side
Showing with 212 additions and 109 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 @ 92d0c82a
......@@ -16,9 +16,10 @@ public enum HygfRouthTypeEnum {
HYGF_REPAY("hygf_repayment", "还款",10000L),
HYGF_DZKC("hygf_dzkc", "电站勘察",10001L),
HYGF_DSG("hygf_dsg", "待施工",10002L),
HYGF_HTCXFQ("hygf_htcxfq", "合同重新发起",10015L),
HYGF_HTFQ("hygf_htfq", "合同发起",10003L),
HYGF_HTQS("hygf_httb", "合同签署",10004L),
HYGF_HTGZ("hygf_httb", "合同盖章",10005L),
HYGF_HTQS("hygf_htqs", "合同签署",10004L),
HYGF_HTGZ("hygf_htgz", "合同盖章",10005L),
HYGF_XZFHD("fh_xzfhd", "新增发货单",10006L),
HYGF_XZPGD("hygf_xzfgd", "新增派工单",10007L),
HYGF_XZBWDJ("bw_xzbwdj", "新增并网登记",10008L),
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HouseholdContractPageDto.java
View file @ 92d0c82a
......@@ -61,4 +61,5 @@ public class HouseholdContractPageDto{
private String province;
private String startTime;
private String endTime;
private String routhPathId;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PreparationPageDto.java
View file @ 92d0c82a
......@@ -30,5 +30,5 @@ public class PreparationPageDto extends Page<PreparationMoney> {
String deliveryTimeEnd;
String flag ;
String orderStatus;
String routhPathId;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/UserMessage.java
View file @ 92d0c82a
......@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import java.util.Date;
......@@ -70,6 +71,7 @@ public class UserMessage extends BaseEntity {
public UserMessage(String type, Long businessId, String amosUserId, Date creationTime, String taskName, String amosOrgCode) {
addOperator();
this.type = type;
this.businessId = businessId;
this.amosUserId = amosUserId;
......@@ -78,6 +80,16 @@ public class UserMessage extends BaseEntity {
this.amosOrgCode = amosOrgCode;
}
private void addOperator() {
try {
this.recDate = new Date();
this.recUserId = RequestContext.getExeUserId();
this.recUserName = RequestContext.getLoginId();
} catch (Exception e) {
e.printStackTrace();
}
}
public UserMessage() {
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java
View file @ 92d0c82a
......@@ -94,7 +94,7 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
@UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"hygf_jp_station.amos_company_code","hygf_jp_station.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<JpStationDto> queryAllPowerStation(String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type);
List<Map<String, String>> queryCompany();
List<Map<String, String>> queryCompany(@Param("companyType") String companyType);
List<JpStationDto> queryStation(@Param("dto") JpStationDto reviewDto);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/ToDoTasksMapper.java
View file @ 92d0c82a
......@@ -32,10 +32,10 @@ public interface ToDoTasksMapper extends BaseMapper<ToDoTasks> {
* 根据区域公司、角色、经销商获取待办的人员
* @param companyOrgCode
* @param roleId
* @param amosDealerId
* @param amosOrgCode
* @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("amosOrgCode") String amosOrgCode);
/**
* 过滤用户根据管理端
......@@ -53,4 +53,20 @@ public interface ToDoTasksMapper extends BaseMapper<ToDoTasks> {
* @return
*/
List<String> filterUsersByAmosDealer(@Param("companyOrgCode") String companyOrgCode, @Param("amosDealerCode") String amosDealerCode, @Param("list") List<String> userId);
/**
* 过滤经销商管理员
* @param amosCompanyCode
* @param userId
* @return
*/
List<String> filterUsersByAmosDealerAdmin(@Param("amosCompanyCode") String amosCompanyCode, @Param("list") List<String> userId);
/**
* 获取融资机构的待办人员
* @param companyOrgCode
* @param roleId
* @return
*/
List<String> getTodoUserIdsByRzjg(@Param("companyOrgCode") String companyOrgCode, @Param("roleId") String roleId);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HouseholdContractMapper.xml
View file @ 92d0c82a
......@@ -15,6 +15,9 @@
from hygf_household_contract
LEFT JOIN hygf_peasant_household php ON php.sequence_nbr = hygf_household_contract.peasant_household_id
<where>
<if test="dto.routhPathId != null and dto.routhPathId != ''">
and hygf_household_contract.sequence_nbr = #{dto.routhPathId}
</if>
<if test="dto.status != null and dto.status !=''">
and hygf_household_contract.status = #{dto.status}
</if>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
View file @ 92d0c82a
......@@ -837,6 +837,9 @@
privilege_company.COMPANY_NAME name
FROM privilege_company
WHERE IS_DELETED = 0
<if test="companyType!=null and companyType != ''">
and COMPANY_TYPE = #{companyType}
</if>
</select>
<select id="queryStation" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/ToDoTasksMapper.xml
View file @ 92d0c82a
......@@ -32,7 +32,7 @@
puor.ROLE_SEQ=#{roleId}
and sue.permission_type='HYGF'
<if test="companyOrgCode != null and companyOrgCode != ''">
and (sue.amos_org_code like #{companyOrgCode} or sue.amos_org_code like '%all%')
and (sue.amos_org_code like CONCAT('%',#{companyOrgCode},'%') or sue.amos_org_code like '%all%')
</if>
</where>
......@@ -44,7 +44,7 @@
LEFT JOIN hygf_personnel_business hpb ON hpb.foundation_id=sub.sequence_nbr
<where>
sub.role like #{roleId}
and sub.amos_id = #{amosDealerId}
and sub.amos_org_code = #{amosOrgCode}
<if test="companyOrgCode != null and companyOrgCode != ''">
and hpb.regional_companies_code like #{companyOrgCode}
</if>
......@@ -55,10 +55,9 @@
<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'
where (sue.amos_org_code like CONCAT('%',#{companyOrgCode},'%') or sue.amos_org_code like '%all%')
and amos_user_id in
<foreach item="item" collection="ids" separator="," open="(" close=")" index="">
<foreach item="item" collection="list" separator="," open="(" close=")" index="">
#{item}
</foreach>
GROUP BY amos_user_id
......@@ -67,12 +66,30 @@
<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}
where sub.amos_org_code = #{amosDealerCode}
and hpb.regional_companies_code like #{companyOrgCode}
and amos_user_id in
<foreach item="item" collection="ids" separator="," open="(" close=")" index="">
<foreach item="item" collection="list" separator="," open="(" close=")" index="">
#{item}
</foreach>
GROUP BY amos_user_id
</select>
<select id="filterUsersByAmosDealerAdmin" resultType="java.lang.String">
SELECT admin_user_id FROM hygf_unit_info hui
WHERE
hui.amos_company_code =#{amosCompanyCode}
and admin_user_id in
<foreach item="item" collection="list" separator="," open="(" close=")" index="">
#{item}
</foreach>
GROUP BY admin_user_id
</select>
<select id="getTodoUserIdsByRzjg" resultType="java.lang.String">
SELECT USER_ID FROM privilege_user_org_role puor LEFT JOIN privilege_company pc ON puor.COMPANY_SEQ=pc.SEQUENCE_NBR
where puor.ROLE_SEQ=#{roleId}
and pc.ORG_CODE = #{companyOrgCode}
GROUP BY USER_ID
</select>
</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 @ 92d0c82a
......@@ -11,6 +11,7 @@ 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.dto.HouseholdContractDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
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.biz.service.impl.*;
......@@ -204,13 +205,13 @@ public class HouseholdContractController extends BaseController {
householdContrac.setStatus(HouseholdContractEnum.合同状态_农户已签署.getCode());
//生成填报任务
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(householdContrac.getSequenceNbr()));
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,"");
// RouthPathVO routhPathVO = new RouthPathVO();
// routhPathVO.setRouthPathId(String.valueOf(householdContrac.getSequenceNbr()));
// 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));
}
......@@ -240,14 +241,6 @@ public class HouseholdContractController extends BaseController {
peasantHousehold.setPreparationMoneyState(ArrivalStateeEnum.待发货.getCode());
peasantHouseholdServiceImpl.getBaseMapper().updateById(peasantHousehold);
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());
toDoTasksServiceImpl.completeToDoTasks(toDoTasks,"");
......@@ -275,25 +268,22 @@ public class HouseholdContractController extends BaseController {
try {
householdContrac= householdContractServiceImpl.getById(sequenceNbr);
householdContrac.setStatus(HouseholdContractEnum.合同状态_已作废.getCode());
//如果作废删除此合同之前的待办并产生新的待办
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.合同.getCode());
wrapper.eq(ToDoTasks::getState, "待办");
wrapper.eq(ToDoTasks::getBusinessId, householdContrac.getSequenceNbr());
List<ToDoTasks> doTasks= toDoTasksMapper.selectList(wrapper);
if(doTasks!=null){
doTasks.forEach(e->{
try {
e.setState("作废");
e.setIsDelete(true);
toDoTasksMapper.updateById(e);
emqKeeper.getMqttClient().publish("TASK_MESSAGE" ,JSON.toJSONString(e).getBytes(), 2 ,false);
UserMessage userMessage= new UserMessage( e.getType(), e.getBusinessId(), e.getAmosUserId(), new Date(), e.getTaskName()+"已作废", e.getAmosOrgCode());
userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
} catch (MqttException mqttException) {
mqttException.printStackTrace();
}
});
toDoTasksMapper.delete(wrapper);
//产生新的的待办
PeasantHouseholdDto peasantHouseholdDto = peasantHouseholdServiceImpl.queryBySeq(householdContrac.getPeasantHouseholdId());
if(Objects.nonNull(peasantHouseholdDto)){
List<String> todoUserIds = new ArrayList<>();
todoUserIds.add(peasantHouseholdDto.getDeveloperUserId());
RouthPathVO routhPathVO1 = new RouthPathVO();
routhPathVO1.setRouthPathId(String.valueOf(householdContrac.getSequenceNbr()));
String routhPath1 = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO1);
String wxRouthPath1 = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO1);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTCXFQ.getBusiness(), householdContrac.getPartyA()+"待合同重新发起",householdContrac.getDealerCode(),routhPath1,wxRouthPath1);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
}
}catch (Exception e){
e.printStackTrace();
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java
View file @ 92d0c82a
......@@ -855,8 +855,8 @@ public class JpStationController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryCompany")
@ApiOperation(httpMethod = "GET", value = "查询公司", notes = "查询公司")
public ResponseModel<List<Map<String, String>>> queryCompany() {
List<Map<String, String>> map = jpStationServiceImpl.queryCompany();
public ResponseModel<List<Map<String, String>>> queryCompany(@RequestParam(value = "companyType",required = false) String companyType) {
List<Map<String, String>> map = jpStationServiceImpl.queryCompany(companyType);
return ResponseHelper.buildResponse(map);
}
......
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 @ 92d0c82a
......@@ -170,7 +170,6 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
BeanUtils.copyProperties(workflowResultDto, basicGridAuditingDto);
basicGridAuditingDto.setPeasantHouseholdId(basicGridRecord.getPeasantHouseholdId());
basicGridAuditingDto.setPromoter(RequestContext.getExeUserId());
Sequence sequence = new Sequence();
acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
update.set(AcceptanceCheck::getInstanceId,basicGridAuditingDto.getInstanceId());
......@@ -292,12 +291,14 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
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, "户用光伏-投融");
String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(orgCode, roleId);
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks);
//法务
ToDoTasks toDoTasks2= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSFWSH.getBusiness(), taskName+ "待法务审核",orgCode,routhPath,wxRouthPath);
List<String> todoUserIds1 = toDoTasksService.getTodoUserIds(orgCode, "户用光伏-法务");
String roleId1 = toDoTasksService.getRoleIdByName("户用光伏-法务");
List<String> todoUserIds1 = toDoTasksService.getTodoUserIds(orgCode, roleId1);
toDoTasksService.addToDoTasksByUserIds(todoUserIds1,toDoTasks2);
}else {
//更新待办
......@@ -397,6 +398,9 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
}else if( null == basicGridRecord.getPowerStationFinancingStatus() && approvalStatus.equals("0") && ( Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("ys-tourong")) ) ) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong");
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.TRDSH.getCode());
//完成法务
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSFWSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
}else if( null == basicGridRecord.getPowerStationFinancingStatus() && approvalStatus.equals("0") && basicGridRecord.getRectificationStatus() .contains("ys-tourong") ) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-tourong");
LambdaQueryWrapper<HygfRectificationOrder> query2 = new LambdaQueryWrapper<>();
......@@ -406,9 +410,6 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query2);
if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
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("待整改")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
}else {
......@@ -431,6 +432,9 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
}else if( null == basicGridRecord.getPowerStationLegalStatus() && approvalStatus.equals("0") && ( Objects.isNull(basicGridRecord.getRectificationStatus())||(!basicGridRecord.getRectificationStatus().contains("ys-fawu")) )) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu");
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.FWDSH.getCode());
//完成投融
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_YSTRSH.getBusiness());
toDoTasksService.completeToDoTasks(toDoTasks1,"");
}else if( null == basicGridRecord.getPowerStationLegalStatus() &&approvalStatus.equals("0") && !Objects.isNull(basicGridRecord.getRectificationStatus()) && basicGridRecord.getRectificationStatus().contains("ys-fawu") ) {
up.set(AcceptanceCheck::getBasicGridNode,"ys-fawu");
LambdaQueryWrapper<HygfRectificationOrder> query1 = new LambdaQueryWrapper<>();
......@@ -440,9 +444,6 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
HygfRectificationOrder hygfRectificationOrder = rectificationOrderService.getBaseMapper().selectOne(query1);
if (hygfRectificationOrder.getRectificationStatus().equals("待提交")){
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("待整改")){
up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.DZG.getCode());
}else {
......@@ -494,7 +495,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
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);
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
}
if (approvalStatus.equals("1") ){
......
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 @ 92d0c82a
......@@ -360,12 +360,12 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
//生成验收待办
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 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_XZBWDJ.getCode(), todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks1);
} else {
AcceptanceStatusEnum acceptanceStatus = AcceptanceStatusEnum.getAcceptanceStatusByKey(nextNodeKey,
......@@ -486,7 +486,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
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);
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
}
......@@ -562,12 +562,14 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
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, "户用光伏-设计");
String roleId = toDoTasksService.getRoleIdByName("户用光伏-设计");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(orgCode, roleId);
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks);
//工程
ToDoTasks toDoTasks2= new ToDoTasks (TaskTypeStationEnum.并网.getCode(), HygfRouthTypeEnum.HYGF_BWGCSH.getBusiness(), taskName+ "待工程审核",orgCode,routhPath,wxRouthPath);
List<String> todoUserIds1 = toDoTasksService.getTodoUserIds(orgCode, "户用光伏-工程");
String roleId1 = toDoTasksService.getRoleIdByName("户用光伏-工程");
List<String> todoUserIds1 = toDoTasksService.getTodoUserIds(orgCode, roleId1);
toDoTasksService.addToDoTasksByUserIds(todoUserIds1,toDoTasks2);
}else {
......@@ -688,7 +690,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
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> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZBWDJ.getCode(), todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks1);
......@@ -753,7 +755,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
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> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.验收.getCode(), HygfRouthTypeEnum.HYGF_XZYSTJ.getCode(), todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks1);
......
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 @ 92d0c82a
......@@ -20,6 +20,7 @@ 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.FinancingAuditingDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.FinancingInfoDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
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.mapper.FinancingInfoMapper;
......@@ -232,9 +233,9 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
String routhPath = toDoTasksService.getRouthPath(TaskTypeStationEnum.投融资.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.投融资.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
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> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.投融资.getCode(), workflowResultDto.getNextNodeKey(),userIds, model.getFinancingCompaniesCode(), peasantHousehold.getDeveloperCode());
toDoTasksService.addToDoTasksByUserIds(filterUsers,toDoTasks);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-融资");
List<String> userIds = toDoTasksService.getTodoUserIdsByRzjg(model.getFinancingCompaniesCode(),roleId);
toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks);
}
//批量 兼容审核不通过及整改待推送
else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals("待推送") ){
......@@ -286,6 +287,15 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
//停止流程
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.投融资.getCode(), financingInfo.getPeasantHouseholdId());
toDoTasksService.completeToDoTasks(toDoTasks,"");
//生成新增投融资待办
PeasantHouseholdDto peasantHouseholdDto = peasantHouseholdService.queryBySeq(financingInfo.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(), peasantHouseholdDto.getOwnersName()+"待新增推送融资",peasantHouseholdDto.getRegionalCompaniesCode(),routhPath,wxRouthPath);
String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHouseholdDto.getRegionalCompaniesCode(), roleId);
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
}
}
......@@ -382,9 +392,19 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
String routhPath = toDoTasksService.getRouthPath(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);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
List<String> filterUsers = toDoTasksService.filterUsers(TaskTypeStationEnum.投融资.getCode(), workflowResultDto.getNextNodeKey(),userIds, orgCode, peasantHousehold.getDeveloperCode());
toDoTasksService.completeAndAddToDoTask(filterUsers,toDoTasks,"");
if("AbarbeitungWaitPush".equals(workflowResultDto.getNextNodeKey())){
String roleId = toDoTasksService.getRoleIdByName("户用光伏-投融");
List<String> todoUserIds = toDoTasksService.getTodoUserIds(peasantHousehold.getRegionalCompaniesCode(), roleId);
toDoTasksService.completeAndAddToDoTask(todoUserIds,toDoTasks,"");
}else if("FinancingAudit".equals(workflowResultDto.getNextNodeKey())){
String roleId = toDoTasksService.getRoleIdByName("户用光伏-融资");
List<String> userIds = toDoTasksService.getTodoUserIdsByRzjg(financingInfo.getFinancingCompaniesCode(),roleId);
toDoTasksService.addToDoTasksByUserIds(userIds,toDoTasks);
} else {
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
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("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 @ 92d0c82a
......@@ -392,6 +392,9 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
householdContract.setDzhtqyCreateTime(new Date());
householdContractMapper.updateById(householdContract);
//完成重新发起的待办
ToDoTasks toDoTasks = new ToDoTasks(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTCXFQ.getBusiness());
toDoTasksServiceImpl.completeToDoTasks(toDoTasks, "");
//生成填报任务
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(householdContract.getSequenceNbr()));
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java
View file @ 92d0c82a
......@@ -674,7 +674,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
*/
private Map<String, String> getRegionalCompaniesNameMap() {
Map<String, String> map = new HashMap<>();
List<Map<String, String>> maps = jpStationMapper.queryCompany();
List<Map<String, String>> maps = jpStationMapper.queryCompany(null);
if(CollectionUtil.isNotEmpty(maps)){
for (Map<String, String> stringStringMap : maps) {
String orgCode = stringStringMap.get("value");
......@@ -1090,6 +1090,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
jpStationDto.setRegionalCompaniesName(regionalCompaniesNameMap.get(jpStationDto.getRegionalCompaniesCode()));
jpStationDto.setAmosCompanyName(regionalCompaniesNameMap.get(jpStationDto.getAmosCompanyCode()));
jpStationDto.setThirdCodeName(PVProducerInfoEnum.getNameByCode(jpStationDto.getThirdCode()));
if(!StringUtils.isEmpty(jpStationDto.getRegionalCompaniesCode()) && !StringUtils.isEmpty(jpStationDto.getAmosCompanyCode())){
jpStationDto.setBindType("已绑定");
}else {
jpStationDto.setBindType("未绑定");
}
}
}
PageInfo<JpStationDto> page = new PageInfo<>(jpStationDtoList);
......@@ -1101,8 +1106,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
return pageNew;
}
public List<Map<String, String>> queryCompany() {
return jpStationMapper.queryCompany();
public List<Map<String, String>> queryCompany(String companyType) {
return jpStationMapper.queryCompany(companyType);
}
public JpStationDto getStationDetail(Long sequenceNbr) {
......
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 @ 92d0c82a
......@@ -204,8 +204,8 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
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);
String routhPath1 = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO1);
String wxRouthPath1 = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO1);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.合同.getCode(), householdContract.getSequenceNbr(), householdContract.getPartyA()+"待合同发起",householdContract.getDealerCode(),routhPath1,wxRouthPath1);
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
return model;
......@@ -969,8 +969,8 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
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);
String routhPath1 = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO1);
String wxRouthPath1 = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.合同.getCode(), HygfRouthTypeEnum.HYGF_HTFQ.getCode(), routhPathVO1);
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.合同.getCode(), householdContract.getSequenceNbr(), householdContract.getPartyA()+"待合同发起",householdContract.getDealerCode(),routhPath1,wxRouthPath1);
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 @ 92d0c82a
......@@ -228,12 +228,12 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
String routhPath = toDoTasksServiceImpl.getRouthPath(TaskTypeStationEnum.勘察.getCode(),powerStation.getNextProcessNode(), routhPathVO);
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.勘察.getCode(),powerStation.getNextProcessNode(), routhPathVO);
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<>();
userIds.add(peasantHousehold.getDeveloperUserId());
toDoTasksServiceImpl.addToDoTasksByUserIds(userIds, toDoTasks);
}else {
ToDoTasks toDoTasks= new ToDoTasks(TaskTypeStationEnum.勘察.getCode(), powerStation.getSequenceNbr(), name + "勘察待" + powerStationNodeEnum.getName(), peasantHousehold.getRegionalCompaniesCode(),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> filterUsers = toDoTasksServiceImpl.filterUsers(TaskTypeStationEnum.勘察.getCode(),powerStation.getNextProcessNode(),todoUserIds, peasantHousehold.getRegionalCompaniesCode(), peasantHousehold.getDeveloperCode());
toDoTasksServiceImpl.completeAndAddToDoTask(filterUsers, toDoTasks,meg);
......
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 @ 92d0c82a
......@@ -666,11 +666,19 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getBusiness());
toDoTasksServiceImpl.completeToDoTasks(toDoTasks1,"");
//发起待办
String taskName="";
if (CollectionUtil.isNotEmpty(ids)){
taskName="[";
for (DocumentStation documentStation : ids) {
taskName= taskName + documentStation.getOwnersName() + ",";
}
taskName= taskName.substring(0,taskName.length()-1)+"]";
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(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(), taskName+"待确认收货单",model.getRegionalCompaniesCode(),routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
List<String> filterUsers = toDoTasksServiceImpl.filterUsers(TaskTypeStationEnum.发货.getCode(), workflowResultDto.getNextNodeKey(),userIds, model.getRegionalCompaniesCode(), model.getAmosUnitOrgCode());
toDoTasksServiceImpl.addToDoTasksByUserIds(filterUsers,toDoTasks);
......@@ -771,11 +779,19 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
ToDoTasks toDoTasks1= new ToDoTasks (TaskTypeStationEnum.发货.getCode(), HygfRouthTypeEnum.HYGF_XZFHD.getBusiness());
toDoTasksServiceImpl.completeToDoTasks(toDoTasks1,"");
//发起待办
String taskName="";
if (CollectionUtil.isNotEmpty(ids)){
taskName="[";
for (DocumentStation documentStation : ids) {
taskName= taskName + documentStation.getOwnersName() + ",";
}
taskName= taskName.substring(0,taskName.length()-1)+"]";
}
RouthPathVO routhPathVO = new RouthPathVO();
routhPathVO.setRouthPathId(String.valueOf(model.getSequenceNbr()));
String routhPath = toDoTasksServiceImpl.getRouthPath(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(), taskName+"待确认收货单",model.getRegionalCompaniesCode(),routhPath,wxRouthPath);
List<String> userIds = Arrays.asList(Optional.ofNullable(workflowResultDto.getNextExecuteUserIds()).orElse("").split(","));
List<String> filterUsers = toDoTasksServiceImpl.filterUsers(TaskTypeStationEnum.发货.getCode(),workflowResultDto.getNextNodeKey(),userIds, model.getRegionalCompaniesCode(), model.getAmosUnitOrgCode());
toDoTasksServiceImpl.addToDoTasksByUserIds(filterUsers,toDoTasks);
......@@ -1018,7 +1034,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
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()));
List<String> todoUserIds = toDoTasksServiceImpl.getTodoUserIds(model.getRegionalCompaniesCode(), roleId,String.valueOf(model.getAmosUnitOrgCode()));
toDoTasksServiceImpl.addToDoTasksByUserIds(todoUserIds,toDoTasks);
} else if (kv.getOrDefault("approvalStatus", "").equals("1")) {
up.set(PeasantHousehold::getPreparationMoneyState, ArrivalStateeEnum.待收货.getName());
......@@ -1081,7 +1097,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
String wxRouthPath = toDoTasksServiceImpl.getWxRouthPath(TaskTypeStationEnum.发货.getCode(),workflowResultDto.getNextNodeKey(), routhPathVO);
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> filterUsers = toDoTasksServiceImpl.filterUsers(TaskTypeStationEnum.验收.getCode(), workflowResultDto.getNextNodeKey(),userIds, preparationMoney.getRegionalCompaniesCode(), preparationMoney.getAmosUnitOrgCode());
List<String> filterUsers = toDoTasksServiceImpl.filterUsers(TaskTypeStationEnum.发货.getCode(), workflowResultDto.getNextNodeKey(),userIds, preparationMoney.getRegionalCompaniesCode(), preparationMoney.getAmosUnitOrgCode());
toDoTasksServiceImpl.completeAndAddToDoTask(filterUsers,toDoTasks,"");
}
BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto);
......
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 @ 92d0c82a
......@@ -301,27 +301,33 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
}
public List<String> getTodoUserIds(String companyOrgCode, String roleId) {
if (StringUtils.isNotEmpty(companyOrgCode)) {
companyOrgCode = "%" + companyOrgCode + "%";
}
return toDoTasksMapper.getTodoUserIds(companyOrgCode, roleId);
}
/**
* 获取融资机构的待办人员
* @param companyOrgCode
* @param roleId
* @return
*/
public List<String> getTodoUserIdsByRzjg(String companyOrgCode, String roleId) {
return toDoTasksMapper.getTodoUserIdsByRzjg(companyOrgCode, roleId);
}
/**
* 根据区域公司、角色、经销商获取待办的人员
* @param companyOrgCode
* @param roleId
* @param amosDealerId
* @param amosOrgCode
* @return
*/
public List<String> getTodoUserIds(String companyOrgCode, String roleId, String amosDealerId) {
public List<String> getTodoUserIds(String companyOrgCode, String roleId, String amosOrgCode) {
if (StringUtils.isNotEmpty(companyOrgCode)) {
companyOrgCode = "%" + companyOrgCode + "%";
}
if (StringUtils.isNotEmpty(roleId)) {
roleId = "%" + roleId + "%";
}
return toDoTasksMapper.getTodoUserIdsByAmosDealer(companyOrgCode, roleId, amosDealerId);
return toDoTasksMapper.getTodoUserIdsByAmosDealer(companyOrgCode, roleId, amosOrgCode);
}
//获取路由地址
......@@ -336,6 +342,8 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
filterUsers = toDoTasksMapper.filterUsersByAdmin(companyOrgCode, userId);
} else if ("0".equals(isAdminRole)) {
filterUsers = toDoTasksMapper.filterUsersByAmosDealer(companyOrgCode, amosDealerCode, userId);
} else if ("2".equals(isAdminRole)) {
filterUsers = toDoTasksMapper.filterUsersByAmosDealerAdmin(amosDealerCode, userId);
}
break;
}
......@@ -365,8 +373,11 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
if (StringUtils.isNotEmpty(routhPath)) {
// 检查 URL 是否已有参数
if (routhPath.contains("?")) {
// 如果 URL 已经包含参数，使用 '&' 来拼接新的参数
routhPath = routhPath + "&" + toQueryParams(model);
String queryParams = toQueryParams(model);
if(StringUtils.isNotEmpty(queryParams)){
// 如果 URL 已经包含参数，使用 '&' 来拼接新的参数
routhPath = routhPath + "&" + queryParams;
}
} else {
// 如果 URL 没有参数，使用 '?' 来开始拼接
routhPath = routhPath + "?" + toQueryParams(model);
......@@ -407,4 +418,5 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
return sb.length() > 0 ? sb.substring(0, sb.length() - 1) : "";
}
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java
View file @ 92d0c82a
......@@ -229,7 +229,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
String wxRouthPath = toDoTasksService.getWxRouthPath(TaskTypeStationEnum.施工.getCode(), HygfRouthTypeEnum.HYGF_DSG.getCode(), routhPathVO);
ToDoTasks toDoTasks= new ToDoTasks (TaskTypeStationEnum.施工.getCode(), model.getSequenceNbr(), taskName +"待施工",model.getRegionCode(),routhPath,wxRouthPath);
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.getAmosDealerOrgCode()));
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks);
return model;
}
......@@ -1464,7 +1464,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
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()));
List<String> todoUserIds = toDoTasksService.getTodoUserIds(workOrderDto.getRegionCode(), roleId,String.valueOf(workOrderDto.getAmosDealerOrgCode()));
toDoTasksService.addToDoTasksByUserIds(todoUserIds,toDoTasks1);
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/hygfRouth.json
View file @ 92d0c82a
......@@ -204,7 +204,7 @@
"taskType": "并网",
"name": "新增并网登记",
"url": "/mixuap?appId=1677158789557547009&id=1747137335817957378",
"isNeedSpecialDeal": "1",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
},
{
......@@ -220,8 +220,8 @@
"taskType": "并网",
"name": "经销商管理审核",
"url": "/mixuap?appId=1677158789557547009&id=1747137335817957378",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
"isNeedSpecialDeal": "0",
"isAdminRole": "2"
},
{
"key": "Activity_05nlkey",
......@@ -260,8 +260,8 @@
"taskType": "验收",
"name": "经销商管理员审核",
"url": "/mixuap?appId=1677158789557547009&id=1828973864328105986",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
"isNeedSpecialDeal": "0",
"isAdminRole": "2"
},
{
"key": "Activity_0edftmv",
......@@ -269,7 +269,7 @@
"name": "片区审核",
"url": "/mixuap?appId=1678340647909617665&id=1828979740128579585",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
"isAdminRole": "1"
},
{
"key": "Activity_1rjn5s1",
......@@ -291,7 +291,7 @@
"key": "hygf_xztsrz",
"taskType": "投融资",
"name": "新增推送融资",
"url": "/mixuap?appId=1677158789557547009&id=1776873272973987842",
"url": "/mixuap?appId=1678340647909617665&id=1833031670316404737",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
},
......@@ -299,7 +299,7 @@
"key": "AbarbeitungWaitPush",
"taskType": "投融资",
"name": "推送融资",
"url": "/mixuap?appId=1677158789557547009&id=1776873272973987842",
"url": "/mixuap?appId=1678340647909617665&id=1833062950722605058",
"isNeedSpecialDeal": "0",
"isAdminRole": "1"
},
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/wxHygfRouth.json
View file @ 92d0c82a
......@@ -204,7 +204,7 @@
"taskType": "并网",
"name": "新增并网登记",
"url": "/view/mine/bwgl/BwglList",
"isNeedSpecialDeal": "1",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
},
{
......@@ -220,8 +220,8 @@
"taskType": "并网",
"name": "经销商管理审核",
"url": "/view/mine/bwgl/BwglList",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
"isNeedSpecialDeal": "0",
"isAdminRole": "2"
},
{
"key": "Activity_05nlkey",
......@@ -260,8 +260,8 @@
"taskType": "验收",
"name": "经销商管理员审核",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/ysgl",
"isNeedSpecialDeal": "1",
"isAdminRole": "0"
"isNeedSpecialDeal": "0",
"isAdminRole": "2"
},
{
"key": "Activity_0edftmv",
......@@ -269,7 +269,7 @@
"name": "片区审核",
"url": "/view/mine/subPackageA/menus/acceptanceCheck/index",
"isNeedSpecialDeal": "0",
"isAdminRole": "0"
"isAdminRole": "1"
},
{
"key": "Activity_1rjn5s1",
......
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