Commit cdf43817 authored by caotao's avatar caotao

业务新增设备类型字段用于待办生成时的摘要

parent 1bcfd67d
...@@ -231,5 +231,10 @@ public class JgChangeRegistrationReform extends BaseEntity { ...@@ -231,5 +231,10 @@ public class JgChangeRegistrationReform extends BaseEntity {
*/ */
@TableField(value = "create_user_company_name") @TableField(value = "create_user_company_name")
private String createUserCompanyName; private String createUserCompanyName;
/**
*
*/
@TableField(value = "equip_list_name")
private String equipListName;
} }
...@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto; ...@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform; import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update; import org.apache.ibatis.annotations.Update;
import java.util.List; import java.util.List;
...@@ -29,4 +30,7 @@ public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeReg ...@@ -29,4 +30,7 @@ public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeReg
Page<Map<String, Object>> getEquipListPage(@Param("page")Page<Map<String, Object>> page,@Param("factoryNum") String factoryNum,@Param("equList")String equList,@Param("equCategory")String equCategory); Page<Map<String, Object>> getEquipListPage(@Param("page")Page<Map<String, Object>> page,@Param("factoryNum") String factoryNum,@Param("equList")String equList,@Param("equCategory")String equCategory);
void updatePromoter(@Param("id")Long id); void updatePromoter(@Param("id")Long id);
@Select("select name from tz_equipment_category where code=#{code}")
String getEquiplistNameByEquiplist(String code);
} }
package com.yeejoin.amos.boot.module.jg.biz.service.impl; package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
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;
...@@ -200,6 +198,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -200,6 +198,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
// updateExecuteIds(instanceId, jgChangeRegistrationReform.getSequenceNbr(), "0"); // updateExecuteIds(instanceId, jgChangeRegistrationReform.getSequenceNbr(), "0");
} else { } else {
// 如果是新启动的流程开启自动访问 // 如果是新启动的流程开启自动访问
String equipListName = this.getBaseMapper().getEquiplistNameByEquiplist(Optional.ofNullable(map.get("equList").toString()).orElse(" "));
jgChangeRegistrationReform.setEquipListName(equipListName);
jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName()); jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName()); jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
ProcessTaskDTO processTaskDTO = startByVariable(); ProcessTaskDTO processTaskDTO = startByVariable();
...@@ -615,7 +616,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR ...@@ -615,7 +616,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
*/ */
public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) { public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) {
String result = "来自%s【%s】的业务办理,【申请单号:%s】"; String result = "来自%s【%s】的业务办理,【申请单号:%s】";
return String.format(result,"电梯", jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo()); return String.format(result,jgChangeRegistrationReform.getEquipListName(), jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo());
} }
public TaskModelDto getTaskModelDtoList(JgChangeRegistrationReform jgChangeRegistrationReform, ProcessTaskDTO processTaskDTO) { public TaskModelDto getTaskModelDtoList(JgChangeRegistrationReform jgChangeRegistrationReform, ProcessTaskDTO processTaskDTO) {
......
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