Skip to content

J
jyzb_platformV2
Commit dde7cd27 by 李小惠
Options

修改出入库记录接口，新增工作流额外参数

parent befb46e1
正在显示 包含 117 行增加 和 33 行删除
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/InventoryDto.java
...@@ -93,8 +93,8 @@ public class InventoryDto implements Serializable { ...@@ -93,8 +93,8 @@ public class InventoryDto implements Serializable {
/** /**
* 组织机构id * 组织机构id
*/ */
private String orgId; private Long orgId;
private Long orgIdInt; // private Long orgIdInt;
/** /**
* 组织机构 * 组织机构
*/ */
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/LogSummarySecondDto.java
...@@ -67,6 +67,9 @@ public class LogSummarySecondDto implements Serializable { ...@@ -67,6 +67,9 @@ public class LogSummarySecondDto implements Serializable {
*/ */
private String updateUser; private String updateUser;
/**
* 单价
*/
private BigDecimal price; private BigDecimal price;
} }
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/controller/OutAndInboundController.java
...@@ -87,8 +87,8 @@ public class OutAndInboundController { ...@@ -87,8 +87,8 @@ public class OutAndInboundController {
@PostMapping("getSecondInfoByLogSumId") @PostMapping("getSecondInfoByLogSumId")
@ApiOperation("根据出入库汇总id查询二级信息") @ApiOperation("根据出入库汇总id查询二级信息")
public ApiRes<PageResult<LogSummarySecond>> getSecondInfoByLogSumId(@RequestBody @Validated(ValidationApi.detail.class) QueryLogSummarySecondReq req){ public ApiRes<PageResult<LogSummarySecondDto>> getSecondInfoByLogSumId(@RequestBody @Validated(ValidationApi.detail.class) QueryLogSummarySecondReq req){
return ApiRes.success(logSummarySecondService.getSecondInfoByLogSumId(req)); return ApiRes.success(orderLogService.getSecondInfoByLogSumId(req));
} }
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/LogDetailMapper.java
package com.junmp.jyzb.mapper; package com.junmp.jyzb.mapper;
import com.junmp.jyzb.api.bean.dto.LogDetailDto; import com.junmp.jyzb.api.bean.dto.LogDetailDto;
import com.junmp.jyzb.api.bean.dto.LogSummarySecondDto;
import com.junmp.jyzb.api.bean.query.QueryLogSummarySecondReq;
import com.junmp.jyzb.entity.LogDetail; import com.junmp.jyzb.entity.LogDetail;
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;
...@@ -22,6 +24,12 @@ public interface LogDetailMapper extends BaseMapper<LogDetail> { ...@@ -22,6 +24,12 @@ public interface LogDetailMapper extends BaseMapper<LogDetail> {
int getInOutRecordsSize(@Param("epc") String epc); int getInOutRecordsSize(@Param("epc") String epc);
List<LogDetail> getInOutRecords(@Param("epc")String epc, @Param("pageNo") Long pageNo,@Param("pageSize") Long pageSize); List<LogDetail> getInOutRecords(@Param("epc")String epc, @Param("pageNo") Long pageNo,@Param("pageSize") Long pageSize);
List<LogSummarySecondDto> getSecondInfoByLogSumId(@Param("req") QueryLogSummarySecondReq req,
@Param("pageNo") Long pageNo,
@Param("pageSize") Long pageSize);
int getSecondInfoByLogSumIdCount(@Param("req") QueryLogSummarySecondReq req);
} }
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/OrderLogService.java
package com.junmp.jyzb.service; package com.junmp.jyzb.service;
import com.junmp.jyzb.api.bean.dto.LogSummarySecondDto;
import com.junmp.jyzb.api.bean.dto.OrderLogDto; import com.junmp.jyzb.api.bean.dto.OrderLogDto;
import com.junmp.jyzb.api.bean.query.LogSummaryReq; import com.junmp.jyzb.api.bean.query.LogSummaryReq;
import com.junmp.jyzb.api.bean.query.QueryLogSummarySecondReq;
import com.junmp.jyzb.entity.OrderLog; import com.junmp.jyzb.entity.OrderLog;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.v2.db.api.page.PageResult;
import java.util.List; import java.util.List;
...@@ -15,4 +18,6 @@ import java.util.List; ...@@ -15,4 +18,6 @@ import java.util.List;
public interface OrderLogService extends IService<OrderLog> { public interface OrderLogService extends IService<OrderLog> {
List<OrderLogDto> ShowRecordsByOrderId(LogSummaryReq req); List<OrderLogDto> ShowRecordsByOrderId(LogSummaryReq req);
PageResult<LogSummarySecondDto> getSecondInfoByLogSumId(QueryLogSummarySecondReq req);
} }
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BusFormServiceImpl.java
...@@ -210,6 +210,8 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl ...@@ -210,6 +210,8 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
startProcessInstanceDTO.setOrderType("bussinessOrder"); startProcessInstanceDTO.setOrderType("bussinessOrder");
startProcessInstanceDTO.setUserId(req.getApplyUserId()); startProcessInstanceDTO.setUserId(req.getApplyUserId());
startProcessInstanceDTO.setBussinessType(req.getBussinessType()); startProcessInstanceDTO.setBussinessType(req.getBussinessType());
//设置领用人
startProcessInstanceDTO.setUserName(ObjectUtil.isNotNull(req.getReturnUser())?req.getReturnUser():null);
//发物单位和收物单位 //发物单位和收物单位
switch (req.getBussinessType()){ switch (req.getBussinessType()){
case "use": case "use":
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/LogSummarySecondServiceImpl.java
...@@ -3,6 +3,7 @@ package com.junmp.jyzb.service.impl; ...@@ -3,6 +3,7 @@ package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.dto.LogSummarySecondDto;
import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.LogSummarySecondReq; import com.junmp.jyzb.api.bean.query.InAndOutRecordReq.LogSummarySecondReq;
import com.junmp.jyzb.api.bean.query.QueryLogSummarySecondReq; import com.junmp.jyzb.api.bean.query.QueryLogSummarySecondReq;
import com.junmp.jyzb.entity.LogSummarySecond; import com.junmp.jyzb.entity.LogSummarySecond;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderLogServiceImpl.java
package com.junmp.jyzb.service.impl; package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.dto.LogSummarySecondDto;
import com.junmp.jyzb.api.bean.dto.OrderLogDto; import com.junmp.jyzb.api.bean.dto.OrderLogDto;
import com.junmp.jyzb.api.bean.query.LogSummaryReq; import com.junmp.jyzb.api.bean.query.LogSummaryReq;
import com.junmp.jyzb.api.bean.query.QueryLogSummarySecondReq;
import com.junmp.jyzb.entity.OrderLog; import com.junmp.jyzb.entity.OrderLog;
import com.junmp.jyzb.mapper.LogDetailMapper;
import com.junmp.jyzb.service.OrderLogService; import com.junmp.jyzb.service.OrderLogService;
import com.junmp.jyzb.mapper.OrderLogMapper; import com.junmp.jyzb.mapper.OrderLogMapper;
import com.junmp.v2.common.util.BeanPlusUtil; import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.factory.PageFactory;
import com.junmp.v2.db.api.factory.PageResultFactory;
import com.junmp.v2.db.api.page.PageResult;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -24,7 +31,8 @@ import java.util.stream.Collectors; ...@@ -24,7 +31,8 @@ import java.util.stream.Collectors;
public class OrderLogServiceImpl extends ServiceImpl<OrderLogMapper, OrderLog> public class OrderLogServiceImpl extends ServiceImpl<OrderLogMapper, OrderLog>
implements OrderLogService{ implements OrderLogService{
@Resource
private LogDetailMapper logDetailMapper;
/** /**
* 展示单子从创建到记账全过程 * 展示单子从创建到记账全过程
...@@ -43,6 +51,16 @@ public class OrderLogServiceImpl extends ServiceImpl<OrderLogMapper, OrderLog> ...@@ -43,6 +51,16 @@ public class OrderLogServiceImpl extends ServiceImpl<OrderLogMapper, OrderLog>
}).collect(Collectors.toList()); }).collect(Collectors.toList());
return collect; return collect;
} }
@Override
public PageResult<LogSummarySecondDto> getSecondInfoByLogSumId(QueryLogSummarySecondReq req) {
List<LogSummarySecondDto> collect=logDetailMapper.getSecondInfoByLogSumId(req,(req.getPageNo()-1)*req.getPageSize(),req.getPageSize());
int size=logDetailMapper.getSecondInfoByLogSumIdCount(req);
Page<LogSummarySecondDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageNo());
page.setRecords(collect);
page.setTotal(size);
return PageResultFactory.createPageResult(page);
}
} }
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
...@@ -1113,16 +1113,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -1113,16 +1113,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
//执行工作流 //执行工作流
if (req.getExamineState().equals("working")) if (req.getExamineState().equals("working"))
{ {
StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO(); StartProcessInstanceDTO startProcessInstanceDTO = setParams(req,reassignment);
startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
startProcessInstanceDTO.setOrderId(reassignment.getId());
startProcessInstanceDTO.setOrderType("reassignment");
startProcessInstanceDTO.setUserId(req.getUserId());
startProcessInstanceDTO.setType("reassignmentDto");
startProcessInstanceDTO.setReassignmentType(req.getReassignmentType());
Object A= JSON.toJSONString(req, SerializerFeature.WriteDateUseDateFormat);
JSONObject jsonObject = JSON.parseObject(A.toString());
startProcessInstanceDTO.setFormData(jsonObject);
String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO); String ProcessInstanceId= FlowInstanceService.startProcessInstanceById(startProcessInstanceDTO);
reassignment.setProcessId(ProcessInstanceId); reassignment.setProcessId(ProcessInstanceId);
String assigns= FlowInstanceService.GetNextAssign(ProcessInstanceId);//这里需要手动更新审核人信息 String assigns= FlowInstanceService.GetNextAssign(ProcessInstanceId);//这里需要手动更新审核人信息
...@@ -1132,6 +1123,26 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -1132,6 +1123,26 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
return reassignment.getId(); return reassignment.getId();
} }
private StartProcessInstanceDTO setParams(UpdateReassignmentReq req,Reassignment reassignment){
StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
startProcessInstanceDTO.setOrderId(reassignment.getId());
startProcessInstanceDTO.setOrderType("reassignment");
startProcessInstanceDTO.setUserId(req.getUserId());
startProcessInstanceDTO.setType("reassignmentDto");
startProcessInstanceDTO.setReassignmentType(req.getReassignmentType());
Object A= JSON.toJSONString(req, SerializerFeature.WriteDateUseDateFormat);
JSONObject jsonObject = JSON.parseObject(A.toString());
startProcessInstanceDTO.setFormData(jsonObject);
startProcessInstanceDTO.setUserName(req.getPoliceName());
if (req.getReassignmentType().equals("assign")){
startProcessInstanceDTO.setEndOrgName(req.getOrgName());
}else if (req.getReassignmentType().equals("reassign")){
startProcessInstanceDTO.setStartOrgName(req.getOrgName());
}
return startProcessInstanceDTO;
}
//查看警员调岗申请单 //查看警员调岗申请单
@Override @Override
public PageResult<Reassignment> ShowReassignmentPage(QueryReassignmentReq req) { public PageResult<Reassignment> ShowReassignmentPage(QueryReassignmentReq req) {
......
jyzb-biz/src/main/resources/mapper/InventoryMapper.xml
...@@ -476,7 +476,10 @@ ...@@ -476,7 +476,10 @@
) )
</select> </select>
<select id="GetInvInfoByEpc" resultType="com.junmp.jyzb.api.bean.dto.InventoryDto"> <select id="GetInvInfoByEpc" resultType="com.junmp.jyzb.api.bean.dto.InventoryDto">
SELECT bi.*, po.org_name, es.name, et.name, bs.name, bw.name SELECT bi.id,bi.type_id,bi.size_id,bi.supplier_id,bi.shelf_id,bi.shelf_location,bi.epc,
bi.org_id_int as org_id,bi.state,bi.bussiness_state,bi.location_state,
bi.production_date,bi.warranty_period,bi.maintenance_period,bi.location_id,
bi.location_type,bi.term_state,bi.area_id,po.org_name, es.name, et.name, bs.name, bw.name
FROM base_inventory bi FROM base_inventory bi
JOIN pub_org po ON po.org_id = bi.org_id_int JOIN pub_org po ON po.org_id = bi.org_id_int
JOIN base_equipment_size es ON es.id = bi.size_id JOIN base_equipment_size es ON es.id = bi.size_id
...@@ -488,7 +491,10 @@ ...@@ -488,7 +491,10 @@
#{item} #{item}
</foreach> </foreach>
UNION ALL UNION ALL
SELECT bi.*, po.org_name, es.name, et.name, bs.name, bc.name SELECT bi.id,bi.type_id,bi.size_id,bi.supplier_id,bi.shelf_id,bi.shelf_location,bi.epc,
bi.org_id_int as org_id,bi.state,bi.bussiness_state,bi.location_state,
bi.production_date,bi.warranty_period,bi.maintenance_period,bi.location_id,
bi.location_type,bi.term_state,bi.area_id, po.org_name, es.name, et.name, bs.name, bc.name
FROM base_inventory bi FROM base_inventory bi
JOIN pub_org po ON po.org_id = bi.org_id_int JOIN pub_org po ON po.org_id = bi.org_id_int
JOIN base_equipment_size es ON es.id = bi.size_id JOIN base_equipment_size es ON es.id = bi.size_id
......
jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml
...@@ -662,17 +662,17 @@ ...@@ -662,17 +662,17 @@
) as a ) as a
</select> </select>
<select id="GetDetailByTerms" resultType="com.junmp.jyzb.api.bean.dto.InventoryDto"> <select id="GetDetailByTerms" resultType="com.junmp.jyzb.api.bean.dto.InventoryDto">
select i.*,et.name as type_name,es.name as size_name,po.org_name as org_name, select i.id,i.type_id,i.size_id,i.supplier_id,i.shelf_id,i.shelf_location,i.epc,i.org_id_int as org_id,i.state,i.bussiness_state,i.location_state,i.production_date,i.warranty_period,i.maintenance_period,i.location_id,i.location_type,i.term_state,i.area_id,et.name as type_name,es.name as size_name,po.org_name as org_name,
bs.name as supplier_name,COALESCE(bc.name, bw.name) as location_name, bs.name as supplier_name,COALESCE(bc.name, bw.name) as location_name,
es.photo as photo,es.instructions as instructions es.photo as photo,es.instructions as instructions
FROM base_inventory i FROM base_inventory i
JOIN base_equipment_type et on et.id=i.type_id JOIN base_equipment_type et on et.id=i.type_id
join base_equipment_size es on es.id=i.size_id join base_equipment_size es on es.id=i.size_id
join pub_org po on i.org_id_int=po.org_id join pub_org po on i.org_id_int=po.org_id
left join base_supplier bs on bs.id=i.supplier_id left join base_supplier bs on bs.id=i.supplier_id
LEFT JOIN base_cabinet_box bcb ON i.location_id = bcb.id and i.location_type=1 LEFT JOIN base_cabinet_box bcb ON i.location_id = bcb.id and i.location_type=1
LEFT JOIN base_cabinet bc ON bcb.cabinet_id = bc.id LEFT JOIN base_cabinet bc ON bcb.cabinet_id = bc.id
LEFT JOIN base_warehouse bw ON i.location_id = bw.id AND i.location_type = 0 LEFT JOIN base_warehouse bw ON i.location_id = bw.id AND i.location_type = 0
WHERE i.org_id_int=#{req.orgId} and i.type_id=#{req.typeId} WHERE i.org_id_int=#{req.orgId} and i.type_id=#{req.typeId}
<if test="req.locationType !='all' and req.locationType != null"> <if test="req.locationType !='all' and req.locationType != null">
and i.location_type=#{req.locationType} and i.location_type=#{req.locationType}
...@@ -683,6 +683,7 @@ ...@@ -683,6 +683,7 @@
<if test="req.price !=null and req.price != ''"> <if test="req.price !=null and req.price != ''">
and i.price=#{req.price} and i.price=#{req.price}
</if> </if>
ORDER BY i.type_id,i.size_id
<if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' "> <if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
limit #{pageNo},#{pageSize} limit #{pageNo},#{pageSize}
</if> </if>
......
jyzb-biz/src/main/resources/mapper/LogDetailMapper.xml
...@@ -58,4 +58,23 @@ ...@@ -58,4 +58,23 @@
</if> </if>
</select> </select>
<select id="getSecondInfoByLogSumId" resultType="com.junmp.jyzb.api.bean.dto.LogSummarySecondDto">
select type_id,max(type_name)as type_name,size_id,max(size_name)as size_name,count(*)as num,price
FROM base_log_detail ld
where summary_id=#{req.summaryId}
GROUP BY type_id,size_id,price
ORDER BY type_id,size_id,price
<if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
limit #{pageNo},#{pageSize}
</if>
</select>
<select id="getSecondInfoByLogSumIdCount" resultType="java.lang.Integer">
SELECT count(*) FROM(
select type_id,max(type_name)as type_name,size_id,max(size_name)as size_name,count(*)as num,price
FROM base_log_detail ld
where summary_id=#{req.summaryId}
GROUP BY type_id,size_id,price
ORDER BY type_id,size_id,price
) as a
</select>
</mapper> </mapper>
jyzb-process/src/main/java/com/junmp/junmpProcess/common/CommonConstants.java
...@@ -22,6 +22,7 @@ public interface CommonConstants { ...@@ -22,6 +22,7 @@ public interface CommonConstants {
String TYPE="type"; //单据业务类型 String TYPE="type"; //单据业务类型
String OUT_IN_STATE="outInState";//出入库单据状态（出库还是入库） String OUT_IN_STATE="outInState";//出入库单据状态（出库还是入库）
String PROCESS_ID="processId"; String PROCESS_ID="processId";
String USER_NAME="userName";
String BUSINESS_STATUS_1="正在处理"; //正在处理 String BUSINESS_STATUS_1="正在处理"; //正在处理
......
jyzb-process/src/main/java/com/junmp/junmpProcess/dto/StartProcessInstanceDTO.java
...@@ -39,4 +39,6 @@ public class StartProcessInstanceDTO { ...@@ -39,4 +39,6 @@ public class StartProcessInstanceDTO {
private String bussinessType; private String bussinessType;
private String userName;
} }
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowInstanceServiceImpl.java
...@@ -155,15 +155,16 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow ...@@ -155,15 +155,16 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
if (ObjectUtil.isNotNull(processInstanceDto.getInvList())){ if (ObjectUtil.isNotNull(processInstanceDto.getInvList())){
processVariables.put(INVLIST,processInstanceDto.getInvList()); processVariables.put(INVLIST,processInstanceDto.getInvList());
} }
//出入库状态 //出入库状态
if (ObjectUtil.isNotNull(processInstanceDto.getOutInState())){ if (ObjectUtil.isNotNull(processInstanceDto.getOutInState())){
processVariables.put(OUT_IN_STATE,processInstanceDto.getOutInState()); processVariables.put(OUT_IN_STATE,processInstanceDto.getOutInState());
} }
processVariables.put(START_USER_INFO,JSONObject.toJSONString(StartUser)); processVariables.put(START_USER_INFO,JSONObject.toJSONString(StartUser));
processVariables.put(PROCESS_STATUS,BUSINESS_STATUS_1); processVariables.put(PROCESS_STATUS,BUSINESS_STATUS_1);
//领用人，调岗人
if (ObjectUtil.isNotNull(processInstanceDto.getUserName())){
processVariables.put(USER_NAME,processInstanceDto.getUserName());
}
if (formData!=null) if (formData!=null)
{ {
Map formValue = JSONObject.parseObject(formData.toJSONString(), new TypeReference<Map>() { Map formValue = JSONObject.parseObject(formData.toJSONString(), new TypeReference<Map>() {
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java
...@@ -48,6 +48,7 @@ import com.junmp.v2.message.api.bean.res.MessageRes; ...@@ -48,6 +48,7 @@ import com.junmp.v2.message.api.bean.res.MessageRes;
import com.junmp.v2.message.api.enums.MsgReadStateEnum; import com.junmp.v2.message.api.enums.MsgReadStateEnum;
import com.junmp.v2.sys.user.entity.SysUser; import com.junmp.v2.sys.user.entity.SysUser;
import com.junmp.v2.sys.user.service.SysUserService; import com.junmp.v2.sys.user.service.SysUserService;
import com.sun.javafx.collections.MappingChange;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -476,7 +477,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -476,7 +477,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
// }).getUserInfo()); // }).getUserInfo());
String s = (String) processVariables.get(START_USER_INFO); String s = (String) processVariables.get(START_USER_INFO);
taskVO.setStartUser(JSONObject.parseObject(s, UserInfo.class)); taskVO.setStartUser(JSONObject.parseObject(s, UserInfo.class));
taskVO.setUserName(MapUtil.getStr(processVariables,USER_NAME));
taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID)); taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE)); taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
taskVO.setStartTime(processInstance.getStartTime()); taskVO.setStartTime(processInstance.getStartTime());
...@@ -593,7 +594,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -593,7 +594,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
// }).getUserInfo()); // }).getUserInfo());
String s = (String) processVariables.get(START_USER_INFO); String s = (String) processVariables.get(START_USER_INFO);
taskVO.setStartUser(JSONObject.parseObject(s, UserInfo.class)); taskVO.setStartUser(JSONObject.parseObject(s, UserInfo.class));
taskVO.setUserName(MapUtil.getStr(processVariables,USER_NAME));
taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID)); taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE)); taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
taskVO.setStartTime(historicProcessInstance.getStartTime()); taskVO.setStartTime(historicProcessInstance.getStartTime());
...@@ -717,7 +718,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -717,7 +718,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
// }).getUserInfo()); // }).getUserInfo());
String s = (String) processVariables.get(START_USER_INFO); String s = (String) processVariables.get(START_USER_INFO);
historyProcessInstanceVO.setStartUser(JSONObject.parseObject(s, UserInfo.class)); historyProcessInstanceVO.setStartUser(JSONObject.parseObject(s, UserInfo.class));
historyProcessInstanceVO.setUserName(MapUtil.getStr(processVariables,USER_NAME));
historyProcessInstanceVO.setStartTime(historicProcessInstance.getStartTime()); historyProcessInstanceVO.setStartTime(historicProcessInstance.getStartTime());
historyProcessInstanceVO.setEndTime(historicProcessInstance.getEndTime()); historyProcessInstanceVO.setEndTime(historicProcessInstance.getEndTime());
Boolean flag = historicProcessInstance.getEndTime() == null ? false : true; Boolean flag = historicProcessInstance.getEndTime() == null ? false : true;
......
jyzb-process/src/main/java/com/junmp/junmpProcess/vo/HistoryProcessInstanceVO.java
...@@ -50,4 +50,6 @@ public class HistoryProcessInstanceVO { ...@@ -50,4 +50,6 @@ public class HistoryProcessInstanceVO {
private String formData; private String formData;
@ApiModelProperty("流程id") @ApiModelProperty("流程id")
private String processId; private String processId;
@ApiModelProperty("人员（领用人，调岗人）")
private String userName;
} }
jyzb-process/src/main/java/com/junmp/junmpProcess/vo/TaskVO.java
...@@ -53,5 +53,7 @@ public class TaskVO { ...@@ -53,5 +53,7 @@ public class TaskVO {
private String outInState; private String outInState;
@ApiModelProperty("流程id") @ApiModelProperty("流程id")
private String processId; private String processId;
@ApiModelProperty("人员（领用、调岗）")
private String userName;
} }
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论