Skip to content

J
jyzb_platformV2
Commit fcd79a7b by 李小惠
Options

填充空白数据bug修改，修改审核员看不见单据bug，修改盘点开始接口bug

parent 9968a455
正在显示 包含 251 行增加 和 59 行删除
app-log/error/log-error-2024-02-03.0.log 0 → 100644
2024-02-01 13:55:57.167 ERROR 32340 --- [main] easy-es : Easy-Es supported elasticsearch and restHighLevelClient jar version is:7.14.0 ,Please resolve the dependency conflict!
2024-02-01 14:00:20.882 ERROR 32340 --- [http-nio-10030-exec-2] c.j.j.b.c.handle.GlobalExceptionHandler : 服务器运行异常
org.springframework.web.util.NestedServletException: Handler dispatch failed; nested exception is java.lang.OutOfMemoryError: Java heap space
at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1075)
at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:962)
at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006)
at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:909)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:652)
at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:733)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:227)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:91)
at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at com.alibaba.druid.support.http.WebStatFilter.doFilter(WebStatFilter.java:124)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100)
at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93)
at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)
at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at com.junmp.v2.security.xss.XssFilter.doFilter(XssFilter.java:51)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:202)
at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:97)
at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:542)
at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:143)
at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)
at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78)
at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:357)
at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:374)
at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65)
at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:893)
at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1707)
at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.lang.Thread.run(Thread.java:748)
Caused by: java.lang.OutOfMemoryError: Java heap space
at java.util.Arrays.copyOf(Arrays.java:3210)
at java.util.Arrays.copyOf(Arrays.java:3181)
at java.util.ArrayList.grow(ArrayList.java:265)
at java.util.ArrayList.ensureExplicitCapacity(ArrayList.java:239)
at java.util.ArrayList.ensureCapacityInternal(ArrayList.java:231)
at java.util.ArrayList.addAll(ArrayList.java:583)
at com.junmp.jyzb.service.impl.PolicemanServiceImpl.oneClickAccountCreation1(PolicemanServiceImpl.java:2391)
at com.junmp.jyzb.service.impl.PolicemanServiceImpl$$FastClassBySpringCGLIB$$17a01fec.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:779)
at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:750)
at org.springframework.transaction.interceptor.TransactionInterceptor$1.proceedWithInvocation(TransactionInterceptor.java:123)
at org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:388)
at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:119)
at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:750)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:692)
at com.junmp.jyzb.service.impl.PolicemanServiceImpl$$EnhancerBySpringCGLIB$$ee8cb3e0.oneClickAccountCreation1(<generated>)
at com.junmp.jyzb.controller.PoliceController.oneClickAccountCreation(PoliceController.java:322)
at com.junmp.jyzb.controller.PoliceController$$FastClassBySpringCGLIB$$875c5b6a.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:779)
at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:750)
at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:89)
at com.junmp.v2.log.aop.ApiLogRecordAop.aroundPost(ApiLogRecordAop.java:66)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:634)
2024-02-01 14:07:18.077 ERROR 32340 --- [http-nio-10030-exec-4] c.j.j.b.c.handle.GlobalExceptionHandler : 服务器运行异常
org.springframework.web.util.NestedServletException: Handler dispatch failed; nested exception is java.lang.OutOfMemoryError: Java heap space
at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1075)
at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:962)
at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006)
at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:909)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:652)
at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:733)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:227)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:91)
at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at com.alibaba.druid.support.http.WebStatFilter.doFilter(WebStatFilter.java:124)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100)
at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93)
at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)
at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at com.junmp.v2.security.xss.XssFilter.doFilter(XssFilter.java:51)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:189)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:162)
at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:202)
at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:97)
at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:542)
at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:143)
at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)
at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78)
at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:357)
at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:374)
at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65)
at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:893)
at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1707)
at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.lang.Thread.run(Thread.java:748)
Caused by: java.lang.OutOfMemoryError: Java heap space
at java.util.Arrays.copyOf(Arrays.java:3210)
at java.util.Arrays.copyOf(Arrays.java:3181)
at java.util.ArrayList.grow(ArrayList.java:265)
at java.util.ArrayList.ensureExplicitCapacity(ArrayList.java:239)
at java.util.ArrayList.ensureCapacityInternal(ArrayList.java:231)
at java.util.ArrayList.addAll(ArrayList.java:583)
at com.junmp.jyzb.service.impl.PolicemanServiceImpl.oneClickAccountCreation1(PolicemanServiceImpl.java:2391)
at com.junmp.jyzb.service.impl.PolicemanServiceImpl$$FastClassBySpringCGLIB$$17a01fec.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:779)
at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:750)
at org.springframework.transaction.interceptor.TransactionInterceptor$1.proceedWithInvocation(TransactionInterceptor.java:123)
at org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:388)
at org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:119)
at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:750)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:692)
at com.junmp.jyzb.service.impl.PolicemanServiceImpl$$EnhancerBySpringCGLIB$$ee8cb3e0.oneClickAccountCreation1(<generated>)
at com.junmp.jyzb.controller.PoliceController.oneClickAccountCreation(PoliceController.java:322)
at com.junmp.jyzb.controller.PoliceController$$FastClassBySpringCGLIB$$875c5b6a.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:779)
at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:750)
at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:89)
at com.junmp.v2.log.aop.ApiLogRecordAop.aroundPost(ApiLogRecordAop.java:66)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:634)
app-log/error/log-error-2024-02-21.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/log_error.log
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/log_total.log
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/total/log-total-2024-02-03.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/total/log-total-2024-02-21.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/MQDto.java
......@@ -10,4 +10,5 @@ public class MQDto {
private Integer type;
private List<String> idList;
private String message;
private String orderId;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ApplicationReq.java
......@@ -20,13 +20,14 @@ public class ApplicationReq extends BaseRequest {
/**
* 应用id
*/
@NotBlank(message = "应用id不能为空",groups = {detail.class})
private String id;
/**
* 应用代码
*/
@TableField("app_code")
@NotBlank(message = "应用代码不能为空",groups = {detail.class})
private String appCode;
/**
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PolicemanMapper.java
......@@ -68,4 +68,6 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
List<UserDto> oneClickAccountCreation1(@Param("orgId") Long orgId);
void insertSysUser(@Param("userList") List<SysUser> sysUserList);
String searchUserByRoleId(@Param("orgId") Long orgId);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java
......@@ -127,4 +127,6 @@ public interface PolicemanService extends IService<Policeman> {
// boolean oneClickAccountCreation(PubOrg pubOrg) throws IOException;
boolean oneClickAccountCreation1(PubOrg pubOrg) throws IOException;
//获取组织机构下所有的审核员的userId，用字符串拼接
String searchUserByRoleId(Long orgId);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ApplicationServiceImpl.java
......@@ -107,7 +107,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
if (CollectionUtil.isEmpty(req.getIdsList())){
throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
}
List<Application> list = list(new LambdaQueryWrapper<Application>().eq(Application::getId, req.getIdsList()));
List<Application> list = list(new LambdaQueryWrapper<Application>().in(Application::getId, req.getIdsList()));
List<String> nonexistentApp = new ArrayList<>();
for (String appId:req.getIdsList()) {
boolean flag=false;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BussinessInventoryServiceImpl.java
......@@ -12,6 +12,7 @@ import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
import com.junmp.junmpProcess.service.IFlowInstanceService;
import com.junmp.jyzb.api.bean.dto.BussinessInventoryDto;
import com.junmp.jyzb.api.bean.dto.EquipmentListDto;
import com.junmp.jyzb.api.bean.dto.MQDto;
import com.junmp.jyzb.api.bean.query.BussinessInventoryReq;
import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.api.bean.req.UpdateInventoryReq;
......@@ -336,6 +337,7 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
throw new ServiceException(InventoryExceptionEnum.ORDER_HAS_START);
}
List<BussinessDetail> BDList=new ArrayList<>();
if (CollectionUtil.isNotEmpty(req.getEquipmentList())){
for (EquipmentListDto bd:
req.getEquipmentList()) {
BussinessDetail bdInsert=new BussinessDetail();
......@@ -345,11 +347,12 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
BDList.add(bdInsert);
}
bussinessInventoryDetailService.saveBatch(BDList);
}
warehouseService.updateById(warehouse);
if (bi!=null)
{
bi.setInventoryState("running");
this.save(bi);
this.updateById(bi);
}
else
{
......@@ -438,7 +441,10 @@ public class BussinessInventoryServiceImpl extends ServiceImpl<BussinessInventor
BI.setInventoryState("finished");
this.updateById(BI);
bussinessInventoryDetailService.saveBatch(Bussinessdetails);
MQDto mqDto = new MQDto();
mqDto.setApi("BussinessInventoryFinish");
mqDto.setOrderId(BI.getId());
MQ.SendMsg("orderExchange", BI.getOrgId().toString(),mqDto);
return true;
}
@Override
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java
......@@ -156,7 +156,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
// Boolean aBoolean= addOrRevokeAgentDestructionNum(req);
// }
//修改单据使用次数状态，判断数据库是否有该单据，如果有，那么就判断当前单号是否一致，如果不一致，修改单据使用次数
Long orgId=0L;
Long orgId = req.getOrderType().equals("in")?req.getEndOrgId():Long.parseLong(req.getStartOrgId());
OrderMain one =null ;
//修改业务单可用次数
if (ObjectUtil.isNotNull(req.getBussinessCode())){
......@@ -179,6 +179,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
OrderMain order = new OrderMain();
BeanPlusUtil.copyProperties(req, order);
//先判断该单据id是否存在，如果存在，进行更新操作即可
if (ObjectUtil.isNotNull(req.getId()) && ! req.getId().trim().isEmpty()){
//删除子单据
......@@ -299,6 +300,12 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
updateById(order);
} else {
//保存
//将创建人员添加（为的是将审核员创建的单子，审核员能看见）
//将该组织机构下的所有审核人员进行查询，并添加到historyAssign中
String userIds=policemanService.searchUserByRoleId(orgId);
String userId=req.getUserId()+","+userIds;
order.setHistoryAssign(userId);
this.save(order);
}
Task currentTask = taskService.createTaskQuery().processInstanceId(substring).singleResult();
......@@ -310,6 +317,11 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
updateById(order);
} else {
//保存
//将创建人员添加（为的是将审核员创建的单子，审核员能看见）
//将该组织机构下的所有审核人员进行查询，并添加到historyAssign中
String userIds=policemanService.searchUserByRoleId(orgId);
String userId=req.getUserId()+","+userIds;
order.setHistoryAssign(userId);
this.save(order);
}
}
......@@ -485,12 +497,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
one = orderMainExist(req.getId());
if (ObjectUtil.isNotNull(req.getBussinessCode()) && ObjectUtil.isNotNull(one.getBussinessCode())) {
if (!one.getBussinessCode().equals(req.getBussinessCode())) {
if (req.getOrderType().equals("in")) {
orgId = req.getEndOrgId();
} else {
orgId = Long.parseLong(req.getStartOrgId());
}
//入参
BusForm one1 = setState1(req.getOrderType(),orgId, req.getBussinessCode());
a=busFormService.updateById(one1);
......@@ -504,13 +511,6 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
//入参不为空，库里为空
else if (ObjectUtil.isNotNull(req.getBussinessCode()) && ObjectUtil.isNull(one.getBussinessCode())){
//只需要改一条数据
if (req.getOrderType().equals("in")){
orgId=req.getEndOrgId();
}else {
orgId=Long.parseLong(req.getStartOrgId());
}
//入参
BusForm one1 = setState1(req.getOrderType(),orgId, req.getBussinessCode());
a=busFormService.updateById(one1);
......@@ -518,12 +518,6 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
//入参为空，库里不为空
else if (ObjectUtil.isNull(req.getBussinessCode()) && ObjectUtil.isNotNull(one.getBussinessCode())){
//只需要改一条数据
if (req.getOrderType().equals("in")){
orgId=req.getEndOrgId();
}else {
orgId=Long.parseLong(req.getStartOrgId());
}
//库存
BusForm one2 = setState2(orgId, one.getBussinessCode());
b=busFormService.updateById(one2);
......@@ -532,13 +526,6 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
}else {
if (ObjectUtil.isNotNull(req.getBussinessCode())){
//只需要更改一条单据
//只需要改一条数据
if (req.getOrderType().equals("in")){
orgId=req.getEndOrgId();
}else {
orgId=Long.parseLong(req.getStartOrgId());
}
//入参
BusForm one1 = setState1(req.getOrderType(),orgId, req.getBussinessCode());
a=busFormService.updateById(one1);
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
......@@ -1134,7 +1134,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
req.setPageNo(1L);
req.setPageSize(10L);
}
long size=policemanMapper.count(req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),req.getState(),req.getUserId(),req.getPhone(),req.getFlag(),req.getRoleCodeList());
long size=policemanMapper.count(req.getOrgId(),req.getAccount(),
req.getName(),req.getPoliceCode(),req.getState(),
req.getUserId(),req.getPhone(),req.getFlag(),req.getRoleCodeList());
List<PolicemanDto> policemanDtos = policemanMapper.selectUserBypoliceIds
(req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),
req.getState(),req.getUserId(),req.getPhone(),req.getFlag(),(req.getPageNo()-1)*req.getPageSize()
......@@ -2445,6 +2447,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
return true;
}
private Map<String,List<?>> addRoleAndOrg(List<UserDto> userDtos,PubOrg one,Boolean ywExists,Boolean shExists,Boolean glExists,SysUser sysUser,
List<SysUserOrg> sysUserOrgList,List<Long> userRoleList,
List<String> userAccountList,List<SysUserRole> sysUserRoleList){
......@@ -2517,4 +2520,11 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
return map;
}
//获取组织机构下所有的审核员的userId，用字符串拼接
@Override
public String searchUserByRoleId(Long orgId) {
return policemanMapper.searchUserByRoleId(orgId);
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/utils/BusinessUtil.java
......@@ -29,20 +29,7 @@ public class BusinessUtil {
if (num!=0){
//判断整数是什么，就在第几页进行补
if(pageNo-1==integer ){
for (int i = 0; i < 10-num; i++) {
try {
// 通过传递的 Class 对象创建泛型对象实例
T instance = clazz.newInstance();
collect1.add(instance);
} catch (InstantiationException | IllegalAccessException e) {
e.printStackTrace();
}
}
}
}else {
if (size>0 && integer!=1 ){
for (int i = 0; i < 10; i++) {
for (int i = 0; i < pageSize-num; i++) {
try {
// 通过传递的 Class 对象创建泛型对象实例
T instance = clazz.newInstance();
......@@ -53,6 +40,20 @@ public class BusinessUtil {
}
}
}
// else {
//
// if (size>0 && integer!=1 ){
// for (int i = 0; i < 10; i++) {
// try {
// // 通过传递的 Class 对象创建泛型对象实例
// T instance = clazz.newInstance();
// collect1.add(instance);
// } catch (InstantiationException | IllegalAccessException e) {
// e.printStackTrace();
// }
// }
// }
// }
return collect1;
}
......
jyzb-biz/src/main/resources/mapper/OrderMainMapper.xml
......@@ -84,7 +84,7 @@
<if test="req.endOrgId != null and req.endOrgId != ''">
and end_org_id = #{req.endOrgId}
</if>
and (start_org_user_id = #{userId} or end_org_user_id = #{userId} or history_assign like CONCAT('%', #{userId}, '%') )
and (start_org_user_id = #{userId} or end_org_user_id = #{userId} or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%'))
<if test="req.orderState !=null and req.orderState != ''">
and order_state = #{req.orderState}
</if>
......
jyzb-biz/src/main/resources/mapper/PolicemanMapper.xml
......@@ -302,7 +302,7 @@ WHERE o.org_id IN
</if>
GROUP BY a.user_id, a.account, a.org_id, a.nick_name
) as b
<if test="flag == 'true'">
<if test="flag == 'true' or flag == null">
where b.id is not null
</if>
<if test="column != null and column != '' and order != null and order != '' ">
......@@ -313,7 +313,7 @@ WHERE o.org_id IN
</select>
<select id="count" resultType="java.lang.Long">
select count(*) from(
select count(*) from (
select b.* FROM(
select a.*, GROUP_CONCAT(sr.role_name SEPARATOR ',') AS role_name FROM (
select
......@@ -327,8 +327,8 @@ WHERE o.org_id IN
left join base_policeman p on p.user_id=su.user_id and p.org_id_int=#{orgId}
GROUP BY su.user_id
) as a
JOIN sys_user_role sur on a.user_id=sur.user_id
join sys_role sr on sr.role_id=sur.role_id
left JOIN sys_user_role sur on a.user_id=sur.user_id
left join sys_role sr on sr.role_id=sur.role_id
<if test="roleCodeList != null and roleCodeList.size()>0">
and
<foreach collection="roleCodeList" item="item" open="(" separator="or" close=")">
......@@ -356,10 +356,10 @@ WHERE o.org_id IN
</if>
GROUP BY a.user_id, a.account, a.org_id, a.nick_name
) as b
<if test="flag == 'true'">
<if test="flag == 'true' or flag == null">
where b.id is not null
</if>
)as f
) as f
</select>
<select id="alignUserInfo" resultType="com.junmp.jyzb.api.bean.dto.FetchingDataDto.UserDto"
parameterType="com.junmp.jyzb.api.bean.query.PolicemanReq">
......@@ -406,6 +406,11 @@ WHERE o.org_id IN
join sys_role r on ur.role_id=r.role_id and r.role_id in ("1528003832557232130","1663372320355389441","1663372027127402498")
order by uo.org_id
</select>
<select id="searchUserByRoleId" resultType="java.lang.String">
select GROUP_CONCAT(a.user_id) as user_id FROM
(select user_id FROM sys_user_org suo where suo.org_id=#{orgId}) as a
join sys_user_role sur on a.user_id=sur.user_id and sur.role_id="1663372320355389441"
</select>
</mapper>
\ No newline at end of file
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java
......@@ -529,7 +529,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
//判断是否需要添加空数据
if(taskDTO.getIsCreateNullDate()==null || taskDTO.getIsCreateNullDate()){
Class<TaskVO> taskVO = TaskVO.class;
List<TaskVO> nullData = CreateNullData.createNullData(count, Long.valueOf(taskDTO.getPageNo()), taskVO);
List<TaskVO> nullData = CreateNullData.createNullData(count, Long.valueOf(taskDTO.getPageNo()),Long.valueOf(taskDTO.getPageSize()), taskVO);
taskVOS.addAll(nullData);
}
......@@ -651,7 +651,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
//判断是否需要添加空数据
if(taskDTO.getIsCreateNullDate()==null || taskDTO.getIsCreateNullDate()){
Class<TaskVO> taskVO = TaskVO.class;
List<TaskVO> nullData = CreateNullData.createNullData(count, Long.valueOf(taskDTO.getPageNo()), taskVO);
List<TaskVO> nullData = CreateNullData.createNullData(count, Long.valueOf(taskDTO.getPageNo()),Long.valueOf(taskDTO.getPageSize()), taskVO);
taskVOS.addAll(nullData);
}
......@@ -777,7 +777,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
//判断是否需要添加空数据
if(applyDTO.getIsCreateNullDate()==null || applyDTO.getIsCreateNullDate()){
Class<HistoryProcessInstanceVO> historyProcessInstanceVO = HistoryProcessInstanceVO.class;
List<HistoryProcessInstanceVO> nullData = CreateNullData.createNullData(count, Long.valueOf(applyDTO.getPageNo()), historyProcessInstanceVO);
List<HistoryProcessInstanceVO> nullData = CreateNullData.createNullData(count, Long.valueOf(applyDTO.getPageNo()), Long.valueOf(applyDTO.getPageSize()),historyProcessInstanceVO);
historyProcessInstanceVOS.addAll(nullData);
}
pageResult.setRecords(historyProcessInstanceVOS);
......
jyzb-process/src/main/java/com/junmp/junmpProcess/utils/CreateNullData.java
......@@ -5,17 +5,17 @@ import java.util.List;
public class CreateNullData {
public static <T> List<T> createNullData(Long size,Long pageNo,Class<T> clazz) {
public static <T> List<T> createNullData(Long size,Long pageNo,Long pageSize,Class<T> clazz) {
//余数
long num= size % 10;
long num= size % pageSize;
//整数
long integer=size / 10;
long integer=size / pageSize;
List<T> collect1=new ArrayList<>();
if (num!=0){
//判断整数是什么，就在第几页进行补
if(pageNo-1==integer){
for (int i = 0; i < 10-num; i++) {
for (int i = 0; i < pageSize-num; i++) {
try {
// 通过传递的 Class 对象创建泛型对象实例
T instance = clazz.newInstance();
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论