Skip to content

J
jyzb_platformV2
Commit ea99add1 by 赵剑炜
Options

Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

parents 80c1945f d9fafcca
正在显示 包含 65 行增加 和 28 行删除
jyzb-biz/src/main/java/com/junmp/jyzb/entity/BusForm.java
...@@ -225,6 +225,12 @@ public class BusForm implements Serializable { ...@@ -225,6 +225,12 @@ public class BusForm implements Serializable {
private String currentAssign; private String currentAssign;
/** /**
* 审核人信息
*/
@TableField(value = "history_assign")
private String historyAssign;
/**
* 单据当前状态（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次） * 单据当前状态（forbidden禁止使用，outgoing 仅出库使用，incoming仅入库使用，bothuseing出入库都可以使用一次）
*/ */
@TableField(value = "order_current_state") @TableField(value = "order_current_state")
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/BussinessInventory.java
...@@ -40,7 +40,11 @@ public class BussinessInventory implements Serializable { ...@@ -40,7 +40,11 @@ public class BussinessInventory implements Serializable {
*/ */
@TableField(value = "current_assign") @TableField(value = "current_assign")
private String currentAssign; private String currentAssign;
/**
* 工作流id
*/
@TableField(value = "history_assign")
private String historyAssign;
/** /**
* 单据编号 * 单据编号
*/ */
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderMain.java
...@@ -91,7 +91,8 @@ public class OrderMain implements Serializable { ...@@ -91,7 +91,8 @@ public class OrderMain implements Serializable {
@TableField("current_assign") @TableField("current_assign")
private String currentAssign; private String currentAssign;
@TableField("history_assign")
private String historyAssign;
@TableField("use_date") @TableField("use_date")
private Date useDate; private Date useDate;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Reassignment.java
...@@ -95,12 +95,22 @@ public class Reassignment implements Serializable { ...@@ -95,12 +95,22 @@ public class Reassignment implements Serializable {
*/ */
@TableField(value = "current_assign") @TableField(value = "current_assign")
private String currentAssign; private String currentAssign;
/**
* 历史审核人
*/
@TableField(value = "history_assign")
private String historyAssign;
/** /**
* 经办人 * 经办人
*/ */
@TableField(value = "agent") @TableField(value = "agent")
private String agent; private String agent;
/**
* 经办人
*/
@TableField(value = "agent_id")
private String agentId;
/** /**
* 申请时间 * 申请时间
*/ */
......
jyzb-biz/src/main/java/com/junmp/jyzb/listener/CounterSignListener.java
...@@ -11,10 +11,7 @@ import com.junmp.junmpProcess.exception.WorkFlowException; ...@@ -11,10 +11,7 @@ import com.junmp.junmpProcess.exception.WorkFlowException;
import com.junmp.junmpProcess.mapper.OrgUserMapper; import com.junmp.junmpProcess.mapper.OrgUserMapper;
import com.junmp.jyzb.cache.MsgRedisCache; import com.junmp.jyzb.cache.MsgRedisCache;
import com.junmp.jyzb.entity.*; import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.service.BusFormService; import com.junmp.jyzb.service.*;
import com.junmp.jyzb.service.OrderMainService;
import com.junmp.jyzb.service.ReassignmentService;
import com.junmp.jyzb.service.StocktakeService;
import com.junmp.v2.auth.api.bean.login.LoginUser; import com.junmp.v2.auth.api.bean.login.LoginUser;
import com.junmp.v2.auth.api.context.LoginContext; import com.junmp.v2.auth.api.context.LoginContext;
import com.junmp.v2.message.api.MessageApi; import com.junmp.v2.message.api.MessageApi;
...@@ -62,7 +59,8 @@ public class CounterSignListener implements ExecutionListener { ...@@ -62,7 +59,8 @@ public class CounterSignListener implements ExecutionListener {
@Resource @Resource
private MsgRedisCache redisCache; private MsgRedisCache redisCache;
@Resource
private BussinessInventoryService bussinessInventoryService;
@Resource @Resource
private RuntimeService runtimeService; private RuntimeService runtimeService;
@Override @Override
...@@ -237,11 +235,12 @@ public class CounterSignListener implements ExecutionListener { ...@@ -237,11 +235,12 @@ public class CounterSignListener implements ExecutionListener {
{ {
String assigneeString = String.join(",", assigneeList); String assigneeString = String.join(",", assigneeList);
if (ObjectUtil.isNull(om.getCurrentAssign())){ if (ObjectUtil.isNull(om.getHistoryAssign())){
om.setCurrentAssign(assigneeString); om.setHistoryAssign(assigneeString);
}else { }else {
om.setCurrentAssign(om.getCurrentAssign()+","+assigneeString); om.setHistoryAssign(om.getHistoryAssign()+","+assigneeString);
} }
om.setCurrentAssign(assigneeString);
orderMainService.updateById(om); orderMainService.updateById(om);
} }
...@@ -254,11 +253,12 @@ public class CounterSignListener implements ExecutionListener { ...@@ -254,11 +253,12 @@ public class CounterSignListener implements ExecutionListener {
{ {
String assigneeString = String.join(",", assigneeList); String assigneeString = String.join(",", assigneeList);
if (ObjectUtil.isNull(re.getCurrentAssign())){ if (ObjectUtil.isNull(re.getHistoryAssign())){
re.setCurrentAssign(assigneeString); re.setHistoryAssign(assigneeString);
}else { }else {
re.setCurrentAssign(re.getCurrentAssign()+","+assigneeString); re.setHistoryAssign(re.getHistoryAssign()+","+assigneeString);
} }
re.setCurrentAssign(assigneeString);
reassignmentService.updateById(re); reassignmentService.updateById(re);
} }
} }
...@@ -269,27 +269,30 @@ public class CounterSignListener implements ExecutionListener { ...@@ -269,27 +269,30 @@ public class CounterSignListener implements ExecutionListener {
if (re!=null&&assigneeList.size()>0)//判断有没有启动的当前单据,并且下一审核人信息不为空,有启动的单据则把审核人信息加入 if (re!=null&&assigneeList.size()>0)//判断有没有启动的当前单据,并且下一审核人信息不为空,有启动的单据则把审核人信息加入
{ {
String assigneeString = String.join(",", assigneeList); String assigneeString = String.join(",", assigneeList);
if (ObjectUtil.isNull(re.getCurrentAssign())){ if (ObjectUtil.isNull(re.getHistoryAssign())){
re.setCurrentAssign(assigneeString); re.setHistoryAssign(assigneeString);
}else { }else {
re.setCurrentAssign(re.getCurrentAssign()+","+assigneeString); re.setHistoryAssign(re.getHistoryAssign()+","+assigneeString);
} }
re.setCurrentAssign(assigneeString);
busFormService.updateById(re); busFormService.updateById(re);
} }
} }
else if (orderType.equals("stocktakeOrder"))//盘库单据 else if (orderType.equals("stocktakeOrder"))//盘库单据
{ {
Stocktake re= stocktakeService.getOne(new LambdaQueryWrapper<Stocktake>()
.eq(Stocktake::getProcessId, execution.getProcessInstanceId())); BussinessInventory re = bussinessInventoryService.getOne(new LambdaQueryWrapper<BussinessInventory>()
.eq(BussinessInventory::getProcessId, execution.getProcessInstanceId()));
if (re!=null&&assigneeList.size()>0)//判断有没有启动的当前单据,并且下一审核人信息不为空,有启动的单据则把审核人信息加入 if (re!=null&&assigneeList.size()>0)//判断有没有启动的当前单据,并且下一审核人信息不为空,有启动的单据则把审核人信息加入
{ {
String assigneeString = String.join(",", assigneeList); String assigneeString = String.join(",", assigneeList);
if (ObjectUtil.isNull(re.getCurrentAssign())){ if (ObjectUtil.isNull(re.getHistoryAssign())){
re.setCurrentAssign(assigneeString); re.setHistoryAssign(assigneeString);
}else { }else {
re.setCurrentAssign(re.getCurrentAssign()+","+assigneeString); re.setHistoryAssign(re.getHistoryAssign()+","+assigneeString);
} }
stocktakeService.updateById(re); re.setCurrentAssign(assigneeString);
bussinessInventoryService.updateById(re);
} }
} }
Object skip=execution.getVariable("skip"); Object skip=execution.getVariable("skip");
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/OrderMainMapper.java
...@@ -16,6 +16,6 @@ public interface OrderMainMapper extends BaseMapper<OrderMain> { ...@@ -16,6 +16,6 @@ public interface OrderMainMapper extends BaseMapper<OrderMain> {
void updateOrder(OrderMain order); void updateOrder(OrderMain order);
IPage<OrderMain> getOrderPage(Page<OrderMain> page1,@Param("req") OrderMainReq req); IPage<OrderMain> getOrderPage(Page<OrderMain> page1,@Param("req") OrderMainReq req,@Param("userId") Long userId);
} }
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BusFormServiceImpl.java
...@@ -313,6 +313,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl ...@@ -313,6 +313,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
if (detialReq.getLocationId().equals(is.getLocationId()) && detialReq.getTypeId().equals(is.getTypeId()) if (detialReq.getLocationId().equals(is.getLocationId()) && detialReq.getTypeId().equals(is.getTypeId())
&& detialReq.getSizeId().equals(is.getSizeId()) && detialReq.getPrice().compareTo(is.getUnitPrice())==0){ && detialReq.getSizeId().equals(is.getSizeId()) && detialReq.getPrice().compareTo(is.getUnitPrice())==0){
is.setNumber(is.getNumber()-detialReq.getPlanNum()<0?0:is.getNumber()-detialReq.getPlanNum());
msg=msg+"装备：" +detialReq.getTypeName()+"号型："+detialReq.getSizeName()+"已存在审核最大可报废数量;"; msg=msg+"装备：" +detialReq.getTypeName()+"号型："+detialReq.getSizeName()+"已存在审核最大可报废数量;";
...@@ -325,7 +326,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl ...@@ -325,7 +326,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
throw new JYZBAppException(InventoryExceptionEnum.EQUIPMENT_NOT_EXIST, msg); throw new JYZBAppException(InventoryExceptionEnum.EQUIPMENT_NOT_EXIST, msg);
} }
return true; return inventorySummaryService.updateBatchById(inventorySummaryList);
} }
@Override @Override
...@@ -612,7 +613,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl ...@@ -612,7 +613,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
//当前登录人 //当前登录人
eq.and(wrapper-> wrapper.eq(BusForm::getAgentId,StartUser.getUserId()) eq.and(wrapper-> wrapper.eq(BusForm::getAgentId,StartUser.getUserId())
.or() .or()
.like(BusForm::getCurrentAssign,StartUser.getUserId())); .like(BusForm::getHistoryAssign,StartUser.getUserId()));
} }
if (req.getBussinessType().equals("allocate")){ if (req.getBussinessType().equals("allocate")){
if (req.getStartOrgId()!=null){ if (req.getStartOrgId()!=null){
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java
...@@ -693,8 +693,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain ...@@ -693,8 +693,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
req.setOrder(req.getOrder().toLowerCase()); req.setOrder(req.getOrder().toLowerCase());
} }
//根据查询条件得到单据 //根据查询条件得到单据
LoginUser loginUser = LoginContext.getContext().getLoginUser();
IPage<OrderMain> outOrderPage = orderMainMapper.getOrderPage(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()),req); IPage<OrderMain> outOrderPage = orderMainMapper.getOrderPage(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()),req,loginUser.getUserId());
page.setRecords(outOrderPage.getRecords()); page.setRecords(outOrderPage.getRecords());
page.setTotal(outOrderPage.getTotal()); page.setTotal(outOrderPage.getTotal());
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
...@@ -31,6 +31,8 @@ import com.junmp.jyzb.entity.*; ...@@ -31,6 +31,8 @@ import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.*; import com.junmp.jyzb.mapper.*;
import com.junmp.jyzb.service.*; import com.junmp.jyzb.service.*;
import com.junmp.jyzb.utils.*; import com.junmp.jyzb.utils.*;
import com.junmp.v2.auth.api.bean.login.LoginUser;
import com.junmp.v2.auth.api.context.LoginContext;
import com.junmp.v2.auth.api.password.IStoredEncryptApi; import com.junmp.v2.auth.api.password.IStoredEncryptApi;
import com.junmp.v2.common.enums.LogicDelEnum; import com.junmp.v2.common.enums.LogicDelEnum;
import com.junmp.v2.common.exception.base.ServiceException; import com.junmp.v2.common.exception.base.ServiceException;
...@@ -1165,7 +1167,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -1165,7 +1167,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
.ge(ObjectUtil.isNotNull(req.getStartTime()), Reassignment::getApplyTime, req.getStartTime()) .ge(ObjectUtil.isNotNull(req.getStartTime()), Reassignment::getApplyTime, req.getStartTime())
.le(ObjectUtil.isNotNull(req.getEndTime()), Reassignment::getApplyTime, req.getEndTime()) .le(ObjectUtil.isNotNull(req.getEndTime()), Reassignment::getApplyTime, req.getEndTime())
.last("order by " + req.getColumn() + " " + req.getOrder()); .last("order by " + req.getColumn() + " " + req.getOrder());
if (ObjectUtil.isNotNull(req.getUserId())){
eq.and(wrapper -> wrapper.eq(Reassignment::getAgentId,req.getUserId())
.or().like(Reassignment::getExamineState,req.getUserId()));
}else {
LoginUser loginUser = LoginContext.getContext().getLoginUser();
eq.and(wrapper -> wrapper.eq(Reassignment::getAgentId,loginUser.getUserId())
.or().like(Reassignment::getExamineState,loginUser.getUserId()));
}
Page<Reassignment> page = reassignmentService.page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), eq); Page<Reassignment> page = reassignmentService.page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), eq);
return PageResultFactory.createPageResult(page); return PageResultFactory.createPageResult(page);
} }
......
jyzb-biz/src/main/resources/mapper/OrderMainMapper.xml
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
<if test="req.endOrgId != null and req.endOrgId != ''"> <if test="req.endOrgId != null and req.endOrgId != ''">
and end_org_id = #{req.endOrgId} and end_org_id = #{req.endOrgId}
</if> </if>
and (start_org_user_id = #{userId} or end_org_user_id = #{userId} or history_assign like CONCAT('%', #{userId}, '%') )
<if test="req.orderState !=null and req.orderState != ''"> <if test="req.orderState !=null and req.orderState != ''">
and order_state = #{req.orderState} and order_state = #{req.orderState}
</if> </if>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论