Skip to content

J
jyzb_platformV2
Commit 5d441e2a by 李小惠
Options

修改装备编辑接口，新增工作流额外参数

parent e555499e
正在显示 包含 180 行增加 和 51 行删除
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/BatchEditingInvsReq.java
...@@ -26,12 +26,16 @@ public class BatchEditingInvsReq { ...@@ -26,12 +26,16 @@ public class BatchEditingInvsReq {
*号型id *号型id
*/ */
private String sizeId; private String sizeId;
private String typeName;
private String sizeName;
/** /**
*仓库id *仓库id
*/ */
private String locationId; private String locationId;
private String locationName;
/** /**
*装备id *装备id
*/ */
...@@ -73,8 +77,13 @@ public class BatchEditingInvsReq { ...@@ -73,8 +77,13 @@ public class BatchEditingInvsReq {
private Integer shelfRows; private Integer shelfRows;
/** /**
* 单价 * 单价(修改后单价)
*/ */
private BigDecimal price; private BigDecimal price;
/**
* 原来价格
*/
private BigDecimal originalPrice;
} }
jyzb-biz/src/main/java/com/junmp/jyzb/controller/TjController.java
...@@ -73,6 +73,12 @@ public class TjController { ...@@ -73,6 +73,12 @@ public class TjController {
return ApiRes.success(tjService.TjOrgEqsDetailList(req)); return ApiRes.success(tjService.TjOrgEqsDetailList(req));
} }
@PostMapping("/test1")
@ApiOperation("测试")
public ApiRes<PageResult<TjOrgEqsDto>> test1(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.test1(req));
}
/** /**
*-------------------------------------财务统计报表------------------------------------------ *-------------------------------------财务统计报表------------------------------------------
*/ */
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventorySummaryMapper.java
...@@ -53,7 +53,7 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> { ...@@ -53,7 +53,7 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> {
List<TjOrgEqsDto> selectViewOrgeqsSum(); List<TjOrgEqsDto> selectViewOrgeqsSum();
void useViewOrgeqs(@Param("sql") String sql,@Param("orgId") Long orgId); void useViewOrgeqs(@Param("sql") String sql,@Param("orgId") Long orgId,@Param("sql1") String sql1);
//获取合计 //获取合计
FinalTjOrgEqsDto getSumByViewOrgeqsSum(); FinalTjOrgEqsDto getSumByViewOrgeqsSum();
...@@ -85,4 +85,6 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> { ...@@ -85,4 +85,6 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> {
void useViewOrgIdInSubordinate(@Param("sql") String sql); void useViewOrgIdInSubordinate(@Param("sql") String sql);
void useViewOrgIdInLevel(@Param("sql") String sql,@Param("orgId") Long orgId); void useViewOrgIdInLevel(@Param("sql") String sql,@Param("orgId") Long orgId);
List<Long> selectOrgIds(@Param("orgId") Long orgId);
} }
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/service/TjService.java
...@@ -56,4 +56,6 @@ public interface TjService { ...@@ -56,4 +56,6 @@ public interface TjService {
List<TjOrgPoliceDto> TjOrgPoliceDetailList(TjOrgPoliceReq req); List<TjOrgPoliceDto> TjOrgPoliceDetailList(TjOrgPoliceReq req);
List<TjOrgEqsDto> TjOrgEqsSecondList(TjOrgEqsReq req); List<TjOrgEqsDto> TjOrgEqsSecondList(TjOrgEqsReq req);
PageResult<TjOrgEqsDto> test1(TjOrgEqsReq req);
} }
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventoryServiceImpl.java
...@@ -47,6 +47,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -47,6 +47,7 @@ import javax.servlet.http.HttpServletResponse;
import com.junmp.jyzb.mapper.InventoryMapper; import com.junmp.jyzb.mapper.InventoryMapper;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -372,6 +373,57 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory ...@@ -372,6 +373,57 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
//查询inventory表中数据，对响应数据进行修改 //查询inventory表中数据，对响应数据进行修改
//判断是对整一类的装备进行修改还是说对个别几个装备进行批量修改 //判断是对整一类的装备进行修改还是说对个别几个装备进行批量修改
// if (req.getInventoryIdList().size()!=0){ // if (req.getInventoryIdList().size()!=0){
PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
int size = req.getInventoryIdList().size();
List<Object[]> searchItem=new ArrayList<>();
if (req.getPrice().compareTo(req.getOriginalPrice())!=0){
Object[] item=new Object[]{req.getOrgId(),req.getLocationId(),req.getTypeId(),req.getSizeId(),req.getPrice()};
Object[] item1=new Object[]{req.getOrgId(),req.getLocationId(),req.getTypeId(),req.getSizeId(),req.getOriginalPrice()};
searchItem.add(item);
searchItem.add(item1);
List<InventorySummary> inventorySummaryList = inventorySummaryMapper.selectSumByItems(searchItem);
if (inventorySummaryList.size()==1){
InventorySummary is = inventorySummaryList.get(0);
is.setStockNumber(is.getStockNumber()-size);
is.setNumber(is.getNumber()-size);
is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
//新增一条数据
InventorySummary inventorySummary = new InventorySummary();
BeanPlusUtil.copyProperties(req,inventorySummary);
is.setValuekey(pubOrg.getOrgCode()+req.getTypeId()+req.getSizeId()+req.getLocationId()+req.getPrice());
inventorySummary.setOrgName(pubOrg.getOrgName());
inventorySummary.setOrgCode(pubOrg.getOrgCode());
inventorySummary.setNumber(size);
inventorySummary.setStockNumber(size);
inventorySummary.setOutboundNumber(0);
inventorySummary.setLocationType("0");
inventorySummary.setUnitPrice(req.getPrice());
inventorySummary.setPrice(req.getOriginalPrice().multiply(BigDecimal.valueOf(size)));
inventorySummary.setDestructionPrice(BigDecimal.ZERO);
inventorySummary.setBrokenNumberPrice(BigDecimal.ZERO);
inventorySummary.setExpireNumberPrice(BigDecimal.ZERO);
inventorySummary.setBrokenNumber(0);
inventorySummary.setExpireNumber(0);
inventorySummary.setDestructionNumber(0);
inventorySummary.setNearBrokenNumber(0);
inventorySummaryService.save(inventorySummary);
inventorySummaryService.updateBatchById(inventorySummaryList);
}else {
for (InventorySummary is:inventorySummaryList) {
if (is.getUnitPrice().compareTo(req.getOriginalPrice())==0){
is.setStockNumber(is.getStockNumber()-size);
is.setNumber(is.getNumber()-size);
is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
}else {
is.setStockNumber(is.getStockNumber()+size);
is.setNumber(is.getNumber()+size);
is.setPrice(is.getUnitPrice().multiply(BigDecimal.valueOf(is.getNumber())));
}
}
inventorySummaryService.updateBatchById(inventorySummaryList);
}
}
List<Inventory> list = list(new LambdaQueryWrapper<Inventory>().in(Inventory::getId, req.getInventoryIdList())); List<Inventory> list = list(new LambdaQueryWrapper<Inventory>().in(Inventory::getId, req.getInventoryIdList()));
if (list.size()==0){ if (list.size()==0){
throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR); throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
...@@ -386,6 +438,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory ...@@ -386,6 +438,7 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
} }
return inventory; return inventory;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
return updateBatchById(collect); return updateBatchById(collect);
} }
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java
...@@ -127,10 +127,11 @@ public class TjServiceImpl implements TjService { ...@@ -127,10 +127,11 @@ public class TjServiceImpl implements TjService {
// List<String> typeIdsList = equipmentSizeService.selectByTypeIds(req.getTypeIdsList()); // List<String> typeIdsList = equipmentSizeService.selectByTypeIds(req.getTypeIdsList());
// List<String> sizeNameList = req.getSizeNameList(); // List<String> sizeNameList = req.getSizeNameList();
//将前端传递的值进行处理并且执行存储过程 //将前端传递的值进行处理并且执行存储过程
String sql = setSql(req); String sql="and (org_id="+req.getOrgId()+" or org_parent_id = "+req.getOrgId()+")";
String sql1 = setSql(req);
// System.out.println("sql = " + sql); // System.out.println("sql = " + sql);
//执行存储过程 //执行存储过程
inventorySummaryMapper.useViewOrgeqs(sql,req.getOrgId()); inventorySummaryMapper.useViewOrgeqs(sql,req.getOrgId(),sql1);
//查询视图 //查询视图
List<TjOrgEqsDto> tjOrgEqsDtoList = inventorySummaryMapper.selectViewOrgeqsSum(); List<TjOrgEqsDto> tjOrgEqsDtoList = inventorySummaryMapper.selectViewOrgeqsSum();
//查询出来的组织机构进行判断，如果该组织机构下的装备装备总数为0，那么将该组织机构从list中移除 //查询出来的组织机构进行判断，如果该组织机构下的装备装备总数为0，那么将该组织机构从list中移除
...@@ -157,10 +158,11 @@ public class TjServiceImpl implements TjService { ...@@ -157,10 +158,11 @@ public class TjServiceImpl implements TjService {
@Override @Override
public FinalTjOrgEqsDto TjOrgEqsSum(TjOrgEqsReq req) { public FinalTjOrgEqsDto TjOrgEqsSum(TjOrgEqsReq req) {
//将前端传递的值进行处理并且执行存储过程 //将前端传递的值进行处理并且执行存储过程
String sql = setSql(req); String sql="and (org_id="+req.getOrgId()+" or org_parent_id = "+req.getOrgId()+")";
String sql1 = setSql(req);
// System.out.println("sql = " + sql); // System.out.println("sql = " + sql);
//执行存储过程 //执行存储过程
inventorySummaryMapper.useViewOrgeqs(sql,req.getOrgId()); inventorySummaryMapper.useViewOrgeqs(sql,req.getOrgId(),sql1);
//在内存foreach还是去数据库再去查询一次 //在内存foreach还是去数据库再去查询一次
FinalTjOrgEqsDto finalTjOrgEqsDto=inventorySummaryMapper.getSumByViewOrgeqsSum(); FinalTjOrgEqsDto finalTjOrgEqsDto=inventorySummaryMapper.getSumByViewOrgeqsSum();
if (ObjectUtil.isNotNull(finalTjOrgEqsDto)) { if (ObjectUtil.isNotNull(finalTjOrgEqsDto)) {
...@@ -175,8 +177,9 @@ public class TjServiceImpl implements TjService { ...@@ -175,8 +177,9 @@ public class TjServiceImpl implements TjService {
public List<TjOrgEqsDto> TjOrgEqsSecondList(TjOrgEqsReq req) { public List<TjOrgEqsDto> TjOrgEqsSecondList(TjOrgEqsReq req) {
List<TjOrgEqsDto> tjOrgEqsDtoList=new ArrayList<>(); List<TjOrgEqsDto> tjOrgEqsDtoList=new ArrayList<>();
String sql = setSql(req); String sql="and (org_id="+req.getOrgId()+" or org_parent_id = "+req.getOrgId()+")";
if (req.getOrgId()== req.getParentOrgId()){ String sql1 = setSql(req);
if (req.getOrgId().compareTo(req.getParentOrgId())==0){
inventorySummaryMapper.useViewOrgIdInLevel(sql,req.getOrgId()); inventorySummaryMapper.useViewOrgIdInLevel(sql,req.getOrgId());
...@@ -197,24 +200,34 @@ public class TjServiceImpl implements TjService { ...@@ -197,24 +200,34 @@ public class TjServiceImpl implements TjService {
return tjOrgEqsDtoList; return tjOrgEqsDtoList;
} }
private String setSql(TjOrgEqsReq req){ @Override
String sql="and (org_id="+req.getOrgId()+" or org_parent_id = "+req.getOrgId()+")"; public PageResult<TjOrgEqsDto> test1(TjOrgEqsReq req) {
if (!ObjectUtil.isEmpty(req.getTypeIdsList()) && req.getTypeIdsList().size()>0){ List<Long> orgIds=inventorySummaryMapper.selectOrgIds(req.getOrgId());
sql+="and type_id in ("; for (Long orgId:orgIds) {
for (String typeId:req.getTypeIdsList()) {
sql+=typeId+",";
}
sql = sql.substring(0, sql.length() - 1);
sql+=")";
}
if (!ObjectUtil.isEmpty(req.getSizeNameList()) && req.getSizeNameList().size()>0){
sql+="and size_name in (";
for (String sizeName:req.getSizeNameList()) {
sql+="'"+sizeName+"',";
}
sql = sql.substring(0, sql.length() - 1);
sql+=")";
} }
return null;
}
private String setSql(TjOrgEqsReq req){
String sql="and 1=1";
// if (!ObjectUtil.isEmpty(req.getTypeIdsList()) && req.getTypeIdsList().size()>0){
// sql+="and type_id in (";
// for (String typeId:req.getTypeIdsList()) {
// sql+=typeId+",";
// }
// sql = sql.substring(0, sql.length() - 1);
// sql+=")";
// }
// if (!ObjectUtil.isEmpty(req.getSizeNameList()) && req.getSizeNameList().size()>0){
// sql+="and size_name in (";
// for (String sizeName:req.getSizeNameList()) {
// sql+="'"+sizeName+"',";
// }
// sql = sql.substring(0, sql.length() - 1);
// sql+=")";
// }
return sql; return sql;
} }
......
jyzb-biz/src/main/resources/mapper/EquipmentSizeMapper.xml
...@@ -3,28 +3,29 @@ ...@@ -3,28 +3,29 @@
<mapper namespace="com.junmp.jyzb.mapper.EquipmentSizeMapper"> <mapper namespace="com.junmp.jyzb.mapper.EquipmentSizeMapper">
<select id="getSizePage" resultType="com.junmp.jyzb.api.bean.dto.EquipmentSizeDto"> <select id="getSizePage" resultType="com.junmp.jyzb.api.bean.dto.EquipmentSizeDto">
SELECT WITH ranked_equipment AS (
t1.id, SELECT
t1.state, t1.id,
t2.maintenance_period as maintenancePeriod, t1.state AS state,
t2.warranty_period as warrantyPeriod, t2.maintenance_period AS maintenancePeriod,
t2.name AS eqName, t2.warranty_period AS warrantyPeriod,
t1.name AS name, t2.name AS eqName,
t1.type_id as typeId, t1.name AS name,
t2.price, t1.type_id AS typeId,
t1.code AS code, t2.price AS price,
t3.name AS type3Name, t1.code AS code,
t4.name AS type2name, t3.name AS type3Name,
t5.name AS type1Name, t4.name AS type2name,
CONCAT_WS(' / ', t5.name, t4.name, t3.name) AS combinedTypes t5.name AS type1Name,
CONCAT_WS(' / ', t5.name, t4.name, t3.name) AS combinedTypes,
ROW_NUMBER() OVER (PARTITION BY t2.name, t1.name ORDER BY t1.id) AS rn
FROM FROM
`base_equipment_size` t1 `base_equipment_size` t1
LEFT JOIN `base_equipment_type` t2 ON t1.type_id = t2.id LEFT JOIN `base_equipment_type` t2 ON t1.type_id = t2.id
LEFT JOIN `base_equipment_type` t3 ON t2.parent_id = t3.id LEFT JOIN `base_equipment_type` t3 ON t2.parent_id = t3.id
LEFT JOIN `base_equipment_type` t4 ON t3.parent_id = t4.id LEFT JOIN `base_equipment_type` t4 ON t3.parent_id = t4.id
LEFT JOIN `base_equipment_type` t5 ON t4.parent_id = t5.id LEFT JOIN `base_equipment_type` t5 ON t4.parent_id = t5.id
LEFT JOIN `base_equipment_type` t6 ON t5.parent_id = t6.id LEFT JOIN `base_equipment_type` t6 ON t5.parent_id = t6.id
WHERE 1 = 1 WHERE 1 = 1
<if test="null != req"> <if test="null != req">
<if test="null != req.name"> <if test="null != req.name">
...@@ -38,6 +39,27 @@ ...@@ -38,6 +39,27 @@
</if> </if>
</if> </if>
)
SELECT
id,
state,
maintenancePeriod,
warrantyPeriod,
eqName,
name,
typeId,
price,
code,
type3Name,
type2name,
type1Name,
combinedTypes
FROM
ranked_equipment
WHERE
rn = 1
ORDER BY
typeId
</select> </select>
<select id="getSizeCount" resultType="int"> <select id="getSizeCount" resultType="int">
SELECT SELECT
......
jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml
...@@ -407,7 +407,7 @@ ...@@ -407,7 +407,7 @@
</insert> </insert>
<insert id="useViewOrgeqs" statementType="CALLABLE"> <insert id="useViewOrgeqs" statementType="CALLABLE">
{CALL view_orgeqs(#{sql,mode=IN},#{orgId,mode=IN})} {CALL view_orgeqs(#{sql,mode=IN},#{orgId,mode=IN},#{sql1,mode=IN})}
</insert> </insert>
<insert id="useViewOrgIdInSubordinate" parameterType="java.lang.String"> <insert id="useViewOrgIdInSubordinate" parameterType="java.lang.String">
...@@ -665,7 +665,10 @@ ...@@ -665,7 +665,10 @@
) 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.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, select i.id,i.type_id,i.size_id,i.supplier_id,i.shelf_id,i.shelf_location,i.price,
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
...@@ -692,6 +695,15 @@ ...@@ -692,6 +695,15 @@
</if> </if>
</select> </select>
<select id="selectOrgIds" resultType="java.lang.Long">
SELECT
`po`.`org_id` AS `org_id`
FROM `pub_org` `po`
WHERE `po`.`del_flag` = 1
and (po.org_id=#{orgId} or `po`.org_parent_id=#{orgId})
and `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} )+1
GROUP BY org_id
</select>
</mapper> </mapper>
\ No newline at end of file
jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java
...@@ -178,7 +178,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper, ...@@ -178,7 +178,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
.isNull(ProcessTemplates::getOrgId)); .isNull(ProcessTemplates::getOrgId));
wrapper.orderByDesc(ProcessTemplates::getUpdated); wrapper.orderByDesc(ProcessTemplates::getUpdated);
TemplateGroupMapper templateGroupMapper = SpringContextHolder.getBean(TemplateGroupMapper.class); TemplateGroupMapper templateGroupMapper = SpringContextHolder.getBean(TemplateGroupMapper.class);
Page<ProcessTemplates> allformAndGroups =this.page(PageFactory.getDefaultPage(),wrapper); Page<ProcessTemplates> allformAndGroups =this.page(PageFactory.getDefaultPage(br.getPageNo(),br.getPageSize()),wrapper);
// templateGroupMapper.getAllFormAndGroups(); // templateGroupMapper.getAllFormAndGroups();
Map<Integer, List<ProcessTemplates>> coverMap = new LinkedHashMap<>(); Map<Integer, List<ProcessTemplates>> coverMap = new LinkedHashMap<>();
allformAndGroups.getRecords().forEach(fg -> { allformAndGroups.getRecords().forEach(fg -> {
...@@ -855,6 +855,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper, ...@@ -855,6 +855,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
String Name= bpmnModel.getMainProcess().getName(); String Name= bpmnModel.getMainProcess().getName();
historyProcessInstanceVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID)); historyProcessInstanceVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
historyProcessInstanceVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE)); historyProcessInstanceVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
historyProcessInstanceVO.setType(MapUtil.getStr(processVariables, TYPE));
historyProcessInstanceVO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName()); historyProcessInstanceVO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName());
historyProcessInstanceVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<UserInfo>() { historyProcessInstanceVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<UserInfo>() {
})); }));
...@@ -923,6 +924,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper, ...@@ -923,6 +924,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
taskVO.setStartUser(this.SetUser(staruser)); taskVO.setStartUser(this.SetUser(staruser));
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.setType(MapUtil.getStr(processVariables, TYPE));
taskVO.setStartTime(processInstance.getStartTime()); taskVO.setStartTime(processInstance.getStartTime());
taskVO.setCurrentActivityName(getCurrentName(processInstance.getId(),false,processInstance.getProcessDefinitionId())); taskVO.setCurrentActivityName(getCurrentName(processInstance.getId(),false,processInstance.getProcessDefinitionId()));
...@@ -995,6 +997,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper, ...@@ -995,6 +997,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
})); }));
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.setType(MapUtil.getStr(processVariables, TYPE));
taskVO.setStartTime(historicProcessInstance.getStartTime()); taskVO.setStartTime(historicProcessInstance.getStartTime());
taskVO.setCurrentActivityName(getCurrentName(task.getProcessInstanceId(), flag, task.getProcessDefinitionId())); taskVO.setCurrentActivityName(getCurrentName(task.getProcessInstanceId(), flag, task.getProcessDefinitionId()));
taskVO.setBusinessStatus(MapUtil.getStr(processVariables, PROCESS_STATUS)); taskVO.setBusinessStatus(MapUtil.getStr(processVariables, PROCESS_STATUS));
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java
...@@ -496,7 +496,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -496,7 +496,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
taskVO.setStartTime(processInstance.getStartTime()); taskVO.setStartTime(processInstance.getStartTime());
taskVO.setCurrentActivityName(getCurrentName(processInstance.getId(),false,processInstance.getProcessDefinitionId())); taskVO.setCurrentActivityName(getCurrentName(processInstance.getId(),false,processInstance.getProcessDefinitionId()));
taskVO.setBusinessStatus(MapUtil.getStr(processVariables,PROCESS_STATUS)); taskVO.setBusinessStatus(MapUtil.getStr(processVariables,PROCESS_STATUS));
taskVO.setType(MapUtil.getStr(processVariables,TYPE));
taskVO.setStartOrgName(MapUtil.getStr(processVariables,START_ORG_NAME)); taskVO.setStartOrgName(MapUtil.getStr(processVariables,START_ORG_NAME));
taskVO.setEndOrgName(MapUtil.getStr(processVariables,END_ORG_NAME)); taskVO.setEndOrgName(MapUtil.getStr(processVariables,END_ORG_NAME));
taskVO.setInvList(MapUtil.getStr(processVariables,INVLIST)); taskVO.setInvList(MapUtil.getStr(processVariables,INVLIST));
...@@ -609,6 +609,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -609,6 +609,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
taskVO.setStartUser(JSONObject.parseObject(s, UserInfo.class)); taskVO.setStartUser(JSONObject.parseObject(s, UserInfo.class));
taskVO.setUserName(MapUtil.getStr(processVariables,USER_NAME)); taskVO.setUserName(MapUtil.getStr(processVariables,USER_NAME));
taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID)); taskVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
taskVO.setType(MapUtil.getStr(processVariables,TYPE));
taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE)); taskVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
taskVO.setStartTime(historicProcessInstance.getStartTime()); taskVO.setStartTime(historicProcessInstance.getStartTime());
taskVO.setCurrentActivityName(getCurrentName(task.getProcessInstanceId(), flag, task.getProcessDefinitionId())); taskVO.setCurrentActivityName(getCurrentName(task.getProcessInstanceId(), flag, task.getProcessDefinitionId()));
...@@ -726,6 +727,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -726,6 +727,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
historyProcessInstanceVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID)); historyProcessInstanceVO.setOrderId(MapUtil.getStr(processVariables, ORDER_ID));
historyProcessInstanceVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE)); historyProcessInstanceVO.setOrderType(MapUtil.getStr(processVariables, ORDER_TYPE));
historyProcessInstanceVO.setType(MapUtil.getStr(processVariables,TYPE));
historyProcessInstanceVO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName()); historyProcessInstanceVO.setProcessDefinitionName(historicProcessInstance.getProcessDefinitionName());
// historyProcessInstanceVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<ProcessUser>() { // historyProcessInstanceVO.setStartUser(JSONObject.parseObject(MapUtil.getStr(processVariables, START_USER_INFO), new TypeReference<ProcessUser>() {
// }).getUserInfo()); // }).getUserInfo());
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/SysFormServiceImpl.java
...@@ -148,7 +148,7 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc ...@@ -148,7 +148,7 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc
.isNull(ProcessTemplates::getOrgId)); .isNull(ProcessTemplates::getOrgId));
wrapper.orderByDesc(ProcessTemplates::getUpdated); wrapper.orderByDesc(ProcessTemplates::getUpdated);
TemplateGroupMapper templateGroupMapper = SpringContextHolder.getBean(TemplateGroupMapper.class); TemplateGroupMapper templateGroupMapper = SpringContextHolder.getBean(TemplateGroupMapper.class);
Page<ProcessTemplates> allformAndGroups =this.page(PageFactory.getDefaultPage(),wrapper); Page<ProcessTemplates> allformAndGroups =this.page(PageFactory.getDefaultPage(br.getPageNo(),br.getPageSize()),wrapper);
// templateGroupMapper.getAllFormAndGroups(); // templateGroupMapper.getAllFormAndGroups();
Map<Integer, List<ProcessTemplates>> coverMap = new LinkedHashMap<>(); Map<Integer, List<ProcessTemplates>> coverMap = new LinkedHashMap<>();
allformAndGroups.getRecords().forEach(fg -> { allformAndGroups.getRecords().forEach(fg -> {
......
jyzb-process/src/main/java/com/junmp/junmpProcess/vo/HistoryProcessInstanceVO.java
...@@ -52,4 +52,5 @@ public class HistoryProcessInstanceVO { ...@@ -52,4 +52,5 @@ public class HistoryProcessInstanceVO {
private String processId; private String processId;
@ApiModelProperty("人员（领用人，调岗人）") @ApiModelProperty("人员（领用人，调岗人）")
private String userName; private String userName;
private String type;
} }
jyzb-process/src/main/java/com/junmp/junmpProcess/vo/TaskVO.java
...@@ -56,4 +56,6 @@ public class TaskVO { ...@@ -56,4 +56,6 @@ public class TaskVO {
@ApiModelProperty("人员（领用、调岗）") @ApiModelProperty("人员（领用、调岗）")
private String userName; private String userName;
private String type;
} }
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论