Skip to content

J
jyzb_platformV2
Commit 9968a455 by 李小惠
Options

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

# Conflicts:
#	app-log/error/log-error-2024-01-31.0.log
#	app-log/log_error.log
#	app-log/log_total.log
#	app-log/total/log-total-2024-01-31.0.log
parents 0ab25e79 853f7d82
正在显示 包含 881 行增加 和 766 行删除
.gitignore
...@@ -233,3 +233,7 @@ Thumbs.db ...@@ -233,3 +233,7 @@ Thumbs.db
/jyzb-boot/src/main/resources/application-local.yml /jyzb-boot/src/main/resources/application-local.yml
/jyzb-boot/src/main/resources/application-local.yml /jyzb-boot/src/main/resources/application-local.yml
/jyzb-biz/jyzb-biz.iml /jyzb-biz/jyzb-biz.iml
/app-log/error/log-error-2024-01-31.0.log.orig
/app-log/log_error.log.orig
/app-log/log_total.log.orig
/app-log/total/log-total-2024-01-31.0.log.orig
app-log/error/log-error-2024-01-31.0.log
...@@ -342,3 +342,109 @@ java.net.SocketException: Socket Closed ...@@ -342,3 +342,109 @@ java.net.SocketException: Socket Closed
at com.rabbitmq.client.impl.AMQConnection$MainLoop.run(AMQConnection.java:665) at com.rabbitmq.client.impl.AMQConnection$MainLoop.run(AMQConnection.java:665)
at java.lang.Thread.run(Thread.java:748) at java.lang.Thread.run(Thread.java:748)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:750)
at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:97)
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.controller.OrderController$$EnhancerBySpringCGLIB$$f7fd067f.Accounting(<generated>)
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.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:197)
at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:141)
at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:106)
at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:894)
at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:808)
at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)
at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1060)
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.sql.SQLSyntaxErrorException: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 4
at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:120)
at com.mysql.cj.jdbc.exceptions.SQLError.createSQLException(SQLError.java:97)
at com.mysql.cj.jdbc.exceptions.SQLExceptionsMapping.translateException(SQLExceptionsMapping.java:122)
at com.mysql.cj.jdbc.ClientPreparedStatement.executeInternal(ClientPreparedStatement.java:953)
at com.mysql.cj.jdbc.ClientPreparedStatement.execute(ClientPreparedStatement.java:370)
at com.zaxxer.hikari.pool.ProxyPreparedStatement.execute(ProxyPreparedStatement.java:44)
at com.zaxxer.hikari.pool.HikariProxyPreparedStatement.execute(HikariProxyPreparedStatement.java)
at org.apache.ibatis.executor.statement.PreparedStatementHandler.query(PreparedStatementHandler.java:64)
at org.apache.ibatis.executor.statement.RoutingStatementHandler.query(RoutingStatementHandler.java:79)
at sun.reflect.GeneratedMethodAccessor215.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.apache.ibatis.plugin.Plugin.invoke(Plugin.java:64)
at com.sun.proxy.$Proxy338.query(Unknown Source)
at org.apache.ibatis.executor.SimpleExecutor.doQuery(SimpleExecutor.java:63)
at org.apache.ibatis.executor.BaseExecutor.queryFromDatabase(BaseExecutor.java:325)
at org.apache.ibatis.executor.BaseExecutor.query(BaseExecutor.java:156)
at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:109)
at com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor.intercept(MybatisPlusInterceptor.java:81)
at org.apache.ibatis.plugin.Plugin.invoke(Plugin.java:62)
at com.sun.proxy.$Proxy337.query(Unknown Source)
at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:151)
at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:145)
at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:140)
at sun.reflect.GeneratedMethodAccessor214.invoke(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.mybatis.spring.SqlSessionTemplate$SqlSessionInterceptor.invoke(SqlSessionTemplate.java:427)
... 102 common frames omitted
2024-01-31 15:05:49.295 ERROR 2328 --- [http-nio-10030-exec-5] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败，请检查header和param中是否传递了用户token
2024-01-31 15:12:26.405 ERROR 2328 --- [http-nio-10030-exec-6] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败，请检查header和param中是否传递了用户token
2024-01-31 15:35:31.161 ERROR 12188 --- [main] easy-es : Easy-Es supported elasticsearch and restHighLevelClient jar version is:7.14.0 ,Please resolve the dependency conflict!
2024-01-31 15:36:00.124 ERROR 12188 --- [http-nio-10030-exec-1] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败，请检查header和param中是否传递了用户token
2024-01-31 15:39:20.063 ERROR 10176 --- [main] easy-es : Easy-Es supported elasticsearch and restHighLevelClient jar version is:7.14.0 ,Please resolve the dependency conflict!
2024-01-31 15:39:36.528 ERROR 10176 --- [http-nio-10030-exec-1] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败，请检查header和param中是否传递了用户token
2024-01-31 15:51:13.999 ERROR 10176 --- [http-nio-10030-exec-2] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败，请检查header和param中是否传递了用户token
2024-01-31 15:55:05.019 ERROR 10176 --- [http-nio-10030-exec-9] c.j.j.b.c.handle.GlobalExceptionHandler : >授权异常>>获取token失败，请检查header和param中是否传递了用户token
2024-01-31 15:55:45.483 ERROR 10176 --- [http-nio-10030-exec-10] com.junmp.v2.log.aop.ApiLogRecordAop : com.junmp.junmpProcess.controller.BpmnController.getProcessDefinitionId(java.util.LinkedHashMap)
app-log/error/log-error-2024-02-01.0.log 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/error/log-error-2024-02-02.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-01-31.0.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-01.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-02.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/SizeAndTypeDto.java deleted 100644 → 0
package com.junmp.jyzb.api.bean.dto;
import com.junmp.jyzb.api.bean.dto.FetchingDataDto.SizeDto;
import com.junmp.jyzb.api.bean.dto.FetchingDataDto.TypeDto;
import lombok.Data;
import java.util.List;
@Data
public class SizeAndTypeDto {
private List<SizeDto> sizeList;
private List<TypeDto> typeList;
private List<OrgDto> orgList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/ApplicationReq.java
...@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Param; ...@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Param;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
...@@ -19,13 +20,13 @@ public class ApplicationReq extends BaseRequest { ...@@ -19,13 +20,13 @@ public class ApplicationReq extends BaseRequest {
/** /**
* 应用id * 应用id
*/ */
@NotBlank(message = "应用id不能为空",groups = {detail.class})
private String id; private String id;
/** /**
* 应用代码 * 应用代码
*/ */
@TableField("app_code") @TableField("app_code")
@NotBlank(message = "应用代码不能为空",groups = {detail.class})
private String appCode; private String appCode;
/** /**
...@@ -74,4 +75,7 @@ public class ApplicationReq extends BaseRequest { ...@@ -74,4 +75,7 @@ public class ApplicationReq extends BaseRequest {
* 更新人员 * 更新人员
*/ */
private String updateUser; private String updateUser;
//删除的id列表
private List<String> idsList;
} }
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryOrderLogReq.java
...@@ -76,4 +76,8 @@ public class QueryOrderLogReq extends BaseRequest { ...@@ -76,4 +76,8 @@ public class QueryOrderLogReq extends BaseRequest {
private Date startTime; private Date startTime;
private Date endTime; private Date endTime;
private Date createTime;
private String processType;
} }
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/CabinetPolicemanReq.java
...@@ -38,6 +38,8 @@ public class CabinetPolicemanReq extends BaseRequest { ...@@ -38,6 +38,8 @@ public class CabinetPolicemanReq extends BaseRequest {
*/ */
private String finger; private String finger;
private String password;
private List<Long> RolesList; private List<Long> RolesList;
} }
\ No newline at end of file
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/PoliceListReq.java
...@@ -19,6 +19,8 @@ public class PoliceListReq { ...@@ -19,6 +19,8 @@ public class PoliceListReq {
private String name; private String name;
private String finger; private String finger;
private String password;
// /** // /**
// * 角色id列表 // * 角色id列表
// */ // */
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateBusFormReq.java
...@@ -15,7 +15,7 @@ public class UpdateBusFormReq extends BaseRequest { ...@@ -15,7 +15,7 @@ public class UpdateBusFormReq extends BaseRequest {
/** /**
* id * id
*/ */
@NotBlank(message = "单据id不能为空",groups = {edit.class})
private String id; private String id;
// private String userId; // private String userId;
...@@ -32,7 +32,7 @@ public class UpdateBusFormReq extends BaseRequest { ...@@ -32,7 +32,7 @@ public class UpdateBusFormReq extends BaseRequest {
/** /**
* 单据业务类型 * 单据业务类型
*/ */
@NotBlank(message = "业务单据类型不能为空",groups = {add.class,edit.class})
private String bussinessType; private String bussinessType;
/** /**
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/ApplicationController.java
...@@ -52,10 +52,16 @@ public class ApplicationController { ...@@ -52,10 +52,16 @@ public class ApplicationController {
//新增或者修改应用信息 //新增或者修改应用信息
@PostMapping(path="/AddOrUpdateCfg",name="新增应用信息#logType=30") @PostMapping(path="/AddOrUpdateCfg",name="新增应用信息#logType=30")
@ApiOperation("新增应用信息") @ApiOperation("新增或修改应用信息")
public ApiRes<String> AddOrUpdateCfg(@RequestBody @Validated(ValidationApi.add.class) ApplicationReq req){ public ApiRes<String> AddOrUpdateCfg(@RequestBody @Validated(ValidationApi.add.class) ApplicationReq req){
return ApiRes.success(applicationService.AddOrUpdateCfg(req)); return ApiRes.success(applicationService.AddOrUpdateCfg(req));
} }
@PostMapping(path = "/delConfig",name = "删除应用信息#logType=30")
@ApiOperation("删除一个或者多个应用信息")
public ApiRes<Boolean> delConfig(@RequestBody ApplicationReq req){
return ApiRes.success(applicationService.delConfig(req));
}
} }
jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessController.java
...@@ -32,10 +32,10 @@ public class BussinessController { ...@@ -32,10 +32,10 @@ public class BussinessController {
public BusFormService busFormService; public BusFormService busFormService;
//创建业务单 //创建或者修改业务单
@PostMapping(path="/AddBussinessOrder",name="创建业务单#logType=30") @PostMapping(path="/AddBussinessOrder",name="创建或者修改业务单#logType=30")
@ApiOperation("创建业务单") @ApiOperation("创建或者修改业务单")
public ApiRes<String> AddBussinessOrder(@RequestBody @Validated(ValidationApi.add.class) UpdateBusFormReq req){ public ApiRes<String> AddBussinessOrder(@RequestBody UpdateBusFormReq req){
return ApiRes.success(busFormService.AddBussinessOrder(req)); return ApiRes.success(busFormService.AddBussinessOrder(req));
} }
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/EquipmentTypeController.java
...@@ -92,12 +92,12 @@ public class EquipmentTypeController { ...@@ -92,12 +92,12 @@ public class EquipmentTypeController {
@PostMapping(path="/SetTypeParentIds",name="填充装备类型的parent_ids字段#logType=30") // @PostMapping(path="/SetTypeParentIds",name="填充装备类型的parent_ids字段#logType=30")
@ApiOperation("填充装备类型的parent_ids字段") // @ApiOperation("填充装备类型的parent_ids字段")
public ResponseResult setTypeParentIds() { // public ResponseResult setTypeParentIds() {
ResponseResult returnMsg = equipmentTypeService.setTypeParentIds(); // ResponseResult returnMsg = equipmentTypeService.setTypeParentIds();
return returnMsg; // return returnMsg;
} // }
//返回整棵物资树 //返回整棵物资树
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java
...@@ -110,5 +110,11 @@ public class PublicController { ...@@ -110,5 +110,11 @@ public class PublicController {
return ApiRes.success(publicService.addDictType(req)); return ApiRes.success(publicService.addDictType(req));
} }
// @PostMapping("/aaa")
// public ApiRes<String> aaa(PolicemanReq req){
//
// return String;
// }
} }
jyzb-biz/src/main/java/com/junmp/jyzb/controller/TjController.java
...@@ -64,12 +64,6 @@ public class TjController { ...@@ -64,12 +64,6 @@ public class TjController {
public ApiRes<List<TjOrgEqsDto>> TjOrgEqsDetail(@RequestBody TjOrgEqsReq req){ public ApiRes<List<TjOrgEqsDto>> TjOrgEqsDetail(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.GetTjDataDetail(req)); return ApiRes.success(tjService.GetTjDataDetail(req));
} }
//装备统计报表（点击+后里面的数据）
@PostMapping("/TjOrgEqsDetailPage")
@ApiOperation("/查询组织机构下的装备统计明细分页")
public ApiRes<PageResult<InventorySumDto>> TjOrgEqsDetailPage(@RequestBody TjOrgEqsReq req){
return ApiRes.success(tjService.TjOrgEqsDetailPage(req));
}
@PostMapping("/TjOrgEqsDetailList") @PostMapping("/TjOrgEqsDetailList")
@ApiOperation("/查询组织机构下的装备统计明细列表") @ApiOperation("/查询组织机构下的装备统计明细列表")
public ApiRes<List<InventorySumDto>> TjOrgEqsDetailList(@RequestBody TjOrgEqsReq req){ public ApiRes<List<InventorySumDto>> TjOrgEqsDetailList(@RequestBody TjOrgEqsReq req){
...@@ -101,23 +95,25 @@ public class TjController { ...@@ -101,23 +95,25 @@ public class TjController {
} }
@PostMapping("/TjOrgPriceDetail") @PostMapping("/TjOrgPriceDetail")
@ApiOperation("/查询组织机构下的财务统计明细(改)") @ApiOperation("/查询组织机构下的财务统计明细")
public ApiRes<List<TjOrgPriceDto>> TjOrgPriceDetail(@RequestBody TjOrgPriceReq req){ public ApiRes<List<TjOrgPriceDto>> TjOrgPriceDetail(@RequestBody TjOrgPriceReq req){
return ApiRes.success(tjService.TjOrgPriceDetail(req)); return ApiRes.success(tjService.TjOrgPriceDetail(req));
} }
//财务统计报表（点击+后里面的数据） @PostMapping("/TjOrgPriceDetail1")
@PostMapping("/TjOrgPriceDetailPage") @ApiOperation("/查询组织机构下的财务统计明细二层结构(改)")
@ApiOperation("/查询组织机构下的财务统计明细") public ApiRes<List<TjOrgPriceDto>> TjOrgPriceDetail1(@RequestBody TjOrgPriceReq req){
public ApiRes<PageResult<TjOrgPriceDto>> TjOrgPriceDetailPage(@RequestBody TjOrgPriceReq req){ return ApiRes.success(tjService.TjOrgPriceDetail1(req));
return ApiRes.success(tjService.TjOrgPriceDetailPage(req));
} }
@PostMapping("/TjOrgPriceDetailList") @PostMapping("/TjOrgPriceDetailList")
@ApiOperation("/查询组织机构下的财务统计明细") @ApiOperation("/查询组织机构下的财务统计明细(改)")
public ApiRes<List<TjOrgPriceDto>> TjOrgPriceDetailList(@RequestBody TjOrgPriceReq req){ public ApiRes<List<TjOrgPriceDto>> TjOrgPriceDetailList(@RequestBody TjOrgPriceReq req){
return ApiRes.success(tjService.TjOrgPriceDetailList(req)); return ApiRes.success(tjService.TjOrgPriceDetailList(req));
} }
@PostMapping(path="/TjOrgPriceExport",name="财务报表导出#logType=30") @PostMapping(path="/TjOrgPriceExport",name="财务报表导出#logType=30")
@ApiOperation("财务报表导出") @ApiOperation("财务报表导出")
public void TjOrgPriceExport(@RequestBody TjOrgPriceReq req){ public void TjOrgPriceExport(@RequestBody TjOrgPriceReq req){
...@@ -145,26 +141,19 @@ public class TjController { ...@@ -145,26 +141,19 @@ public class TjController {
public ApiRes<List<TjOrgCountDto>> TjOrgPriceDetail(@RequestBody TjOrgCountReq req){ public ApiRes<List<TjOrgCountDto>> TjOrgPriceDetail(@RequestBody TjOrgCountReq req){
return ApiRes.success(tjService.TjOrgCountDetail(req)); return ApiRes.success(tjService.TjOrgCountDetail(req));
} }
@PostMapping("/TjOrgCountDetail1")
//财务统计报表（点击+后里面的数据）
@PostMapping("/TjOrgCountDetailPage")
@ApiOperation("/查询组织机构下的使用统计明细") @ApiOperation("/查询组织机构下的使用统计明细")
public ApiRes<PageResult<TjOrgCountDto>> TjOrgPriceDetailPage(@RequestBody TjOrgCountReq req){ public ApiRes<List<TjOrgCountDto>> TjOrgPriceDetail1(@RequestBody TjOrgCountReq req){
return ApiRes.success(tjService.TjOrgCountDetailPage(req)); return ApiRes.success(tjService.TjOrgCountDetail1(req));
} }
@PostMapping("/TjOrgCountDetailList") @PostMapping("/TjOrgCountDetailList")
@ApiOperation("/查询组织机构下的使用统计明细") @ApiOperation("/查询组织机构下的使用统计明细")
public ApiRes<List<TjOrgCountDto>> TjOrgCountDetailList(@RequestBody TjOrgCountReq req){ public ApiRes<List<TjOrgCountDto>> TjOrgCountDetailList(@RequestBody TjOrgCountReq req){
return ApiRes.success(tjService.TjOrgCountDetailList(req)); return ApiRes.success(tjService.TjOrgCountDetailList(req));
} }
//更新使用次数统计报表
@PostMapping("updateTjOrgCount")
@ApiOperation("更新使用次数统计报表")
public ApiRes<Boolean> updateTjOrgCount(@RequestBody TjOrgCountReq req){
return ApiRes.success(tjService.updateTjOrgCount(req));
}
//首页使用柱状图 //首页使用柱状图
@PostMapping("/TjOrgCountByType") @PostMapping("/TjOrgCountByType")
@ApiOperation("九大类使用统计柱状图") @ApiOperation("九大类使用统计柱状图")
...@@ -199,12 +188,6 @@ public class TjController { ...@@ -199,12 +188,6 @@ public class TjController {
return ApiRes.success(tjService.TjOrgPoliceSum(req)); return ApiRes.success(tjService.TjOrgPoliceSum(req));
} }
//人员统计报表（点击+后里面的数据）
// @PostMapping("/TjOrgPoliceDetailPage")
// @ApiOperation("/查询组织机构下的人员统计明细")
// public ApiRes<PageResult<TjOrgPoliceDto>> TjOrgPoliceDetailPage(@RequestBody TjOrgPoliceReq req){
// return ApiRes.success(tjService.TjOrgPoliceDetailPage(req));
// }
@PostMapping("/TjOrgPoliceDetailList") @PostMapping("/TjOrgPoliceDetailList")
@ApiOperation("/查询组织机构下的人员统计明细") @ApiOperation("/查询组织机构下的人员统计明细")
public ApiRes<List<TjOrgPoliceDto>> TjOrgPoliceDetailList(@RequestBody TjOrgPoliceReq req){ public ApiRes<List<TjOrgPoliceDto>> TjOrgPoliceDetailList(@RequestBody TjOrgPoliceReq req){
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/BussinessInventory.java
...@@ -183,7 +183,7 @@ public class BussinessInventory implements Serializable { ...@@ -183,7 +183,7 @@ public class BussinessInventory implements Serializable {
private List<BussinessDetail> detailList; private List<BussinessDetail> detailList;
@TableField(value = "api", exist = false) @TableField(value = "api", exist = false)
private String API; private String api;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/SizeAndType.java
...@@ -8,4 +8,5 @@ import java.util.List; ...@@ -8,4 +8,5 @@ import java.util.List;
public class SizeAndType { public class SizeAndType {
private List<EquipmentType> typeList; private List<EquipmentType> typeList;
private List<EquipmentSize> sizeList; private List<EquipmentSize> sizeList;
private List<PubOrg> orgList;
} }
jyzb-biz/src/main/java/com/junmp/jyzb/listener/GlobalEndListener.java
...@@ -185,7 +185,7 @@ import static com.junmp.junmpProcess.common.CommonConstants.*; ...@@ -185,7 +185,7 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
BussinessInventory BI = bussinessInventoryService.getOne(new LambdaQueryWrapper<BussinessInventory>() BussinessInventory BI = bussinessInventoryService.getOne(new LambdaQueryWrapper<BussinessInventory>()
.eq(BussinessInventory::getProcessId, processInstanceId)); .eq(BussinessInventory::getProcessId, processInstanceId));
BI.setExamineState("finished"); BI.setExamineState("finished");
BI.setAPI("BussinessInventory"); BI.setApi("BussinessInventory");
bussinessInventoryService.updateById(BI); bussinessInventoryService.updateById(BI);
MQ.SendMsg(exchangeName,BI.getOrgId().toString(),BI); MQ.SendMsg(exchangeName,BI.getOrgId().toString(),BI);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentCountSummaryMapper.java
...@@ -17,7 +17,7 @@ import java.util.List; ...@@ -17,7 +17,7 @@ import java.util.List;
*/ */
public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSummary> { public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSummary> {
void addInfo(@Param("sql") String sql);
TjOrgCountDto TjOrgCount(@Param("orgId") String orgId, TjOrgCountDto TjOrgCount(@Param("orgId") String orgId,
@Param("typeIdsList") List<String> typeIdsList, @Param("typeIdsList") List<String> typeIdsList,
...@@ -25,12 +25,12 @@ public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSu ...@@ -25,12 +25,12 @@ public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSu
@Param("year")Integer year, @Param("year")Integer year,
@Param("typeParentId")String typeParentId, @Param("typeParentId")String typeParentId,
@Param("monthList") List<Integer> monthList); @Param("monthList") List<Integer> monthList);
List<TjOrgCountDto> TjOrgCount1(@Param("orgId") String orgId, // List<TjOrgCountDto> TjOrgCount1(@Param("orgId") String orgId,
@Param("typeIdsList") List<String> typeIdsList, // @Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList, // @Param("sizeNameList") List<String> sizeNameList,
@Param("year")Integer year, // @Param("year")Integer year,
@Param("typeParentId")String typeParentId, // @Param("typeParentId")String typeParentId,
@Param("monthList") List<Integer> monthList); // @Param("monthList") List<Integer> monthList);
TjOrgCountDto TjOrgCountleve4(@Param("orgId") Long orgId, TjOrgCountDto TjOrgCountleve4(@Param("orgId") Long orgId,
@Param("typeIdsList") List<String> typeIdsList, @Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList, @Param("sizeNameList") List<String> sizeNameList,
...@@ -53,26 +53,35 @@ public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSu ...@@ -53,26 +53,35 @@ public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSu
@Param("typeParentId")String typeParentId, @Param("typeParentId")String typeParentId,
@Param("monthList") List<Integer> monthList, @Param("monthList") List<Integer> monthList,
@Param("levelNum")Integer levelNum, @Param("levelNum")Integer levelNum,
@Param("level")Integer level,@Param("column")String column,@Param("order")String order); @Param("level")Integer level,
@Param("column")String column,
@Param("order")String order);
List<TjOrgCountDto> TjOrgCountTotalDetail(@Param("orgId") Long orgId,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("year") Integer year,
@Param("typeParentId")String typeParentId,
@Param("monthList") List<Integer> monthList,
@Param("levelNum")Integer levelNum,
@Param("level")Integer level,
@Param("column")String column,
@Param("order")String order);
List<TjOrgCountDto> TjOrgCountDetail(@Param("orgId") Long orgId,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("year") Integer year,
@Param("typeParentId")String typeParentId,
@Param("monthList") List<Integer> monthList,
@Param("levelNum")Integer levelNum,
@Param("level")Integer level,
@Param("column")String column,
@Param("order")String order);
FinalTjOrgCountDto TjOrgCountSum(@Param("orgId") Long orgId, FinalTjOrgCountDto TjOrgCountSum(@Param("orgId") Long orgId,
@Param("sizeNameList") List<String> sizeNameList, @Param("sizeNameList") List<String> sizeNameList,
@Param("typeIdsList") List<String> typeIdsList, @Param("typeIdsList") List<String> typeIdsList,
@Param("year")Integer year); @Param("year")Integer year);
int TjOrgCountDetailSum(@Param("orgId")Long orgId,
@Param("year") Integer year,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList);
List<TjOrgCountDto> TjOrgCountDetail(@Param("orgId")Long orgId,
@Param("year") Integer year,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize);
void deleteAll(@Param("orgId") Long orgId);
List<TjOrgCountDto> TjOrgCountByType(@Param("req") TjOrgCountReq req); List<TjOrgCountDto> TjOrgCountByType(@Param("req") TjOrgCountReq req);
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentTypeMapper.java
...@@ -18,7 +18,7 @@ public interface EquipmentTypeMapper extends BaseMapper<EquipmentType> { ...@@ -18,7 +18,7 @@ public interface EquipmentTypeMapper extends BaseMapper<EquipmentType> {
void setTypeParentIds(); void setTypeParentIds(@Param("typeId")String typeId);
List<String> selectByItems(@Param("list1") List<String> list1, List<String> selectByItems(@Param("list1") List<String> list1,
@Param("list2") List<String> list2, @Param("list2") List<String> list2,
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventorySummaryMapper.java
...@@ -70,12 +70,9 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> { ...@@ -70,12 +70,9 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> {
//获取合计 //获取合计
FinalTjOrgEqsDto getSumByViewOrgeqsSum(); FinalTjOrgEqsDto getSumByViewOrgeqsSum();
int TjOrgEqsDetailSum(@Param("orgId") Long orgId,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList);
List<InventorySumDto> TjOrgEqsDetail(@Param("orgId") Long orgId, @Param("typeIdsList") List<String> typeIdsList, List<InventorySumDto> TjOrgEqsDetail(@Param("orgId") Long orgId, @Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList, @Param("sizeNameList") List<String> sizeNameList,
@Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize); @Param("column")String column, @Param("order") String order);
List<InventorySumDto> selectTotalNum(@Param("orgId") Long orgId,@Param("list") List<Object[]> searchCriteria ); List<InventorySumDto> selectTotalNum(@Param("orgId") Long orgId,@Param("list") List<Object[]> searchCriteria );
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PriceSumSummaryMapper.java
...@@ -20,20 +20,14 @@ public interface PriceSumSummaryMapper extends BaseMapper<PriceSumSummary> { ...@@ -20,20 +20,14 @@ public interface PriceSumSummaryMapper extends BaseMapper<PriceSumSummary> {
@Param("typeIdsList") List<String> typeIdsList, @Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList")List<String> sizeNameList); @Param("sizeNameList")List<String> sizeNameList);
List<TjOrgPriceDto> TjOrgPriceDetail(@Param("orgId") Long orgId,
@Param("year") Integer year,
@Param("typeIdsList")List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize);
int TjOrgPriceDetailSum(@Param("orgId") Long orgId,
@Param("year") Integer year,
@Param("typeIdsList")List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList);
// FinalTjOrgPriceDto TjOrgPriceSum(@Param("orgId") Long orgId,@Param("year") Integer year, List<TjOrgPriceDto> TjOrgPriceDetail(@Param("orgId") Long orgId,
// @Param("typeIdsList") List<String> typeIdsList, @Param("year") Integer year,
// @Param("sizeNameList") List<String> sizeNameList); @Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("column") String column,
@Param("order") String order);
void setSizeName(@Param("sizeId") String id, @Param("sizeName") String name); void setSizeName(@Param("sizeId") String id, @Param("sizeName") String name);
...@@ -44,11 +38,7 @@ public interface PriceSumSummaryMapper extends BaseMapper<PriceSumSummary> { ...@@ -44,11 +38,7 @@ public interface PriceSumSummaryMapper extends BaseMapper<PriceSumSummary> {
@Param("typeIdsList") List<String> typeIdsList, @Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList")List<String> sizeNameList, @Param("sizeNameList")List<String> sizeNameList,
@Param("levelFlag")Integer levelFlag); @Param("levelFlag")Integer levelFlag);
// TjOrgPriceDto TjOrgPriceLeve4(@Param("orgId") Long orgId,
// @Param("year") Integer year,
// @Param("typeIdsList") List<String> typeIdsList,
// @Param("sizeNameList")List<String> sizeNameList,
// @Param("levelFlag")Integer levelFlag);
TjOrgPriceDto TjOrgPriceBySelf(@Param("orgId") Long orgId, TjOrgPriceDto TjOrgPriceBySelf(@Param("orgId") Long orgId,
...@@ -61,10 +51,14 @@ public interface PriceSumSummaryMapper extends BaseMapper<PriceSumSummary> { ...@@ -61,10 +51,14 @@ public interface PriceSumSummaryMapper extends BaseMapper<PriceSumSummary> {
@Param("sizeNameList")List<String> sizeNameList, @Param("sizeNameList")List<String> sizeNameList,
@Param("levelNum")Integer levelNum, @Param("levelNum")Integer levelNum,
@Param("level")Integer level); @Param("level")Integer level);
// List<TjOrgPriceDto> TjOrgPriceTotalNum(@Param("orgId") Long orgId,
// @Param("year") Integer year, List<TjOrgPriceDto> getTotalPriceDetail(@Param("orgId") Long orgId,
// @Param("typeIdsList") List<String> typeIdsList, @Param("year") Integer year,
// @Param("sizeNameList")List<String> sizeNameList, @Param("typeIdsList") List<String> typeIdsList,
// @Param("levelNum")Integer levelNum); @Param("sizeNameList") List<String> sizeNameList,
@Param("levelNum") Integer levelNum,
@Param("level") Integer level,
@Param("column") String column,
@Param("order") String order);
} }
jyzb-biz/src/main/java/com/junmp/jyzb/service/ApplicationService.java
...@@ -16,11 +16,15 @@ public interface ApplicationService extends IService<Application> { ...@@ -16,11 +16,15 @@ public interface ApplicationService extends IService<Application> {
//获取分页应用信息 //获取分页应用信息
PageResult<Application> GetAllUpdateCfg(ApplicationReq req); PageResult<Application> GetAllUpdateCfg(ApplicationReq req);
//获取应用信息的列表
List<Application> GetAllUpdateCfgList(ApplicationReq req); List<Application> GetAllUpdateCfgList(ApplicationReq req);
//获取应用信息一个
Application GetOne(ApplicationReq req); Application GetOne(ApplicationReq req);
//新增应用信息 ////新增或者修改应用信息
String AddOrUpdateCfg(ApplicationReq req); String AddOrUpdateCfg(ApplicationReq req);
//删除一个或者多个应用信息
Boolean delConfig(ApplicationReq req);
} }
jyzb-biz/src/main/java/com/junmp/jyzb/service/EquipmentTypeService.java
...@@ -25,7 +25,7 @@ public interface EquipmentTypeService extends IService<EquipmentType> { ...@@ -25,7 +25,7 @@ public interface EquipmentTypeService extends IService<EquipmentType> {
List<EquipmentTypeDto> getEquipmentList(QueryEquipmentTypeReq req); List<EquipmentTypeDto> getEquipmentList(QueryEquipmentTypeReq req);
EquipmentTypeDto getEquipment(QueryEquipmentTypeReq req ); EquipmentTypeDto getEquipment(QueryEquipmentTypeReq req );
List<EquipmentTypeDto> getLowType(QueryEquipmentTypeReq orgId); List<EquipmentTypeDto> getLowType(QueryEquipmentTypeReq orgId);
ResponseResult setTypeParentIds(); // ResponseResult setTypeParentIds();
ESTypeDto getTypeTreeByEs(QueryEquipmentTypeReq req) throws IOException; ESTypeDto getTypeTreeByEs(QueryEquipmentTypeReq req) throws IOException;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/TjService.java
...@@ -20,16 +20,17 @@ public interface TjService { ...@@ -20,16 +20,17 @@ public interface TjService {
//装备统计报表 //装备统计报表
PageResult<TjOrgEqsDto> GetTjData(TjOrgEqsReq req); PageResult<TjOrgEqsDto> GetTjData(TjOrgEqsReq req);
PageResult<InventorySumDto> TjOrgEqsDetailPage(TjOrgEqsReq req);
List<InventorySumDto> TjOrgEqsDetailList(TjOrgEqsReq req); List<InventorySumDto> TjOrgEqsDetailList(TjOrgEqsReq req);
//财务统计报表 //财务统计报表
PageResult<TjOrgPriceDto> TjOrgPrice(TjOrgPriceReq req); PageResult<TjOrgPriceDto> TjOrgPrice(TjOrgPriceReq req);
PageResult<TjOrgPriceDto> TjOrgPriceDetailPage(TjOrgPriceReq req);
List<TjOrgPriceDto> TjOrgPriceDetailList(TjOrgPriceReq req); List<TjOrgPriceDto> TjOrgPriceDetailList(TjOrgPriceReq req);
FinalTjOrgPriceDto TjOrgPriceSum(TjOrgPriceReq req); FinalTjOrgPriceDto TjOrgPriceSum(TjOrgPriceReq req);
List<TjOrgPriceDto> TjOrgPriceDetail(TjOrgPriceReq req); List<TjOrgPriceDto> TjOrgPriceDetail(TjOrgPriceReq req);
List<TjOrgPriceDto> TjOrgPriceDetail1(TjOrgPriceReq req);
PageResult<TjOrgCountDto> TjOrgCount(TjOrgCountReq req); PageResult<TjOrgCountDto> TjOrgCount(TjOrgCountReq req);
...@@ -37,11 +38,9 @@ public interface TjService { ...@@ -37,11 +38,9 @@ public interface TjService {
List<TjOrgCountDto> TjOrgCountDetail(TjOrgCountReq req); List<TjOrgCountDto> TjOrgCountDetail(TjOrgCountReq req);
PageResult<TjOrgCountDto> TjOrgCountDetailPage(TjOrgCountReq req); List<TjOrgCountDto> TjOrgCountDetail1(TjOrgCountReq req);
List<TjOrgCountDto> TjOrgCountDetailList(TjOrgCountReq req); List<TjOrgCountDto> TjOrgCountDetailList(TjOrgCountReq req);
boolean updateTjOrgCount(TjOrgCountReq req);
List<TjOrgCountDto> TjOrgCountByType(TjOrgCountReq req); List<TjOrgCountDto> TjOrgCountByType(TjOrgCountReq req);
...@@ -71,4 +70,5 @@ public interface TjService { ...@@ -71,4 +70,5 @@ public interface TjService {
void TjOrgPoliceExport(TjOrgPoliceReq req); void TjOrgPoliceExport(TjOrgPoliceReq req);
} }
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/ApplicationServiceImpl.java
...@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -6,7 +6,9 @@ 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.query.ApplicationReq; import com.junmp.jyzb.api.bean.query.ApplicationReq;
import com.junmp.jyzb.api.exception.JYZBAppException;
import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum; import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
import com.junmp.jyzb.api.exception.enums.EquipmentExceptionEnum;
import com.junmp.jyzb.api.exception.enums.PublicExceptionEnum; import com.junmp.jyzb.api.exception.enums.PublicExceptionEnum;
import com.junmp.jyzb.entity.Application; import com.junmp.jyzb.entity.Application;
import com.junmp.jyzb.service.ApplicationService; import com.junmp.jyzb.service.ApplicationService;
...@@ -18,7 +20,9 @@ import com.junmp.v2.db.api.factory.PageFactory; ...@@ -18,7 +20,9 @@ import com.junmp.v2.db.api.factory.PageFactory;
import com.junmp.v2.db.api.factory.PageResultFactory; import com.junmp.v2.db.api.factory.PageResultFactory;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -38,18 +42,21 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli ...@@ -38,18 +42,21 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
return PageResultFactory.createPageResult(page); return PageResultFactory.createPageResult(page);
} }
//获取应用信息的列表
public List<Application> GetAllUpdateCfgList(ApplicationReq req) { public List<Application> GetAllUpdateCfgList(ApplicationReq req) {
LambdaQueryWrapper<Application> wrapper = createWrapper(req); LambdaQueryWrapper<Application> wrapper = createWrapper(req);
list(wrapper); list(wrapper);
return list(wrapper); return list(wrapper);
} }
//获取应用信息一个
public Application GetOne(ApplicationReq req) { public Application GetOne(ApplicationReq req) {
LambdaQueryWrapper<Application> wrapper = createWrapper(req); LambdaQueryWrapper<Application> wrapper = createWrapper(req);
Application one = getOne(wrapper); Application one = getOne(wrapper);
return ObjectUtil.isNull(one)?new Application():one; return ObjectUtil.isNull(one)?new Application():one;
} }
//新增应用信息 //新增或者修改应用信息
@Override @Override
public String AddOrUpdateCfg(ApplicationReq req) { public String AddOrUpdateCfg(ApplicationReq req) {
Application application = new Application(); Application application = new Application();
...@@ -93,6 +100,38 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli ...@@ -93,6 +100,38 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
} }
//删除一个或者多个应用信息
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean delConfig(ApplicationReq req) {
if (CollectionUtil.isEmpty(req.getIdsList())){
throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
}
List<Application> list = list(new LambdaQueryWrapper<Application>().eq(Application::getId, req.getIdsList()));
List<String> nonexistentApp = new ArrayList<>();
for (String appId:req.getIdsList()) {
boolean flag=false;
for (Application app:list) {
if (appId.equals(app.getId())){
flag=true;
break;
}
}
if (!flag){
nonexistentApp.add(appId);
}
}
if (CollectionUtil.isNotEmpty(nonexistentApp)){
String msg="以下应用不存在：" +String.join(",", nonexistentApp);
throw new JYZBAppException(PublicExceptionEnum.APP_IS_NOT_EXIST, msg);
}else {
return removeBatchByIds(req.getIdsList());
}
}
private LambdaQueryWrapper<Application> createWrapper(ApplicationReq req) { private LambdaQueryWrapper<Application> createWrapper(ApplicationReq req) {
LambdaQueryWrapper<Application> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Application> wrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isEmpty(req)) { if (ObjectUtil.isEmpty(req)) {
...@@ -100,6 +139,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli ...@@ -100,6 +139,7 @@ public class ApplicationServiceImpl extends ServiceImpl<ApplicationMapper, Appli
} }
wrapper.like(ObjectUtil.isNotEmpty(req.getName()),Application::getName,req.getName()); wrapper.like(ObjectUtil.isNotEmpty(req.getName()),Application::getName,req.getName());
wrapper.eq(ObjectUtil.isNotEmpty(req.getType()),Application::getType,req.getType()); wrapper.eq(ObjectUtil.isNotEmpty(req.getType()),Application::getType,req.getType());
wrapper.eq(ObjectUtil.isNotEmpty(req.getId()),Application::getId,req.getId());
wrapper.eq(ObjectUtil.isNotEmpty(req.getAppCode()),Application::getAppCode,req.getAppCode()); wrapper.eq(ObjectUtil.isNotEmpty(req.getAppCode()),Application::getAppCode,req.getAppCode());
wrapper.orderByDesc(Application::getCreateTime); wrapper.orderByDesc(Application::getCreateTime);
return wrapper; return wrapper;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java
...@@ -142,7 +142,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E ...@@ -142,7 +142,7 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
type.setUpdateTime(DateTimeUtil.getCurrentDateTime()); type.setUpdateTime(DateTimeUtil.getCurrentDateTime());
this.save(type); this.save(type);
//更新parent_ids字段 //更新parent_ids字段
equipmentTypeMapper.setTypeParentIds(); equipmentTypeMapper.setTypeParentIds(type.getId());
String exchangeName="topicExchange"; String exchangeName="topicExchange";
MQDto mqDto = new MQDto(); MQDto mqDto = new MQDto();
...@@ -335,12 +335,12 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E ...@@ -335,12 +335,12 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
return count > 0; return count > 0;
} }
@Override // @Override
public ResponseResult setTypeParentIds() { // public ResponseResult setTypeParentIds() {
//更新parent_ids字段 // //更新parent_ids字段
equipmentTypeMapper.setTypeParentIds(); // equipmentTypeMapper.setTypeParentIds();
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS); // return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS);
} // }
public ESTypeDto getTypeTreeByEs(QueryEquipmentTypeReq req) throws IOException { public ESTypeDto getTypeTreeByEs(QueryEquipmentTypeReq req) throws IOException {
...@@ -529,31 +529,15 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E ...@@ -529,31 +529,15 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
@Override @Override
public String exportSizeAndType(QueryEquipmentTypeReq req) { public String exportSizeAndType(QueryEquipmentTypeReq req) {
List<EquipmentType> typeList = list(new LambdaQueryWrapper<EquipmentType>().ge(EquipmentType::getUpdateTime, req.getUpdateTime())); List<EquipmentType> typeList = list(new LambdaQueryWrapper<EquipmentType>().ge(EquipmentType::getUpdateTime, req.getUpdateTime()));
SizeAndTypeDto sizeAndType = new SizeAndTypeDto(); SizeAndType sizeAndType = new SizeAndType();
List<TypeDto> collect = typeList.stream().map(type -> { sizeAndType.setTypeList(CollectionUtil.isNotEmpty(typeList)?typeList:new ArrayList<>());
TypeDto typeDto = new TypeDto();
BeanPlusUtil.copyProperties(type, typeDto);
return typeDto;
}).collect(Collectors.toList());
sizeAndType.setTypeList(CollectionUtil.isNotEmpty(collect)?collect:new ArrayList<>());
List<EquipmentSize> sizeList = equipmentSizeService.list(new LambdaQueryWrapper<EquipmentSize>().ge(EquipmentSize::getUpdateTime, req.getUpdateTime())); List<EquipmentSize> sizeList = equipmentSizeService.list(new LambdaQueryWrapper<EquipmentSize>().ge(EquipmentSize::getUpdateTime, req.getUpdateTime()));
List<SizeDto> collect1 = sizeList.stream().map(size -> { sizeAndType.setSizeList(CollectionUtil.isNotEmpty(sizeList)?sizeList:new ArrayList<>());
SizeDto sizeDto = new SizeDto();
BeanPlusUtil.copyProperties(size, sizeDto);
return sizeDto;
}).collect(Collectors.toList());
sizeAndType.setSizeList(CollectionUtil.isNotEmpty(collect1)?collect1:new ArrayList<>());
if (req.getFlag()){ if (req.getFlag()){
List<PubOrg> pubList = pubOrgService.list(new LambdaQueryWrapper<PubOrg>().ge(PubOrg::getUpdateTime, req.getUpdateTime()) List<PubOrg> pubList = pubOrgService.list(new LambdaQueryWrapper<PubOrg>().ge(PubOrg::getUpdateTime, req.getUpdateTime())
.eq(PubOrg::getDelFlag,1)); .eq(PubOrg::getDelFlag,1));
List<OrgDto> collect2 = pubList.stream().map(pubOrg -> { sizeAndType.setOrgList(CollectionUtil.isNotEmpty(pubList)?pubList:new ArrayList<>());
OrgDto orgDto = new OrgDto();
BeanPlusUtil.copyProperties(pubOrg, orgDto);
return orgDto;
}).collect(Collectors.toList());
sizeAndType.setOrgList(CollectionUtil.isNotEmpty(collect2)?collect2:new ArrayList<>());
} }
String jsonString = JSONObject.toJSONString(sizeAndType); String jsonString = JSONObject.toJSONString(sizeAndType);
...@@ -616,6 +600,8 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E ...@@ -616,6 +600,8 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
} }
} }
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java
...@@ -346,6 +346,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain ...@@ -346,6 +346,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
return list; return list;
} }
//销毁装备申请之后将库存信息删除
public boolean addOrRevokeAgentDestructionNum(UpdateOrderReq req){ public boolean addOrRevokeAgentDestructionNum(UpdateOrderReq req){
List<UpdateOrderDetailReq> list = req.getDetailList(); List<UpdateOrderDetailReq> list = req.getDetailList();
List<Object[]> searchItem=new ArrayList<>(); List<Object[]> searchItem=new ArrayList<>();
...@@ -450,45 +451,31 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain ...@@ -450,45 +451,31 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
//纪录日志 //纪录日志
private boolean addOrderLog(UpdateOrderReq req,String orderId,String orderCode,String s){ private boolean addOrderLog(UpdateOrderReq req,String orderId,String orderCode,String s){
// LoginUser StartUser= LoginContext.getContext().getLoginUser();
// StartUser.
//判断日志中是否存在，如果存在直接替换
OrderLog createOrder = orderLogService.getOne(new LambdaQueryWrapper<OrderLog>()
.eq(OrderLog::getOrderId, req.getId())
.eq(OrderLog::getProcessType, "createOrder"));
//我要的是detail的明细存入到history—msg中 //我要的是detail的明细存入到history—msg中
boolean a=true; OrderLog orderLog = new OrderLog();
s=s.substring(0,s.length()-1); orderLog.setId(UUID.randomUUID().toString());
if (createOrder==null){ orderLog.setHistoryMsg(s);
OrderLog orderLog = new OrderLog(); orderLog.setOrderCode(orderCode);
orderLog.setId(UUID.randomUUID().toString()); orderLog.setBussinessType(req.getBussinessType());
orderLog.setHistoryMsg(s); orderLog.setOrderType(req.getOrderType());
orderLog.setOrderCode(orderCode); if (ObjectUtil.isNotNull(req.getStartOrgUserName())){
orderLog.setBussinessType(req.getBussinessType()); orderLog.setCreateUser(req.getStartOrgUserName());
orderLog.setOrderType(req.getOrderType()); }else {
if (ObjectUtil.isNotNull(req.getStartOrgUserName())){ orderLog.setCreateUser(req.getEndOrgUserName());
orderLog.setCreateUser(req.getStartOrgUserName());
}else {
orderLog.setCreateUser(req.getEndOrgUserName());
}
orderLog.setProcessType("careteOrder");
if (req.getOrderType().equals("in")){
orderLog.setOrgId(req.getEndOrgId());
orderLog.setOrgName(req.getEndOrgName());
}else {
orderLog.setOrgId(Long.parseLong(req.getStartOrgId()));
orderLog.setOrgName(req.getStartOrgName());
}
orderLog.setOrderId(orderId);
orderLog.setCreateTime(DateTimeUtil.getCurrentDateTime());
a=orderLogService.save(orderLog);
}else{//直接替换
createOrder.setHistoryMsg(s);
createOrder.setUpdateTime(DateTimeUtil.getCurrentDateTime());
a=orderLogService.updateById(createOrder);
} }
return a; orderLog.setProcessType("createOrder");
if (req.getOrderType().equals("in")){
orderLog.setOrgId(req.getEndOrgId());
orderLog.setOrgName(req.getEndOrgName());
}else {
orderLog.setOrgId(Long.parseLong(req.getStartOrgId()));
orderLog.setOrgName(req.getStartOrgName());
}
orderLog.setOrderId(orderId);
orderLog.setCreateTime(DateTimeUtil.getCurrentDateTime());
return orderLogService.save(orderLog);
} }
//修改业务单据可用次数 //修改业务单据可用次数
private OrderMain setBusFormState(UpdateOrderReq req,OrderMain one,Long orgId){ private OrderMain setBusFormState(UpdateOrderReq req,OrderMain one,Long orgId){
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
...@@ -330,6 +330,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -330,6 +330,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
sysUser.setAccount(accountSet); sysUser.setAccount(accountSet);
sysUser.setNickName(req.getName()); sysUser.setNickName(req.getName());
sysUser.setRealName(req.getName()); sysUser.setRealName(req.getName());
sysUser.setPassword(req.getPassword());
SysUserCreateFactory.fillAddSysUser(sysUser); SysUserCreateFactory.fillAddSysUser(sysUser);
sysUser.setAvatar(FileConstant.DEFAULT_AVATAR_FILE_ID); sysUser.setAvatar(FileConstant.DEFAULT_AVATAR_FILE_ID);
sysUser.setDelFlag(LogicDelEnum.N.getCode()); sysUser.setDelFlag(LogicDelEnum.N.getCode());
...@@ -355,6 +356,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -355,6 +356,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
BeanPlusUtil.copyProperties(req,sysUser); BeanPlusUtil.copyProperties(req,sysUser);
sysUser.setAccount(accountSet); sysUser.setAccount(accountSet);
sysUser.setNickName(req.getName()); sysUser.setNickName(req.getName());
sysUser.setPassword(req.getPassword());
sysUser.setRealName(req.getName()); sysUser.setRealName(req.getName());
SysUserCreateFactory.fillAddSysUser(sysUser); SysUserCreateFactory.fillAddSysUser(sysUser);
sysUser.setAvatar(FileConstant.DEFAULT_AVATAR_FILE_ID); sysUser.setAvatar(FileConstant.DEFAULT_AVATAR_FILE_ID);
...@@ -584,6 +586,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -584,6 +586,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
} }
one.setPhoto(req.getFaceInfo()); one.setPhoto(req.getFaceInfo());
one.setUpdateTime(DateTimeUtil.getCurrentDateTime()); one.setUpdateTime(DateTimeUtil.getCurrentDateTime());
SysUser user= sysUserService.getById(req.getUserId());
user.setPassword(req.getPassword());
sysUserService.updateById(user);
//修改角色 //修改角色
if (req.getRolesList().size()>0){ if (req.getRolesList().size()>0){
// sysUserRoleService.removeBatchByIds(req.getRolesList()); // sysUserRoleService.removeBatchByIds(req.getRolesList());
...@@ -702,14 +707,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -702,14 +707,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
// 处理新增和修改 // 处理新增和修改
for (PoliceListReq reqPolice : policeReqList) { for (PoliceListReq reqPolice : policeReqList) {
Policeman dbPolice = findPoliceById(policeList, reqPolice.getPoliceID()); Policeman dbPolice = findPoliceById(policeList, reqPolice.getPoliceID());
SysUser user= sysUserService.getById(dbPolice.getUserId());
if (dbPolice == null) { if (dbPolice == null) {
// 新增数据 // 新增数据
Policeman newPolice = convertToPoliceman(reqPolice, orgList.getOrgId()); Policeman newPolice = convertToPoliceman(reqPolice, orgList.getOrgId());
toAdd.add(newPolice); toAdd.add(newPolice);
} else { } else {
// 修改数据 // 修改数据
Policeman updatedPolice = updatePoliceman(dbPolice, reqPolice, orgInfo, cabinetOrg); Policeman updatedPolice = updatePoliceman(user,dbPolice, reqPolice, orgInfo, cabinetOrg);
toUpdate.add(updatedPolice); toUpdate.add(updatedPolice);
} }
} }
...@@ -801,14 +806,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -801,14 +806,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
} }
// 辅助方法：更新 Policeman 对象的属性 // 辅助方法：更新 Policeman 对象的属性
private Policeman updatePoliceman(Policeman dbPolice, PoliceListReq reqPolice, PubOrg org, Cabinet cabinet) { private Policeman updatePoliceman(SysUser user, Policeman dbPolice, PoliceListReq reqPolice, PubOrg org, Cabinet cabinet) {
CabinetBox cb = cabinetBoxService.getById(reqPolice.getCabinetBoxId()); CabinetBox cb = cabinetBoxService.getById(reqPolice.getCabinetBoxId());
if (cb.getBoxName() == null) { if (cb.getBoxName() == null) {
cb.setBoxName(""); cb.setBoxName("");
} }
// 判断警员是否存在 // 判断警员是否存在
// 判断传入的修改的警员编号与本身编号一致，如果一致则无所谓，如果不一致则需要判断修改的警员编号是否已经存在 // 判断传入的修改的警员编号与本身编号一致，如果一致则无所谓，如果不一致则需要判断修改的警员编号是否已经存在
user.setPassword(reqPolice.getPassword());
dbPolice.setUpdateTime(DateTimeUtil.getCurrentDateTime()); dbPolice.setUpdateTime(DateTimeUtil.getCurrentDateTime());
List<PoliceEquipment> policeEqsList = policeEquipmentService.list(new LambdaQueryWrapper<PoliceEquipment>() List<PoliceEquipment> policeEqsList = policeEquipmentService.list(new LambdaQueryWrapper<PoliceEquipment>()
.eq(PoliceEquipment::getPoliceId, dbPolice.getId())); .eq(PoliceEquipment::getPoliceId, dbPolice.getId()));
...@@ -957,6 +962,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -957,6 +962,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
dbPolice.setOrgId(Long.valueOf(org.getOrgId())); dbPolice.setOrgId(Long.valueOf(org.getOrgId()));
dbPolice.setState(1); dbPolice.setState(1);
BeanPlusUtil.copyProperties(reqPolice, dbPolice); BeanPlusUtil.copyProperties(reqPolice, dbPolice);
sysUserService.updateById(user);
return dbPolice; return dbPolice;
} }
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java
...@@ -2,6 +2,7 @@ package com.junmp.jyzb.service.impl; ...@@ -2,6 +2,7 @@ package com.junmp.jyzb.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.excel.support.ExcelTypeEnum; import com.alibaba.excel.support.ExcelTypeEnum;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.junmp.jyzb.api.bean.dto.EqsSumDto; import com.junmp.jyzb.api.bean.dto.EqsSumDto;
import com.junmp.jyzb.api.bean.dto.InventorySumDto; import com.junmp.jyzb.api.bean.dto.InventorySumDto;
...@@ -24,6 +25,7 @@ import com.junmp.v2.db.api.factory.PageResultFactory; ...@@ -24,6 +25,7 @@ import com.junmp.v2.db.api.factory.PageResultFactory;
import com.junmp.v2.db.api.page.PageResult; import com.junmp.v2.db.api.page.PageResult;
import com.junmp.v2.office.api.OfficeExcelApi; import com.junmp.v2.office.api.OfficeExcelApi;
import com.junmp.v2.office.api.bean.ExcelExportParam; import com.junmp.v2.office.api.bean.ExcelExportParam;
import org.apache.poi.util.StringUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -125,7 +127,8 @@ public class TjServiceImpl implements TjService { ...@@ -125,7 +127,8 @@ public class TjServiceImpl implements TjService {
allData.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getTotalNumber() == 0); allData.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getTotalNumber() == 0);
} }
req.setColumn(StringUtils.isNotBlank(req.getColumn())? req.getColumn() : "createTime");
req.setOrder(StringUtils.isNotBlank(req.getOrder())? req.getOrder() : "desc");
//将组织机构进行排序后再进行返回 //将组织机构进行排序后再进行返回
if ((req.getColumn().equals("createTime") && req.getOrder().equals("desc")) || if ((req.getColumn().equals("createTime") && req.getOrder().equals("desc")) ||
(req.getColumn().equals("createTime") && req.getOrder().equals("asc"))){ (req.getColumn().equals("createTime") && req.getOrder().equals("asc"))){
...@@ -209,21 +212,18 @@ public class TjServiceImpl implements TjService { ...@@ -209,21 +212,18 @@ public class TjServiceImpl implements TjService {
// @Override // @Override
public List<TjOrgEqsDto> GetTjDataDetail(TjOrgEqsReq req) { public List<TjOrgEqsDto> GetTjDataDetail(TjOrgEqsReq req) {
if ((req.getColumn().equals("createTime") && req.getOrder().equals("desc"))||(req.getColumn().equals("createTime") && req.getOrder().equals("asc"))){
req.setColumn(null);
req.setOrder(null);
}
//先拿到符合条件的组织机构，再遍历组织机构组成数据
//(如果传其他不是数据库字段参数或者排序规则不是deac或者asc可能会出现错误)
if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() && if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
(req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) && (req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) &&
ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) { ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
//修改字段，和数据库字段进行统一 //修改字段，和数据库字段进行统一
req.setColumn(req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase()); req.setColumn(req.getColumn().equals("createTime")
req.setOrder(req.getOrder().toLowerCase()); ? null : req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
req.setOrder((req.getOrder().equals("desc")||req.getOrder().equals("asc"))
? null : req.getOrder().toLowerCase());
} }
List<TjOrgEqsDto> allData=inventorySummaryMapper.getTotalDataDetail(String.valueOf(req.getOrgId()),req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum(),req.getLevel(),req.getColumn(),req.getOrder()); List<TjOrgEqsDto> allData=inventorySummaryMapper.getTotalDataDetail(String.valueOf(req.getOrgId()),req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum(),req.getLevel(),req.getColumn(),req.getOrder());
if (req.getRemoveEmpty())//如果需要删除数据为0的话，前端传true，否则保留数据为0 if (req.getRemoveEmpty())//如果需要删除数据为0的话，前端传true，否则保留数据为0
...@@ -231,8 +231,10 @@ public class TjServiceImpl implements TjService { ...@@ -231,8 +231,10 @@ public class TjServiceImpl implements TjService {
allData.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getTotalNumber() == 0); allData.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getTotalNumber() == 0);
} }
//将组织机构进行排序后再进行返回 //将组织机构进行排序后再进行返回
Comparator<TjOrgEqsDto> orgComparator = createOrgComparator(); if (req.getColumn()==null){
Collections.sort(allData, orgComparator); Comparator<TjOrgEqsDto> orgComparator = createOrgComparator();
Collections.sort(allData, orgComparator);
}
return allData; return allData;
} }
...@@ -318,28 +320,15 @@ public class TjServiceImpl implements TjService { ...@@ -318,28 +320,15 @@ public class TjServiceImpl implements TjService {
} }
//查看装备统计详情
@Override
public PageResult<InventorySumDto> TjOrgEqsDetailPage(TjOrgEqsReq req) {
int size = inventorySummaryMapper.TjOrgEqsDetailSum(req.getOrgId(), req.getTypeIdsList(), req.getSizeNameList());
if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
req.setPageNo(1L);
req.setPageSize(10L);
}
Page<InventorySumDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
List<InventorySumDto> returnList=inventorySummaryMapper.TjOrgEqsDetail(req.getOrgId(),req.getTypeIdsList(),
req.getSizeNameList(),(req.getPageNo()-1)* req.getPageSize(),req.getPageSize());
page.setTotal(size);
page.setRecords(returnList);
return PageResultFactory.createPageResult(page);
}
//查看装备统计详情 //查看装备统计详情
@Override @Override
public List<InventorySumDto> TjOrgEqsDetailList(TjOrgEqsReq req) { public List<InventorySumDto> TjOrgEqsDetailList(TjOrgEqsReq req) {
req.setColumn(req.getColumn().equals("createTime")
? null : req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
req.setOrder((req.getOrder().equals("desc")||req.getOrder().equals("asc"))
? null : req.getOrder().toLowerCase());
List<InventorySumDto> returnList=inventorySummaryMapper.TjOrgEqsDetail(req.getOrgId(),req.getTypeIdsList(), List<InventorySumDto> returnList=inventorySummaryMapper.TjOrgEqsDetail(req.getOrgId(),req.getTypeIdsList(),
req.getSizeNameList(),null,null); req.getSizeNameList(),req.getColumn(),req.getOrder());
return returnList; return returnList;
} }
...@@ -363,9 +352,6 @@ public class TjServiceImpl implements TjService { ...@@ -363,9 +352,6 @@ public class TjServiceImpl implements TjService {
// 等待所有 CompletableFuture 完成 // 等待所有 CompletableFuture 完成
allOf.join(); allOf.join();
tjOrgPriceDtoList = futures.stream()
.map(CompletableFuture::join)
.collect(Collectors.toList());
if (req.getOrgId()!=1369509498032808905L){ if (req.getOrgId()!=1369509498032808905L){
//获取本级数据 //获取本级数据
...@@ -441,7 +427,7 @@ public class TjServiceImpl implements TjService { ...@@ -441,7 +427,7 @@ public class TjServiceImpl implements TjService {
finalTjOrgPriceDto.setEndPrice(BigDecimal.ZERO); finalTjOrgPriceDto.setEndPrice(BigDecimal.ZERO);
finalTjOrgPriceDto.setDestoryPrice(BigDecimal.ZERO); finalTjOrgPriceDto.setDestoryPrice(BigDecimal.ZERO);
List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId())); List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
List<TjOrgPriceDto> tjOrgPriceDtoList=new ArrayList<>();
//根据条件查询财务汇总表 //根据条件查询财务汇总表
List<CompletableFuture<TjOrgPriceDto>> futures = orgList.stream() List<CompletableFuture<TjOrgPriceDto>> futures = orgList.stream()
.map(orgId -> CompletableFuture.supplyAsync(() -> .map(orgId -> CompletableFuture.supplyAsync(() ->
...@@ -453,7 +439,9 @@ public class TjServiceImpl implements TjService { ...@@ -453,7 +439,9 @@ public class TjServiceImpl implements TjService {
// 等待所有 CompletableFuture 完成 // 等待所有 CompletableFuture 完成
allOf.join(); allOf.join();
tjOrgPriceDtoList = futures.stream() List<TjOrgPriceDto> tjOrgPriceDtoList = orgList.parallelStream()
.map(orgId -> CompletableFuture.supplyAsync(() ->
priceSumSummaryMapper.TjOrgPrice(orgId, req.getYear(), req.getTypeIdsList(), req.getSizeNameList())))
.map(CompletableFuture::join) .map(CompletableFuture::join)
.collect(Collectors.toList()); .collect(Collectors.toList());
...@@ -492,6 +480,7 @@ public class TjServiceImpl implements TjService { ...@@ -492,6 +480,7 @@ public class TjServiceImpl implements TjService {
@Override @Override
public List<TjOrgPriceDto> TjOrgPriceDetail(TjOrgPriceReq req) { public List<TjOrgPriceDto> TjOrgPriceDetail(TjOrgPriceReq req) {
List<TjOrgPriceDto> tjOrgPriceDtoList = priceSumSummaryMapper.TjOrgPriceTotalNum(req.getOrgId(), req.getYear(), List<TjOrgPriceDto> tjOrgPriceDtoList = priceSumSummaryMapper.TjOrgPriceTotalNum(req.getOrgId(), req.getYear(),
req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum(),req.getLevel()); req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum(),req.getLevel());
if (req.getRemoveEmpty()){ if (req.getRemoveEmpty()){
...@@ -501,33 +490,51 @@ public class TjServiceImpl implements TjService { ...@@ -501,33 +490,51 @@ public class TjServiceImpl implements TjService {
return tjOrgPriceDtoList; return tjOrgPriceDtoList;
} }
//查看财务统计详情
@Override @Override
public PageResult<TjOrgPriceDto> TjOrgPriceDetailPage(TjOrgPriceReq req) { public List<TjOrgPriceDto> TjOrgPriceDetail1(TjOrgPriceReq req) {
int size = priceSumSummaryMapper.TjOrgPriceDetailSum(req.getOrgId(),req.getYear(),req.getTypeIdsList(),req.getSizeNameList()); if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) { (req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) &&
req.setPageNo(1L); ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
req.setPageSize(10L); //修改字段，和数据库字段进行统一
req.setColumn(req.getColumn().equals("createTime")
? null : req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
req.setOrder((req.getOrder().equals("desc")||req.getOrder().equals("asc"))
? null : req.getOrder().toLowerCase());
} }
Page<TjOrgPriceDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()); List<TjOrgPriceDto> allData=priceSumSummaryMapper.getTotalPriceDetail(req.getOrgId(), req.getYear(),
List<TjOrgPriceDto> returnList=priceSumSummaryMapper.TjOrgPriceDetail(req.getOrgId(),req.getYear(), req.getTypeIdsList(),req.getSizeNameList(),req.getLevelNum(),req.getLevel(),req.getColumn(),req.getOrder());
req.getTypeIdsList(),req.getSizeNameList(), (req.getPageNo() - 1)* req.getPageSize(),req.getPageSize()); if (req.getRemoveEmpty()){
page.setTotal(size); allData.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getStartNum() == 0 && tjOrgEqsDto.getEndNum() == 0
page.setRecords(returnList); && tjOrgEqsDto.getDestoryNum()==0);
return PageResultFactory.createPageResult(page); }
if (req.getColumn()==null){
//将组织机构进行排序后再进行返回
Comparator<TjOrgPriceDto> orgComparator = createOrgComparator();
Collections.sort(allData, orgComparator);
}
return allData;
} }
@Override @Override
public List<TjOrgPriceDto> TjOrgPriceDetailList(TjOrgPriceReq req) { public List<TjOrgPriceDto> TjOrgPriceDetailList(TjOrgPriceReq req) {
//先拿到符合条件的组织机构，再遍历组织机构组成数据
//(如果传其他不是数据库字段参数或者排序规则不是deac或者asc可能会出现错误)
if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
(req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) &&
ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
req.setColumn(req.getColumn().equals("createTime")
? null : req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
req.setOrder((req.getOrder().equals("desc")||req.getOrder().equals("asc"))
? null : req.getOrder().toLowerCase());
}
List<TjOrgPriceDto> returnList=priceSumSummaryMapper.TjOrgPriceDetail(req.getOrgId(),req.getYear(), List<TjOrgPriceDto> returnList=priceSumSummaryMapper.TjOrgPriceDetail(req.getOrgId(),req.getYear(),
req.getTypeIdsList(),req.getSizeNameList(),null,null); req.getTypeIdsList(),req.getSizeNameList(), req.getColumn(), req.getOrder());
return returnList; return returnList;
} }
//自定义排序规则（根据某个字段值进行排序）
@Override @Override
public void TjOrgPriceExport(TjOrgPriceReq req) { public void TjOrgPriceExport(TjOrgPriceReq req) {
PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId()); PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
...@@ -773,36 +780,50 @@ public class TjServiceImpl implements TjService { ...@@ -773,36 +780,50 @@ public class TjServiceImpl implements TjService {
} }
@Override @Override
public PageResult<TjOrgCountDto> TjOrgCountDetailPage(TjOrgCountReq req) { public List<TjOrgCountDto> TjOrgCountDetail1(TjOrgCountReq req) {
int size = equipmentCountSummaryMapper.TjOrgCountDetailSum(req.getOrgId(),req.getYear(),
req.getTypeIdsList(),req.getSizeNameList());
if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) { if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
req.setPageNo(1L); (req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) &&
req.setPageSize(10L); ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
//修改字段，和数据库字段进行统一
req.setColumn((req.getColumn().equals("createTime") )
? null : req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
req.setOrder(( req.getOrder().equals("desc")||req.getOrder().equals("asc"))
? null : req.getOrder().toLowerCase());
} }
Page<TjOrgCountDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
List<TjOrgCountDto> returnList=equipmentCountSummaryMapper.TjOrgCountDetail(req.getOrgId(),req.getYear(), List<TjOrgCountDto> tjOrgCountDtoList=equipmentCountSummaryMapper.TjOrgCountTotalDetail(req.getOrgId(),
req.getTypeIdsList(),req.getSizeNameList(),(req.getPageNo()-1)* req.getPageSize(),req.getPageSize()); req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
page.setTotal(size); req.getMonthList(),req.getLevelNum(),req.getLevel(),req.getColumn(),req.getOrder());
page.setRecords(returnList); if (req.getRemoveEmpty()){
return PageResultFactory.createPageResult(page); tjOrgCountDtoList.removeIf(tjOrgCountDto -> tjOrgCountDto.getNumber()==0 );
}
if (req.getColumn()==null){
//将组织机构进行排序后再进行返回
Comparator<TjOrgCountDto> orgComparator = createOrgComparator();
Collections.sort(tjOrgCountDtoList, orgComparator);
}
return tjOrgCountDtoList;
} }
@Override @Override
public List<TjOrgCountDto> TjOrgCountDetailList(TjOrgCountReq req) { public List<TjOrgCountDto> TjOrgCountDetailList(TjOrgCountReq req) {
List<TjOrgCountDto> returnList=equipmentCountSummaryMapper.TjOrgCountDetail(req.getOrgId(),req.getYear(), if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
req.getTypeIdsList(),req.getSizeNameList(),null,null); (req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) &&
ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
req.setColumn(req.getColumn().equals("createTime")
? null : req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
req.setOrder((req.getOrder().equals("desc")||req.getOrder().equals("asc"))
? null : req.getOrder().toLowerCase());
}
List<TjOrgCountDto> returnList=equipmentCountSummaryMapper.TjOrgCountDetail(req.getOrgId(),
req.getTypeIdsList(),req.getSizeNameList(),req.getYear(),req.getTypeParentId(),
req.getMonthList(),req.getLevelNum(),req.getLevel(),req.getColumn(),req.getOrder());
return returnList; return returnList;
} }
@Override
@Transactional(rollbackFor = Exception.class)
public boolean updateTjOrgCount(TjOrgCountReq req) {
String sql=" org_id_int = "+"'"+req.getOrgId()+"'";
equipmentCountSummaryMapper.deleteAll(req.getOrgId());
equipmentCountSummaryMapper.addInfo(sql);
return true;
}
@Override @Override
public List<TjOrgCountDto> TjOrgCountByType(TjOrgCountReq req) { public List<TjOrgCountDto> TjOrgCountByType(TjOrgCountReq req) {
......
jyzb-biz/src/main/resources/mapper/EquipmentCountSummaryMapper.xml
...@@ -45,18 +45,7 @@ ...@@ -45,18 +45,7 @@
set type_name=#{typeName} set type_name=#{typeName}
where type_id =#{typeId} where type_id =#{typeId}
</update> </update>
<delete id="deleteAll">
delete from vie_equipment_count_summary where
<if test="orgId!=null and orgId != ''">
org_id_int=#{orgId}
</if>
<if test="orgId==null or orgId == ''">
1=1
</if>
</delete>
<insert id="addInfo" statementType="CALLABLE" >
{call AddEquipmentCountSummary(#{sql,mode=IN})}
</insert>
<select id="TjOrgCount" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto"> <select id="TjOrgCount" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto">
SELECT SELECT
(SELECT `org_id` FROM `pub_org` WHERE org_id=#{orgId}) as org_id, (SELECT `org_id` FROM `pub_org` WHERE org_id=#{orgId}) as org_id,
...@@ -100,135 +89,10 @@ ...@@ -100,135 +89,10 @@
</if> </if>
GROUP BY `year`,month) as t GROUP BY `year`,month) as t
<!-- SELECT-->
<!-- MAX(vecs.org_id) as org_id,-->
<!-- MAX(vecs.org_code) as org_code,-->
<!-- MAX(vecs.org_name) as org_name,-->
<!-- MAX(vecs.d_name) as d_name,-->
<!-- vecs.`year`,-->
<!-- vecs.`month`,-->
<!-- SUM(vecs.use_count) AS use_count,-->
<!-- SUM(vecs.fix_count) AS fix_count,-->
<!-- sum(vecs.number) as number-->
<!-- FROM view_org_use vecs-->
<!-- WHERE vecs.`year`= #{year}-->
<!-- AND (-->
<!-- <foreach collection="orgIdList" item="orgId" separator=" OR " open="(" close=")">-->
<!-- vecs.org_id = #{orgId}-->
<!-- OR vecs.org_parent_ids LIKE CONCAT('%',#{orgId}, '%')-->
<!-- </foreach>-->
<!-- )-->
<!-- <if test="typeIdsList!=null and typeIdsList.size() > 0">&ndash;&gt;-->
<!-- and vecs.type_id in-->
<!-- <foreach collection="typeIdsList" item="item" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- <if test="typeParentId != null and typeParentId !=''">-->
<!-- and vecs.type_parent_id=#{typeParentId}-->
<!-- </if>-->
<!-- <if test="sizeNameList!=null and sizeNameList.size() > 0">-->
<!-- AND-->
<!-- <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">-->
<!-- vecs.size_name like CONCAT('%', #{item}, '%')-->
<!-- </foreach>-->
<!-- </if>-->
<!-- <if test="monthList != null and monthList.size()>0">-->
<!-- and vecs.month in-->
<!-- <foreach collection="monthList" item="item" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- GROUP BY `year`,month-->
</select> </select>
<select id="TjOrgCount1" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto" >
SELECT
MAX(vecs.org_id) as org_id,
MAX(vecs.org_code) as org_code,
MAX(vecs.org_name) as org_name,
MAX(vecs.d_name) as d_name,
vecs.`year`,
vecs.`month`,
SUM(vecs.use_count) AS use_count,
SUM(vecs.fix_count) AS fix_count,
SUM(vecs.number) as number
FROM view_org_use vecs
WHERE vecs.`year`= #{year}
AND (
vecs.org_id = #{orgId}
OR vecs.org_parent_ids LIKE CONCAT('%', #{orgId}, '%')
)
<if test="typeIdsList!=null and typeIdsList.size() > 0">
AND vecs.type_id IN
<foreach collection="typeIdsList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="typeParentId != null and typeParentId !=''">
AND vecs.type_parent_id=#{typeParentId}
</if>
<if test="sizeNameList!=null and sizeNameList.size() > 0">
AND
<foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
vecs.size_name LIKE CONCAT('%', #{item}, '%')
</foreach>
</if>
<if test="monthList != null and monthList.size()>0">
AND vecs.month IN
<foreach collection="monthList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
GROUP BY `year`, month
</select>
<select id="TjOrgCountSum" resultType="com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgCountDto"> <select id="TjOrgCountSum" resultType="com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgCountDto">
<!-- select sum(use_count) as use_count,sum(fix_count) as fix_count,sum(number) as number FROM (-->
<!-- SELECT-->
<!-- t.org_id,-->
<!-- max(t.org_code) as org_code,-->
<!-- max(t.org_name) as org_name,-->
<!-- max(t.parent_id) as parent_id,-->
<!-- max(t.d_name) AS d_name,-->
<!-- MAX(t.`year`) AS `year`,-->
<!-- SUM(t.use_count) AS use_count,-->
<!-- SUM(t.fix_count) AS fix_count,-->
<!-- sum(CASE WHEN t.month = MONTH(CURRENT_DATE()) THEN t.number ELSE 0 END) AS number-->
<!-- FROM (-->
<!-- SELECT-->
<!-- org_id_int AS org_id,-->
<!-- max(org_code) as org_code,-->
<!-- max(org_name) as org_name,-->
<!-- max(parent_id) as parent_id,-->
<!-- max(org_name_short) AS d_name,-->
<!-- `year`,-->
<!-- `month`,-->
<!-- SUM(use_count) AS use_count,-->
<!-- SUM(fix_count) AS fix_count,-->
<!-- sum(number) as number-->
<!-- FROM vie_equipment_count_summary-->
<!-- where `year`= #{year} and (org_id_int=#{orgId} or parent_id=#{orgId})-->
<!-- <if test="typeIdsList!=null and typeIdsList.size() > 0">-->
<!-- and type_id in-->
<!-- <foreach collection="typeIdsList" item="item" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- <if test="sizeNameList!=null and sizeNameList.size() > 0">-->
<!-- AND-->
<!-- <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">-->
<!-- size_name like CONCAT('%', #{item}, '%')-->
<!-- </foreach>-->
<!-- </if>-->
<!-- GROUP BY org_id,`year`,month-->
<!-- ) AS t-->
<!-- GROUP BY-->
<!-- t.org_id-->
<!-- ) as a-->
SELECT SELECT
`year`, `year`,
...@@ -252,114 +116,57 @@ ...@@ -252,114 +116,57 @@
</if> </if>
GROUP BY `year`,month GROUP BY `year`,month
</select> </select>
<select id="TjOrgCountDetailSum" resultType="java.lang.Integer">
select count(*) FROM (
SELECT
t.org_id,
t.org_code,
t.org_name,
t.parent_id,
t.d_name,
MAX(t.`year`) AS `year`,
SUM(t.use_count) AS use_count,
SUM(t.fix_count) AS fix_count,
size_id,
size_name,
type_id,
type_name,
sum(CASE WHEN t.month = MONTH(CURRENT_DATE()) THEN t.number ELSE 0 END) AS number
FROM (
SELECT
org_id_int AS org_id,
org_code,
org_name,
parent_id,
org_name_short AS d_name,
`year`,
`month`,
SUM(use_count) AS use_count,
SUM(fix_count) AS fix_count,
size_id,
size_name,
type_id,
type_name,
sum(number) as number
FROM vie_equipment_count_summary
WHERE year = #{year} and org_id_int = #{orgId}
<if test="typeIdsList!=null and typeIdsList.size() > 0">
AND type_id IN
<foreach collection="typeIdsList " item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="sizeNameList!=null and sizeNameList.size() > 0">
AND
<foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
size_name like CONCAT('%', #{item}, '%')
</foreach>
</if>
GROUP BY
org_id,org_code,org_name,parent_id,d_name,`year`,month,size_id,size_name,type_id,type_name
) AS t
GROUP BY
t.org_id,t.org_code,t.org_name,t.parent_id,t.d_name, t.size_id,t.size_name,t.type_id,t.type_name
ORDER BY t.type_id,size_id
) as a
</select>
<select id="TjOrgCountDetail" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto"> <select id="TjOrgCountDetail" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto">
SELECT SELECT MAX( t.`year` ) AS `year`,coalesce(SUM( t.use_count ) ,0)AS use_count,coalesce(SUM( t.fix_count ),0) AS fix_count,
t.org_id, size_id,size_name,type_id,type_name,
t.org_code, coalesce(sum( CASE WHEN t.MONTH = MONTH ( CURRENT_DATE ()) THEN t.number ELSE 0 END ),0) AS number
t.org_name, FROM
t.parent_id, (
t.d_name, SELECT
MAX(t.`year`) AS `year`, vecs.`year`,
SUM(t.use_count) AS use_count, vecs.`month`,
SUM(t.fix_count) AS fix_count, SUM( vecs.use_count ) AS use_count,
size_id, SUM( vecs.fix_count ) AS fix_count,
size_name, vecs.size_id,
type_id, vecs.size_name,
type_name, vecs.type_id,
sum(CASE WHEN t.month = MONTH(CURRENT_DATE()) THEN t.number ELSE 0 END) AS number vecs.type_name,
FROM ( sum( vecs.number ) AS number
SELECT FROM
org_id_int AS org_id, vie_equipment_count_summary vecs
org_code, LEFT JOIN pub_org po ON vecs.org_id_int = po.org_id
org_name, WHERE
parent_id, YEAR = #{year} and org_id_int=#{orgId}
org_name_short AS d_name,
`year`,
`month`,
SUM(use_count) AS use_count,
SUM(fix_count) AS fix_count,
size_id,
size_name,
type_id,
type_name,
sum(number) as number
FROM vie_equipment_count_summary
WHERE year = #{year} and org_id_int = #{orgId}
<if test="typeIdsList!=null and typeIdsList.size() > 0"> <if test="typeIdsList!=null and typeIdsList.size() > 0">
AND type_id IN and vecs.type_id in
<foreach collection="typeIdsList " item="item" open="(" separator="," close=")"> <foreach collection="typeIdsList" item="item" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="typeParentId != null and typeParentId !=''">
and vecs.type_parent_id=#{typeParentId}
</if>
<if test="sizeNameList!=null and sizeNameList.size() > 0"> <if test="sizeNameList!=null and sizeNameList.size() > 0">
AND AND
<foreach collection="sizeNameList " item="item" open="(" separator="or" close=")"> <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
size_name like CONCAT('%', #{item}, '%') vecs.size_name like CONCAT('%', #{item}, '%')
</foreach>
</if>
<if test="monthList != null and monthList.size()>0">
and vecs.month in
<foreach collection="monthList" item="item" open="(" separator="," close=")">
#{item}
</foreach> </foreach>
</if> </if>
GROUP BY GROUP BY
org_id,org_code,org_name,parent_id,d_name,`year`,month,size_id,size_name,type_id,type_name `year`,MONTH,size_id,size_name,type_id,type_name
) AS t ) AS t
GROUP BY GROUP BY
t.org_id,t.org_code,t.org_name,t.parent_id,t.d_name, t.size_id,t.size_name,t.type_id,t.type_name t.size_id,t.size_name,t.type_id,t.type_name
ORDER BY t.type_id,size_id ORDER BY
<if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' "> type_id,size_id
limit #{pageNo},#{pageSize}
</if>
</select> </select>
<select id="TjOrgCountByType" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto" <select id="TjOrgCountByType" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto"
parameterType="com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq"> parameterType="com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq">
...@@ -549,6 +356,99 @@ ...@@ -549,6 +356,99 @@
order by ${column} ${order} order by ${column} ${order}
</if> </if>
</select> </select>
<select id="TjOrgCountTotalDetail" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto">
select t1.org_id,t1.org_code,t1.org_name,t1.d_name,t2.year,t2.use_count,t2.fix_count,t2.number
FROM(
SELECT
`org_id`, `org_code`, `org_name`, `d_name`
FROM `pub_org`
WHERE del_flag=1
<if test="level ==null" >
and (org_id =#{orgId} or (org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`org_code`, 5, 2) = '00'
</if>
))
and (level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
</if>
<if test="level==1">
and (org_id !=#{orgId} and (org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`org_code`, 5, 2) = '00'
</if>
))
and (level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
</if>
<if test="level == 0 ">
and org_id = #{orgId}
</if>
) as t1
CROSS JOIN (
SELECT
t.org_id_int,
MAX(t.`year`) AS `year`,
SUM(t.use_count) AS use_count,
SUM(t.fix_count) AS fix_count,
sum(CASE WHEN t.month = MONTH(CURRENT_DATE()) THEN t.number ELSE 0 END) AS number
FROM (
SELECT
vecs.org_id_int,
vecs.`year`,
vecs.`month`,
SUM(vecs.use_count) AS use_count,
SUM(vecs.fix_count) AS fix_count,
sum(vecs.number) as number
FROM vie_equipment_count_summary vecs
left join pub_org po on vecs.org_id_int=po.org_id
where vecs.`year`= 2024 and po.del_flag=1
<if test="level ==null" >
and (po.org_id =#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
</if>
))
and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
`po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
</if>
<if test="level==1">
and (po.org_id !=#{orgId} and (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
</if>
))
and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
`po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
</if>
<if test="level == 0 ">
and po.org_id = #{orgId}
</if>
<if test="typeIdsList!=null and typeIdsList.size() > 0">
and vecs.type_id in
<foreach collection="typeIdsList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="typeParentId != null and typeParentId !=''">
and vecs.type_parent_id=#{typeParentId}
</if>
<if test="sizeNameList!=null and sizeNameList.size() > 0">
AND
<foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
vecs.size_name like CONCAT('%', #{item}, '%')
</foreach>
</if>
<if test="monthList != null and monthList.size()>0">
and vecs.month in
<foreach collection="monthList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
GROUP BY `year`,month,org_id_int
) AS t GROUP BY t.org_id_int
)as t2 where t1.org_id=t2.org_id_int
</select>
</mapper> </mapper>
jyzb-biz/src/main/resources/mapper/EquipmentTypeMapper.xml
...@@ -21,24 +21,27 @@ ...@@ -21,24 +21,27 @@
<update id="setTypeParentIds" parameterType="java.util.Map"> <update id="setTypeParentIds" parameterType="java.util.Map">
UPDATE base_equipment_type t1
SET t1.parent_ids = (
WITH RECURSIVE ParentHierarchy AS (
SELECT id, parent_id
FROM base_equipment_type
WHERE id = t1.id
UNION WITH RECURSIVE ParentHierarchy AS (
SELECT id, parent_id
FROM base_equipment_type
WHERE id = #{typeId}
SELECT t2.id, t2.parent_id UNION
FROM ParentHierarchy ph
JOIN base_equipment_type t2 ON ph.parent_id = t2.id SELECT t.id, t.parent_id
) FROM ParentHierarchy ph
SELECT IFNULL(GROUP_CONCAT( JOIN base_equipment_type t ON ph.parent_id = t.id
CASE WHEN parent_id != '00000000-0000-0000-0000-000000000000' THEN parent_id END
ORDER BY parent_id SEPARATOR ','), '')
FROM ParentHierarchy
) )
UPDATE base_equipment_type t1
JOIN (
SELECT id, IFNULL(GROUP_CONCAT(
CASE WHEN parent_id != '00000000-0000-0000-0000-000000000000' THEN parent_id END
ORDER BY parent_id SEPARATOR ','), '') AS parent_ids
FROM ParentHierarchy
GROUP BY id
) t2 ON t1.id = t2.id
SET t1.parent_ids = t2.parent_ids
WHERE t1.parent_id IS NOT NULL; WHERE t1.parent_id IS NOT NULL;
</update> </update>
<select id="selectByItems" resultType="java.lang.String"> <select id="selectByItems" resultType="java.lang.String">
......
jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml
...@@ -583,10 +583,13 @@ ...@@ -583,10 +583,13 @@
type_name, type_name,
size_name, size_name,
size_id size_id
ORDER BY type_id <if test="column != null and column != '' and order != null and order != '' ">
<if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' "> order by ${column} ${order}
limit #{pageNo},#{pageSize}
</if> </if>
<if test="column == null and order == null">
ORDER BY type_id
</if>
</select> </select>
<select id="selectTotalNum" resultType="com.junmp.jyzb.api.bean.dto.InventorySumDto"> <select id="selectTotalNum" resultType="com.junmp.jyzb.api.bean.dto.InventorySumDto">
...@@ -598,45 +601,7 @@ ...@@ -598,45 +601,7 @@
WHERE org_id_int = #{orgId} and (type_id = ${item[0]} AND size_id = '${item[1]}') WHERE org_id_int = #{orgId} and (type_id = ${item[0]} AND size_id = '${item[1]}')
</foreach> </foreach>
</select> </select>
<select id="TjOrgEqsDetailSum" resultType="java.lang.Integer">
select count(*) from (
SELECT
type_name,
size_name,
type_id,
(
sum( CASE WHEN `base_inventory_summary`.`location_type` = 0 THEN `base_inventory_summary`.`stock_number` ELSE 0 END ) +
sum( CASE WHEN `base_inventory_summary`.`location_type` = 0 THEN `base_inventory_summary`.`outbound_number` ELSE 0 END ) +
sum( CASE WHEN `base_inventory_summary`.`location_type` = 0 THEN `base_inventory_summary`.`destruction_number` ELSE 0 END )
) AS total_number,
sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 0 ) THEN `base_inventory_summary`.`stock_number` ELSE 0 END ) AS `ck_stock_number`,
sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 0 ) THEN `base_inventory_summary`.`outbound_number` ELSE 0 END ) AS `ck_outbound_number`,
sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 0 ) THEN `base_inventory_summary`.`destruction_number` ELSE 0 END ) AS `destruction_number`,
sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 1 ) THEN `base_inventory_summary`.`stock_number` ELSE 0 END ) AS `djg_stock_number`,
sum( CASE WHEN ( `base_inventory_summary`.`location_type` = 1 ) THEN `base_inventory_summary`.`outbound_number` ELSE 0 END ) AS `djg_outbound_number`
FROM
base_inventory_summary
WHERE
org_id_int = #{orgId}
<if test="typeIdsList!=null and typeIdsList.size() > 0">
AND type_id IN
<foreach collection="typeIdsList " item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="sizeNameList!=null and sizeNameList.size() > 0">
AND
<foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
size_name like CONCAT('%', #{item}, '%')
</foreach>
</if>
GROUP BY
type_id,
type_name,
size_name
ORDER BY type_id
) as t
</select>
<select id="GetEquipmentSummarySum" resultType="java.lang.Integer" <select id="GetEquipmentSummarySum" resultType="java.lang.Integer"
parameterType="com.junmp.jyzb.api.bean.query.InventorySumReq"> parameterType="com.junmp.jyzb.api.bean.query.InventorySumReq">
select count(*) from ( select count(*) from (
......
jyzb-biz/src/main/resources/mapper/PriceSumSummaryMapper.xml
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
vie_price_sum_summary vpss vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE WHERE
vpss.MONTH = ( SELECT MIN( MONTH ) FROM vie_price_sum_summary WHERE YEAR = #{year} ) vpss.MONTH = 1 and vpss.year=#{year}
AND po.del_flag = 1 AND po.del_flag = 1
AND (po.org_id = #{orgId} OR po.org_parent_ids LIKE CONCAT( '%', #{orgId}, '%' )) AND (po.org_id = #{orgId} OR po.org_parent_ids LIKE CONCAT( '%', #{orgId}, '%' ))
<if test="typeIdsList!=null and typeIdsList.size() > 0"> <if test="typeIdsList!=null and typeIdsList.size() > 0">
...@@ -98,101 +98,107 @@ ...@@ -98,101 +98,107 @@
</select> </select>
<select id="TjOrgPriceDetail" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto"> <select id="TjOrgPriceDetail" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto">
select org_id_int as org_id,org_code,org_name,type_id,type_name,size_id,size_name,
sum(coalesce(start_num,0)) as start_num,sum(coalesce(start_price,0)) as start_price, select COALESCE(t2.start_num,0) as start_num,COALESCE(t2.start_price,0) as start_price,COALESCE(t1.end_num,0) as end_num,
sum(coalesce(end_num,0)) as end_num,sum(coalesce(end_price,0)) as end_price, COALESCE(t1.end_price,0) as end_price,t1.destory_num,t1.destory_price,t1.type_name,t1.type_id,t1.size_name,t1.size_id,
sum(coalesce(add_num,0)) as add_num,sum(coalesce(destory_num,0)) as destory_num, COALESCE(end_num,0)-COALESCE(start_num,0) as add_num,COALESCE(end_price,0)-COALESCE(start_price,0) as add_price
sum(coalesce(add_price,0)) as add_price,sum(coalesce(destory_price,0)) as destory_price FROM(
FROM vie_price_sum_summary SELECT
where `year`= #{year} and org_id_int=#{orgId} sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_num, 0 ) ELSE 0 END ) AS end_num,
<if test="typeIdsList!=null and typeIdsList.size() > 0"> sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_price, 0 ) ELSE 0 END ) AS end_price,
and type_id in sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_num, 0 ) ELSE 0 END ) AS destory_num,
<foreach collection="typeIdsList" item="item" open="(" separator="," close=")"> sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_price, 0 ) ELSE 0 END ) AS destory_price,vpss.type_name,vpss.type_id,vpss.size_name,vpss.size_id
#{item} FROM
</foreach> vie_price_sum_summary vpss
</if> LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
<if test="sizeNameList!=null and sizeNameList.size() > 0"> WHERE `po`.`del_flag` = 1 and po.org_id =#{orgId}
AND
<foreach collection="sizeNameList " item="item" open="(" separator="or" close=")"> GROUP BY vpss.type_id,vpss.type_name,vpss.size_name,vpss.size_id
size_name like CONCAT('%', #{item}, '%') ORDER BY vpss.type_id
</foreach> ) as t1
left join(
SELECT
SUM(COALESCE ( start_num, 0 )) AS start_num,
SUM(COALESCE ( start_price, 0 )) AS start_price, vpss.type_name,vpss.type_id,vpss.size_name,vpss.size_id
FROM
vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE
vpss.MONTH = 1
and `po`.`del_flag` = 1 and po.org_id =#{orgId}
GROUP BY vpss.type_id,vpss.type_name,vpss.size_name,vpss.size_id
ORDER BY vpss.type_id
) as t2 on t1.type_id =t2.type_id and t1.type_name=t2.type_name and t1.size_id =t2.size_id and t1.size_name=t2.size_name
<if test="column != null and column != '' and order != null and order != '' ">
order by ${column} ${order}
</if> </if>
GROUP BY org_id,org_code,org_name,type_id,type_name,size_id,size_name <if test="column==null and order == null">
ORDER BY type_id order by type_id
<if test="pageNo != null and pageNo != '' and pageSize != null and pageSize != '' ">
limit #{pageNo},#{pageSize}
</if> </if>
</select> </select>
<!-- <select id="TjOrgPriceSum" resultType="com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgPriceDto">-->
<!-- select sum(coalesce(start_num,0)) as start_num,sum(coalesce(start_price,0)) as start_price,-->
<!-- sum(coalesce(end_num,0)) as end_num,sum(coalesce(end_price,0)) as end_price,-->
<!-- sum(coalesce(add_num,0)) as add_num,sum(coalesce(destory_num,0)) as destory_num,--> <select id="TjOrgPriceLeve4" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto">
<!-- sum(coalesce(add_price,0)) as add_price,sum(coalesce(destory_price,0)) as destory_price FROM (-->
<!-- select org_id_int as org_id,org_code,org_name,--> SELECT
<!-- sum(start_num) as start_num,sum(start_price) as start_price,--> t3.org_id,t3.org_code,t3.org_name,t3.d_name,coalesce(t4.start_num,0) as start_num,
<!-- sum(end_num) as end_num,sum(end_price) as end_price,--> coalesce(t4.start_price,0) as start_price,coalesce(t4.end_num,0)as end_num,coalesce(t4.end_price,0) as end_price,
<!-- sum(add_num) as add_num,sum(destory_num) as destory_num,--> coalesce(t4.add_num,0) as add_num,coalesce(t4.add_price,0) as add_price,
<!-- sum(add_price) as add_price,sum(destory_price) as destory_price--> coalesce(t4.destory_num,0) as destory_num,COALESCE(t4.destory_price,0) as destory_price
<!-- FROM vie_price_sum_summary--> FROM
<!-- where `year`= #{year} and (org_id_int=#{orgId} or parent_id=#{orgId})--> ( SELECT `org_id`, `org_code`, `org_name`, `d_name` FROM `pub_org` WHERE org_id = #{orgId} ) AS t3
<!-- <if test="typeIdsList!=null and typeIdsList.size() > 0">--> CROSS JOIN (
<!-- and type_id in--> SELECT
<!-- <foreach collection="typeIdsList" item="item" open="(" separator="," close=")">--> t1.start_num,t1.start_price,t2.end_num,t2.end_price,t2.end_num - t1.start_num AS add_num,
<!-- #{item}--> t2.end_price - t1.start_price AS add_price, t2.destory_num,t2.destory_price
<!-- </foreach>--> FROM
<!-- </if>--> (
<!-- <if test="sizeNameList!=null and !sizeNameList.size() > 0">--> SELECT
<!-- AND--> SUM(COALESCE ( start_num, 0 )) AS start_num,
<!-- <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">--> SUM(COALESCE ( start_price, 0 )) AS start_price
<!-- size_name like CONCAT('%', #{item}, '%')--> FROM
<!-- </foreach>--> vie_price_sum_summary vpss
<!-- </if>--> LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
<!-- GROUP BY org_id,org_code,org_name--> WHERE
<!-- ) as t--> vpss.MONTH = 1 and vpss.`year`= #{year} and po.del_flag=1
<!-- </select>--> AND (po.org_id != #{orgId} and (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
<select id="TjOrgPriceDetailSum" resultType="java.lang.Integer"> AND(case when #{levelFlag} >=3 then 1=1 else SUBSTRING(`po`.`org_code`, 5, 2) = '00' end ))
select count(*) from ( AND (
select org_id_int as org_id,org_code,org_name,type_id,type_name, `po`.`level_flag` > (
sum(coalesce(start_num,0)) as start_num,sum(coalesce(start_price,0)) as start_price, SELECT `level_flag` FROM `pub_org` WHERE `org_id` = #{orgId}
sum(coalesce(end_num,0)) as end_num,sum(coalesce(end_price,0)) as end_price, ) + 1
sum(coalesce(add_num,0)) as add_num,sum(coalesce(destory_num,0)) as destory_num, OR (`po`.`level_flag` = (
sum(coalesce(add_price,0)) as add_price,sum(coalesce(destory_price,0)) as destory_price SELECT `level_flag` FROM `pub_org` WHERE `org_id` = #{orgId}
FROM vie_price_sum_summary ))))
where `year`= #{year} and org_id_int=#{orgId}
<if test="typeIdsList!=null and typeIdsList.size() > 0"> <if test="typeIdsList!=null and typeIdsList.size() > 0">
and type_id in and type_id in
<foreach collection="typeIdsList" item="item" open="(" separator="," close=")"> <foreach collection="typeIdsList" item="item" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="sizeNameList!=null and !sizeNameList.size() > 0"> <if test="sizeNameList!=null and sizeNameList.size() > 0">
AND AND
<foreach collection="sizeNameList " item="item" open="(" separator="or" close=")"> <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
size_name like CONCAT('%', #{item}, '%') size_name like CONCAT('%', #{item}, '%')
</foreach> </foreach>
</if> </if>
GROUP BY org_id,org_code,org_name,type_id,type_name ) AS t1
ORDER BY type_id CROSS JOIN (
) as t
</select>
<select id="TjOrgPriceLeve4" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto">
select t1.org_id,t1.org_code,t1.org_name,t1.d_name,
t2.start_num,t2.start_price,t2.end_num,t2.end_price,t2.add_num,t2.add_price,t2.destory_num,t2.destory_price
FROM(
SELECT SELECT
`org_id`, `org_code`, `org_name`, `d_name` sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_num, 0 ) ELSE 0 END ) AS end_num,
FROM `pub_org` sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_price, 0 ) ELSE 0 END ) AS end_price,
WHERE org_id=#{orgId} sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_num, 0 ) ELSE 0 END ) AS destory_num,
) as t1 sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_price, 0 ) ELSE 0 END ) AS destory_price
CROSS JOIN (select sum(COALESCE(vpss.start_num,0)) as start_num,sum(COALESCE(vpss.start_price,0)) as start_price, FROM
sum(COALESCE(vpss.end_num,0)) as end_num,sum(COALESCE(vpss.end_price,0)) as end_price, vie_price_sum_summary vpss
sum(COALESCE(vpss.add_num,0)) as add_num,sum(COALESCE(vpss.destory_num,0)) as destory_num, LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
sum(COALESCE(vpss.add_price,0)) as add_price,sum(COALESCE(vpss.destory_price,0)) as destory_price WHERE
FROM vie_price_sum_summary vpss vpss.`year`= #{year} and po.del_flag=1
left join pub_org po on vpss.org_id_int=po.org_id
where vpss.`year`= #{year} and po.del_flag=1
AND (po.org_id != #{orgId} and (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%') AND (po.org_id != #{orgId} and (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
AND(case when #{levelFlag} >=3 then 1=1 else SUBSTRING(`po`.`org_code`, 5, 2) = '00' end )) AND(case when #{levelFlag} >=3 then 1=1 else SUBSTRING(`po`.`org_code`, 5, 2) = '00' end ))
AND ( AND (
...@@ -214,65 +220,37 @@ ...@@ -214,65 +220,37 @@
size_name like CONCAT('%', #{item}, '%') size_name like CONCAT('%', #{item}, '%')
</foreach> </foreach>
</if> </if>
) as t2 ) AS t2
) AS t4
</select> </select>
<!-- <select id="TjOrgPriceLeve4" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto">-->
<!-- select t1.org_id,t1.org_code,t1.org_name,t1.d_name,-->
<!-- t2.start_num,t2.start_price,t2.end_num,t2.end_price,t2.add_num,t2.add_price,t2.destory_num,t2.destory_price-->
<!-- FROM(-->
<!-- SELECT-->
<!-- `org_id`, `org_code`, `org_name`, `d_name`-->
<!-- FROM `pub_org`-->
<!-- WHERE org_id=#{orgId}-->
<!-- ) as t1-->
<!-- CROSS JOIN (select sum(COALESCE(vpss.start_num,0)) as start_num,sum(COALESCE(vpss.start_price,0)) as start_price,-->
<!-- sum(COALESCE(vpss.end_num,0)) as end_num,sum(COALESCE(vpss.end_price,0)) as end_price,-->
<!-- sum(COALESCE(vpss.add_num,0)) as add_num,sum(COALESCE(vpss.destory_num,0)) as destory_num,-->
<!-- sum(COALESCE(vpss.add_price,0)) as add_price,sum(COALESCE(vpss.destory_price,0)) as destory_price-->
<!-- FROM vie_price_sum_summary vpss-->
<!-- left join pub_org po on vpss.org_id_int=po.org_id-->
<!-- where vpss.`year`= #{year} and po.del_flag=1-->
<!-- AND (po.org_id != #{orgId} and (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')-->
<!-- AND(case when #{levelFlag} >=3 then 1=1 else SUBSTRING(`po`.`org_code`, 5, 2) = '00' end ))-->
<!-- AND (-->
<!-- `po`.`level_flag` > (-->
<!-- SELECT `level_flag` FROM `pub_org` WHERE `org_id` = #{orgId}-->
<!-- ) + 1-->
<!-- OR (`po`.`level_flag` = (-->
<!-- SELECT `level_flag` FROM `pub_org` WHERE `org_id` = #{orgId}-->
<!-- ))))-->
<!-- <if test="typeIdsList!=null and typeIdsList.size() > 0">-->
<!-- and type_id in-->
<!-- <foreach collection="typeIdsList" item="item" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- <if test="sizeNameList!=null and sizeNameList.size() > 0">-->
<!-- AND-->
<!-- <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">-->
<!-- size_name like CONCAT('%', #{item}, '%')-->
<!-- </foreach>-->
<!-- </if>-->
<!-- ) as t2-->
<!-- </select>-->
<select id="TjOrgPriceBySelf" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto"> <select id="TjOrgPriceBySelf" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto">
select t1.org_id,t1.org_code,t1.org_name,t1.d_name,
t2.start_num,t2.start_price,t2.end_num,t2.end_price,t2.add_num,t2.add_price,t2.destory_num,t2.destory_price
FROM(
SELECT SELECT
`org_id`, `org_code`, `org_name`, `d_name` t3.org_id,t3.org_code,t3.org_name,t3.d_name,coalesce(t4.start_num,0) as start_num,
FROM `pub_org` coalesce(t4.start_price,0) as start_price,coalesce(t4.end_num,0)as end_num,coalesce(t4.end_price,0) as end_price,
WHERE org_id=#{orgId} coalesce(t4.add_num,0) as add_num,coalesce(t4.add_price,0) as add_price,
) as t1 coalesce(t4.destory_num,0) as destory_num,COALESCE(t4.destory_price,0) as destory_price
CROSS JOIN (select sum(COALESCE(vpss.start_num,0)) as start_num,sum(COALESCE(vpss.start_price,0)) as start_price, FROM
sum(COALESCE(vpss.end_num,0)) as end_num,sum(COALESCE(vpss.end_price,0)) as end_price, ( SELECT `org_id`, `org_code`, `org_name`, `d_name` FROM `pub_org` WHERE org_id = #{orgId} ) AS t3
sum(COALESCE(vpss.add_num,0)) as add_num,sum(COALESCE(vpss.destory_num,0)) as destory_num, CROSS JOIN (
sum(COALESCE(vpss.add_price,0)) as add_price,sum(COALESCE(vpss.destory_price,0)) as destory_price SELECT
FROM vie_price_sum_summary vpss t1.start_num,t1.start_price,t2.end_num,t2.end_price,t2.end_num - t1.start_num AS add_num,
left join pub_org po on vpss.org_id_int=po.org_id t2.end_price - t1.start_price AS add_price, t2.destory_num,t2.destory_price
where vpss.`year`= #{year} and po.del_flag=1 FROM
(
SELECT
SUM(COALESCE ( start_num, 0 )) AS start_num,
SUM(COALESCE ( start_price, 0 )) AS start_price
FROM
vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE
vpss.MONTH = 1 and vpss.year=#{year}
AND po.del_flag = 1
AND po.org_id = #{orgId} AND po.org_id = #{orgId}
<if test="typeIdsList!=null and typeIdsList.size() > 0"> <if test="typeIdsList!=null and typeIdsList.size() > 0">
and type_id in and type_id in
...@@ -286,80 +264,36 @@ ...@@ -286,80 +264,36 @@
size_name like CONCAT('%', #{item}, '%') size_name like CONCAT('%', #{item}, '%')
</foreach> </foreach>
</if> </if>
) as t2 ) AS t1
</select> CROSS JOIN (
SELECT
<!-- <select id="TjOrgPriceTotalNum" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto">--> sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_num, 0 ) ELSE 0 END ) AS end_num,
sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_price, 0 ) ELSE 0 END ) AS end_price,
<!-- select COALESCE(t2.start_num,0) as start_num,COALESCE(t2.start_price,0) as start_price,COALESCE(t1.end_num,0) as end_num,--> sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_num, 0 ) ELSE 0 END ) AS destory_num,
<!-- COALESCE(t1.end_price,0) as end_price,t1.destory_num,t1.destory_price,t1.type_name,t1.type_id,--> sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_price, 0 ) ELSE 0 END ) AS destory_price
<!-- COALESCE(end_num,0)-COALESCE(start_num,0) as add_num,COALESCE(end_price,0)-COALESCE(start_price,0) as add_price--> FROM
<!-- FROM(--> vie_price_sum_summary vpss
<!-- SELECT--> LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
<!-- sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_num, 0 ) ELSE 0 END ) AS end_num,--> WHERE
<!-- sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_price, 0 ) ELSE 0 END ) AS end_price,--> vpss.`year` = #{year}
<!-- sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_num, 0 ) ELSE 0 END ) AS destory_num,--> AND po.del_flag = 1
<!-- sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_price, 0 ) ELSE 0 END ) AS destory_price,vpss.type_name,vpss.type_id--> AND po.org_id = #{orgId}
<!-- FROM--> <if test="typeIdsList!=null and typeIdsList.size() > 0">
<!-- vie_price_sum_summary vpss--> and type_id in
<!-- LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id--> <foreach collection="typeIdsList" item="item" open="(" separator="," close=")">
<!-- WHERE--> #{item}
<!-- vpss.MONTH = ( SELECT MIN( MONTH ) FROM vie_price_sum_summary WHERE YEAR = #{year} )--> </foreach>
<!-- and `po`.`del_flag` = 1 and (po.org_id=#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')--> </if>
<!-- <if test="levelNum !=0">--> <if test="sizeNameList!=null and sizeNameList.size() > 0">
<!-- AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'--> AND
<!-- </if>--> <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
<!-- ))--> size_name like CONCAT('%', #{item}, '%')
<!-- and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or--> </foreach>
<!-- `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId}))--> </if>
<!-- <if test="typeIdsList!=null and typeIdsList.size() > 0">--> ) AS t2
<!-- and type_id in--> ) AS t4
<!-- <foreach collection="typeIdsList" item="item" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- <if test="sizeNameList!=null and sizeNameList.size() > 0">-->
<!-- AND-->
<!-- <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">-->
<!-- size_name like CONCAT('%', #{item}, '%')-->
<!-- </foreach>-->
<!-- </if>-->
<!-- GROUP BY vpss.type_id,vpss.type_name-->
<!-- ORDER BY vpss.type_id-->
<!-- ) as t1-->
<!-- left join(-->
<!-- SELECT-->
<!-- SUM(COALESCE ( start_num, 0 )) AS start_num,-->
<!-- SUM(COALESCE ( start_price, 0 )) AS start_price, vpss.type_name,vpss.type_id-->
<!-- FROM-->
<!-- vie_price_sum_summary vpss-->
<!-- LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id-->
<!-- WHERE-->
<!-- vpss.MONTH = ( SELECT MIN( MONTH ) FROM vie_price_sum_summary WHERE YEAR = #{year} )-->
<!-- and `po`.`del_flag` = 1 and (po.org_id=#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')-->
<!-- <if test="levelNum !=0">-->
<!-- AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'-->
<!-- </if>-->
<!-- ))-->
<!-- and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or-->
<!-- `po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId}))-->
<!-- <if test="typeIdsList!=null and typeIdsList.size() > 0">-->
<!-- and type_id in-->
<!-- <foreach collection="typeIdsList" item="item" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- <if test="sizeNameList!=null and sizeNameList.size() > 0">-->
<!-- AND-->
<!-- <foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">-->
<!-- size_name like CONCAT('%', #{item}, '%')-->
<!-- </foreach>-->
<!-- </if>-->
<!-- GROUP BY vpss.type_id,vpss.type_name-->
<!-- ORDER BY vpss.type_id-->
<!-- ) as t2 on t1.type_id =t2.type_id and t1.type_name=t2.type_name-->
<!-- </select>-->
</select>
<select id="TjOrgPriceTotalNum" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto"> <select id="TjOrgPriceTotalNum" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto">
...@@ -376,7 +310,7 @@ ...@@ -376,7 +310,7 @@
vie_price_sum_summary vpss vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE WHERE
vpss.MONTH = ( SELECT MIN( MONTH ) FROM vie_price_sum_summary WHERE YEAR = #{year} ) vpss.MONTH = 1
and `po`.`del_flag` = 1 and `po`.`del_flag` = 1
<if test="level ==null " > <if test="level ==null " >
and (po.org_id =#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%') and (po.org_id =#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
...@@ -422,7 +356,7 @@ ...@@ -422,7 +356,7 @@
vie_price_sum_summary vpss vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE WHERE
vpss.MONTH = ( SELECT MIN( MONTH ) FROM vie_price_sum_summary WHERE YEAR = #{year} ) vpss.MONTH = 1
and `po`.`del_flag` = 1 and `po`.`del_flag` = 1
<if test="level ==null " > <if test="level ==null " >
and (po.org_id =#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%') and (po.org_id =#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
...@@ -461,6 +395,150 @@ ...@@ -461,6 +395,150 @@
ORDER BY vpss.type_id ORDER BY vpss.type_id
) as t2 on t1.type_id =t2.type_id and t1.type_name=t2.type_name ) as t2 on t1.type_id =t2.type_id and t1.type_name=t2.type_name
</select> </select>
<select id="getTotalPriceDetail" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgPriceDto">
SELECT
t3.org_id,t3.org_code,t3.org_name,t3.d_name,
COALESCE ( t4.start_num, 0 ) AS start_num,
COALESCE ( t4.start_price, 0 ) AS start_price,
COALESCE ( t4.end_num, 0 ) AS end_num,
COALESCE ( t4.end_price, 0 ) AS end_price,
COALESCE ( t4.add_num, 0 ) AS add_num,
COALESCE ( t4.add_price, 0 ) AS add_price,
COALESCE ( t4.destory_num, 0 ) AS destory_num,
COALESCE ( t4.destory_price, 0 ) AS destory_price
FROM
(
SELECT
`org_id`,`org_code`,`org_name`,`d_name`
FROM
`pub_org`
WHERE del_flag = 1
<if test="level ==null" >
and (org_id =#{orgId} or (org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`org_code`, 5, 2) = '00'
</if>
))
and (level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
</if>
<if test="level==1">
and (org_id !=#{orgId} and (org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`org_code`, 5, 2) = '00'
</if>
))
and (level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
</if>
<if test="level == 0 ">
and org_id = #{orgId}
</if>
) AS t3
CROSS JOIN (
SELECT
t1.org_id_int,t1.start_num,t1.start_price,t2.end_num,t2.end_price,t2.end_num - t1.start_num AS add_num,
t2.end_price - t1.start_price AS add_price,t2.destory_num,t2.destory_price
FROM
(
SELECT
vpss.org_id_int,
SUM(COALESCE ( start_num, 0 )) AS start_num,
SUM(COALESCE ( start_price, 0 )) AS start_price
FROM
vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE
vpss.MONTH = 1 AND vpss.YEAR = #{year}
AND po.del_flag = 1
<if test="level ==null" >
and (po.org_id =#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
</if>
))
and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
`po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
</if>
<if test="level==1">
and (po.org_id !=#{orgId} and (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
</if>
))
and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
`po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
</if>
<if test="level == 0 ">
and po.org_id = #{orgId}
</if>
<if test="typeIdsList!=null and typeIdsList.size() > 0">
and type_id in
<foreach collection="typeIdsList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="sizeNameList!=null and sizeNameList.size() > 0">
AND
<foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
size_name like CONCAT('%', #{item}, '%')
</foreach>
</if>
GROUP BY vpss.org_id_int
) AS t1
CROSS JOIN (
SELECT
vpss.org_id_int,
sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_num, 0 ) ELSE 0 END ) AS end_num,
sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.end_price, 0 ) ELSE 0 END ) AS end_price,
sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_num, 0 ) ELSE 0 END ) AS destory_num,
sum( CASE WHEN vpss.MONTH = MONTH ( CURRENT_DATE ()) THEN COALESCE ( vpss.destory_price, 0 ) ELSE 0 END ) AS destory_price
FROM
vie_price_sum_summary vpss
LEFT JOIN pub_org po ON vpss.org_id_int = po.org_id
WHERE
vpss.`year` = #{year}
AND po.del_flag = 1
<if test="level ==null" >
and (po.org_id =#{orgId} or (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
</if>
))
and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
`po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
</if>
<if test="level==1">
and (po.org_id !=#{orgId} and (`po`.org_parent_ids like CONCAT('%', #{orgId}, '%')
<if test="levelNum !=0">
AND SUBSTRING(`po`.`org_code`, 5, 2) = '00'
</if>
))
and (`po`.level_flag>(select level_flag FROM pub_org where org_id=#{orgId} )+#{levelNum} or
`po`.level_flag=(select level_flag FROM pub_org where org_id=#{orgId} ))
</if>
<if test="level == 0 ">
and po.org_id = #{orgId}
</if>
<if test="typeIdsList!=null and typeIdsList.size() > 0">
and type_id in
<foreach collection="typeIdsList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="sizeNameList!=null and sizeNameList.size() > 0">
AND
<foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
size_name like CONCAT('%', #{item}, '%')
</foreach>
</if>
GROUP BY vpss.org_id_int) AS t2
WHERE t1.org_id_int = t2.org_id_int) AS t4
WHERE t3.org_id = t4.org_id_int
<if test="column != null and column != '' and order != null and order != '' ">
order by ${column} ${order}
</if>
</select>
</mapper> </mapper>
\ No newline at end of file
jyzb-boot/src/main/resources/application-local.yml
...@@ -36,9 +36,9 @@ knife4j: ...@@ -36,9 +36,9 @@ knife4j:
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.3.121:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true url: jdbc:mysql://192.168.1.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
username: root username: root
password: junmp123 password: 123456
redis: redis:
#host: 192.168.3.188 #host: 192.168.3.188
......
jyzb-boot/src/main/resources/application-prod.yml
...@@ -32,9 +32,9 @@ knife4j: ...@@ -32,9 +32,9 @@ knife4j:
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://192.168.3.121:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true url: jdbc:mysql://192.168.1.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
username: root username: root
password: junmp123 password: 123456
redis: redis:
#host: 192.168.3.188 #host: 192.168.3.188
......
jyzb-process/src/main/java/com/junmp/junmpProcess/mapper/QuickSuggestionsMapper.java
...@@ -2,6 +2,7 @@ package com.junmp.junmpProcess.mapper; ...@@ -2,6 +2,7 @@ package com.junmp.junmpProcess.mapper;
import com.junmp.junmpProcess.entity.QuickSuggestions; import com.junmp.junmpProcess.entity.QuickSuggestions;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.api.bean.query.QueryOrderLogReq;
import com.junmp.jyzb.api.bean.req.InventorySummaryReq; import com.junmp.jyzb.api.bean.req.InventorySummaryReq;
import com.junmp.jyzb.api.bean.req.UpdateBusFormReq; import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
import com.junmp.jyzb.api.bean.req.UpdateOrderDetailReq; import com.junmp.jyzb.api.bean.req.UpdateOrderDetailReq;
...@@ -32,6 +33,8 @@ public interface QuickSuggestionsMapper extends BaseMapper<QuickSuggestions> { ...@@ -32,6 +33,8 @@ public interface QuickSuggestionsMapper extends BaseMapper<QuickSuggestions> {
List<UpdateOrderDetailReq> getOrderMainDetail(@Param("processId")String processInstanceId); List<UpdateOrderDetailReq> getOrderMainDetail(@Param("processId")String processInstanceId);
boolean updateDesNum(@Param("list") List<InventorySummaryReq> inventorySummaryList); boolean updateDesNum(@Param("list") List<InventorySummaryReq> inventorySummaryList);
Boolean addOrderLog(@Param("req") QueryOrderLogReq orderLog);
} }
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java
...@@ -30,10 +30,12 @@ import com.junmp.junmpProcess.service.IFlowInstanceService; ...@@ -30,10 +30,12 @@ import com.junmp.junmpProcess.service.IFlowInstanceService;
import com.junmp.junmpProcess.service.IFlowTaskService; import com.junmp.junmpProcess.service.IFlowTaskService;
import com.junmp.junmpProcess.service.Repository.ProcessTemplateService; import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
import com.junmp.junmpProcess.utils.CreateNullData; import com.junmp.junmpProcess.utils.CreateNullData;
import com.junmp.junmpProcess.utils.DateTimeUtil;
import com.junmp.junmpProcess.vo.*; import com.junmp.junmpProcess.vo.*;
import com.junmp.jyzb.api.bean.dto.BusFormDto; import com.junmp.jyzb.api.bean.dto.BusFormDto;
import com.junmp.jyzb.api.bean.dto.PolicemanDto; import com.junmp.jyzb.api.bean.dto.PolicemanDto;
import com.junmp.jyzb.api.bean.query.BussinessOrderDetialReq; import com.junmp.jyzb.api.bean.query.BussinessOrderDetialReq;
import com.junmp.jyzb.api.bean.query.QueryOrderLogReq;
import com.junmp.jyzb.api.bean.req.InventorySummaryReq; import com.junmp.jyzb.api.bean.req.InventorySummaryReq;
import com.junmp.jyzb.api.bean.req.UpdateBusFormReq; import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
import com.junmp.jyzb.api.bean.req.UpdateOrderDetailReq; import com.junmp.jyzb.api.bean.req.UpdateOrderDetailReq;
...@@ -302,7 +304,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -302,7 +304,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
sendReq.setMsgTitle("您的审批被驳回"); sendReq.setMsgTitle("您的审批被驳回");
sendReq.setBizType("refuse/"+Types); sendReq.setBizType("refuse/"+Types);
sendReq.setBizId(Long.valueOf(task.getProcessInstanceId())); sendReq.setBizId(Long.valueOf(task.getProcessInstanceId()));
sendReq.setMsgContent("您提交的审批【"+mainProcess.getName()+"】被驳回"); sendReq.setMsgContent("您提交的审批【"+mainProcess.getName()+"】被驳回，原因:"+handleDataDTO.getComments());
sendReq.setPriority("0"); sendReq.setPriority("0");
sendReq.setSendTime(DateTime.now()); sendReq.setSendTime(DateTime.now());
messageApi.sendMessage(sendReq); messageApi.sendMessage(sendReq);
...@@ -365,6 +367,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -365,6 +367,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
break; break;
} }
//将拒绝的单子创建日志
addOrderLog(StartUser,comments);
}else { }else {
runtimeService.deleteProcessInstance(taskId, "拒绝"); runtimeService.deleteProcessInstance(taskId, "拒绝");
} }
...@@ -373,6 +378,16 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -373,6 +378,16 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,ReturnMsg.PASS); return new ResponseResult(HttpStatus.SUCCESS, ReturnMsg.PASS,ReturnMsg.PASS);
} }
private Boolean addOrderLog(SysUser sysUser,String comments){
QueryOrderLogReq orderLog = new QueryOrderLogReq();
orderLog.setId(UUID.randomUUID().toString());
orderLog.setHistoryMsg(StringUtils.isNotBlank(comments)?comments:"拒绝");
orderLog.setCreateUser(sysUser.getAccount());
orderLog.setProcessType("refuseOrder");
orderLog.setCreateTime(DateTimeUtil.getCurrentDateTime());
return quickSuggestionsMapper.addOrderLog(orderLog);
}
@Override @Override
public ResponseResult revoke(HandleDataDTO handleDataDTO) { public ResponseResult revoke(HandleDataDTO handleDataDTO) {
SysUser StartUser=new SysUser(); SysUser StartUser=new SysUser();
......
jyzb-process/src/main/resources/mapper/QuickSuggestionsMapper.xml
...@@ -16,6 +16,10 @@ ...@@ -16,6 +16,10 @@
id,user_id,text, id,user_id,text,
create_time,update_time create_time,update_time
</sql> </sql>
<insert id="addOrderLog">
insert into bussiness_order_log(id,history_msg,create_time,create_user,process_type)
values(#{req.id},#{req.historyMsg},#{req.createTime},#{req.createUser},#{req.processType})
</insert>
<update id="updateOrderMain" parameterType="java.lang.String"> <update id="updateOrderMain" parameterType="java.lang.String">
update bussiness_order_main om update bussiness_order_main om
set om.examine_state ="refuse" where om.process_id =#{processId} set om.examine_state ="refuse" where om.process_id =#{processId}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论