Skip to content

J
jyzb_platformV2
Commit 1a7e59f3 by 赵剑炜
Options

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

parents 3c57d097 29478fe8
正在显示 包含 101 行增加 和 13 行删除
app-log/log_error.log
This source diff could not be displayed because it is too large. You can view the blob instead.
app-log/log_total.log
This source diff could not be displayed because it is too large. You can view the blob instead.
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TjReq/TjOrgCountReq.java
......@@ -4,6 +4,7 @@ import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
......@@ -14,7 +15,6 @@ public class TjOrgCountReq extends BaseRequest {
private Long orgId;
private List<String> typeIdsList;
private List<String> sizeNameList;
@NotNull(message = "年份不能为空",groups = detail.class)
private Integer year;
private List<Integer> monthList;
......@@ -26,4 +26,7 @@ public class TjOrgCountReq extends BaseRequest {
private String column;
private Integer level;
private String startTime;
private String endTime;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java
package com.junmp.jyzb.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -24,10 +25,14 @@ import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.dict.api.bean.req.SysDictItemReq;
import com.junmp.v2.dict.api.bean.vo.SimpleDictItemVo;
import com.junmp.v2.dict.api.bean.vo.SimpleDictVo;
import com.junmp.v2.dict.api.exception.DictException;
import com.junmp.v2.dict.api.exception.DictExceptionEnum;
import com.junmp.v2.dict.entity.SysDict;
import com.junmp.v2.dict.entity.SysDictItem;
import com.junmp.v2.dict.service.SysDictItemService;
import com.junmp.v2.dict.service.SysDictService;
import com.junmp.v2.file.api.bean.req.SysFileInfoReq;
import com.junmp.v2.file.api.bean.res.SysFileInfoResp;
import com.junmp.v2.file.biz.entity.SysFileInfo;
......@@ -47,6 +52,8 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.net.URL;
import java.util.List;
import java.util.stream.Collectors;
/**
* <pre>
......@@ -71,6 +78,9 @@ public class PublicController {
@Resource
private PublicService publicService;
@Resource
private SysDictService sysDictService;
private final static String DB_URL_TEMPLATE = "jdbc:mysql://{}:{}/{}?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true";
......@@ -110,11 +120,24 @@ public class PublicController {
return ApiRes.success(publicService.addDictType(req));
}
// @PostMapping("/aaa")
// public ApiRes<String> aaa(PolicemanReq req){
//
// return String;
// }
@GetMapping(
name = "查询所有字典项#enable",
path = {"/getAllDictItem"}
)
public ApiRes<List<SimpleDictVo>> getAllDictItem() {
List<SysDict> list = sysDictService.list();
if (CollectionUtil.isNotEmpty(list)) {
List<SimpleDictVo> tempList = (List)list.stream().map((it) -> {
SimpleDictVo dict = (SimpleDictVo)BeanPlusUtil.toBean(it, SimpleDictVo.class);
List<SimpleDictItemVo> itemVoList = publicService.findListByDict(dict.getDictId());
dict.setItemList(itemVoList);
return dict;
}).collect(Collectors.toList());
return ApiRes.success(tempList);
} else {
return ApiRes.failure("暂无数据");
}
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/PublicService.java
package com.junmp.jyzb.service;
import com.junmp.v2.dict.api.bean.req.SysDictItemReq;
import com.junmp.v2.dict.api.bean.vo.SimpleDictItemVo;
import java.util.List;
public interface PublicService {
Long addDictType(SysDictItemReq req);
List<SimpleDictItemVo> findListByDict(Long dictId);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BusFormServiceImpl.java
......@@ -85,6 +85,9 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
@Resource
private BusFormMapper busFormMapper;
@Resource
private PolicemanService policemanService;
public Object addEs() {
List<BusForm> esDto=this.list();
return busFormRepository.saveAll(esDto);
......@@ -167,6 +170,11 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
updateById(busForm);
} else {
//保存
//将创建人员添加（为的是将审核员创建的单子，审核员能看见）
//将该组织机构下的所有审核人员进行查询，并添加到historyAssign中
String userIds=policemanService.searchUserByRoleId(req.getOrgId());
String userId=LoginContext.getContext().getLoginUser().getUserId().toString()+","+userIds;
busForm.setHistoryAssign(userId);
this.save(busForm);
}
Task currentTask = taskService.createTaskQuery().processInstanceId(substring).singleResult();
......@@ -182,6 +190,11 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
updateById(busForm);
} else {
//保存
//将创建人员添加（为的是将审核员创建的单子，审核员能看见）
//将该组织机构下的所有审核人员进行查询，并添加到historyAssign中
String userIds=policemanService.searchUserByRoleId(req.getOrgId());
String userId=LoginContext.getContext().getLoginUser().getUserId().toString()+","+userIds;
busForm.setHistoryAssign(userId);
this.save(busForm);
}
}else {
......@@ -190,6 +203,11 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
updateById(busForm);
} else {
//保存
//将创建人员添加（为的是将审核员创建的单子，审核员能看见）
//将该组织机构下的所有审核人员进行查询，并添加到historyAssign中
String userIds=policemanService.searchUserByRoleId(req.getOrgId());
String userId=LoginContext.getContext().getLoginUser().getUserId().toString()+","+userIds;
busForm.setHistoryAssign(userId);
this.save(busForm);
}
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
......@@ -167,6 +167,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
@Resource
private IStoredEncryptApi iStoredEncryptApi;
@Resource
private PolicemanService policemanService;
private static final String REDIS_POLICE = "Policeman_";
private static final String REDIS_ORG = "Organization_";
......@@ -1732,6 +1735,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
reassignment.setOrderCode(orderNum.getBussinessType()+orderNum.getYear()+
String.format("%02d", LocalDateTime.now().getMonth().getValue())+
String.format("%02d",LocalDateTime.now().getDayOfMonth())+codeValue);
String userIds=policemanService.searchUserByRoleId(req.getOrgId());
String userId=LoginContext.getContext().getLoginUser().getUserId().toString()+","+userIds;
reassignment.setHistoryAssign(userId);
reassignmentService.save(reassignment);
}
//执行工作流（如果点击提交接入审核流）
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PublicServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.junmp.jyzb.service.PublicService;
import com.junmp.v2.common.enums.StatusEnum;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.dict.api.bean.req.SysDictItemReq;
import com.junmp.v2.dict.api.bean.vo.SimpleDictItemVo;
import com.junmp.v2.dict.api.exception.DictException;
import com.junmp.v2.dict.api.exception.DictExceptionEnum;
import com.junmp.v2.dict.entity.SysDictItem;
......@@ -13,6 +15,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
@Slf4j
public class PublicServiceImpl implements PublicService {
......@@ -20,6 +24,8 @@ public class PublicServiceImpl implements PublicService {
@Resource
private SysDictItemService sysDictItemService;
public Long addDictType(SysDictItemReq req){
SysDictItem sysDictType = (SysDictItem) BeanPlusUtil.toBean(req, SysDictItem.class);
LambdaQueryWrapper<SysDictItem> eq = new LambdaQueryWrapper<SysDictItem>().eq(SysDictItem::getDictId, req.getItemText()).eq(SysDictItem::getItemText, req.getDictId());
......@@ -34,4 +40,14 @@ public class PublicServiceImpl implements PublicService {
return sysDictType.getDictItemId();
}
@Override
public List<SimpleDictItemVo> findListByDict(Long dictId) {
LambdaQueryWrapper<SysDictItem> wp = Wrappers.lambdaQuery();
wp.eq(SysDictItem::getDictId, dictId);
wp.eq(SysDictItem::getDelFlag,0);
List<SimpleDictItemVo> voList = BeanPlusUtil.toBeanList(sysDictItemService.list(wp), SimpleDictItemVo.class);
return voList;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java
......@@ -629,6 +629,15 @@ public class TjServiceImpl implements TjService {
List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
List<TjOrgCountDto> tjOrgCountList=new ArrayList<>();
String[] splitStart = req.getStartTime().split("-");
String[] splitEnd =req.getEndTime().split("-");
Integer year=Integer.parseInt(splitStart[0] );
req.setYear(year);
List<Integer> monthList=new ArrayList<>();
for (int i = Integer.parseInt(splitStart[1]) ; i <= Integer.parseInt(splitEnd[1]); i++) {
monthList.add(i);
}
req.setMonthList(monthList);
List<CompletableFuture<TjOrgCountDto>> futures = orgList.stream()
.map(orgId -> CompletableFuture.supplyAsync(() ->
equipmentCountSummaryMapper.TjOrgCount(orgId,
......@@ -710,7 +719,15 @@ public class TjServiceImpl implements TjService {
PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
List<String> orgList= inventorySummaryMapper.getTotalData(String.valueOf(req.getOrgId()));
List<TjOrgCountDto> tjOrgCountList=new ArrayList<>();
String[] splitStart = req.getStartTime().split("-");
String[] splitEnd =req.getEndTime().split("-");
Integer year=Integer.parseInt(splitStart[0] );
req.setYear(year);
List<Integer> monthList=new ArrayList<>();
for (int i = Integer.parseInt(splitStart[1]) ; i <= Integer.parseInt(splitEnd[1]); i++) {
monthList.add(i);
}
req.setMonthList(monthList);
List<CompletableFuture<TjOrgCountDto>> futures = orgList.stream()
.map(orgId -> CompletableFuture.supplyAsync(() ->
equipmentCountSummaryMapper.TjOrgCount(orgId,
......@@ -719,9 +736,8 @@ public class TjServiceImpl implements TjService {
)
.collect(Collectors.toList());
// 等待所有 CompletableFuture 完成
CompletableFuture<Void> allOf = CompletableFuture.allOf(
futures.toArray(new CompletableFuture[0])
);
CompletableFuture<Void> allOf = CompletableFuture.allOf( futures.toArray(new CompletableFuture[0]));
allOf.join();
tjOrgCountList = futures.stream()
......
jyzb-biz/src/main/resources/mapper/OrderMainMapper.xml
......@@ -88,7 +88,7 @@
and ( end_org_user_id = #{userId}
or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%'))
</if>
<if test="req.orderType=='out'">
<if test="req.orderType=='out' or req.orderType=='OUT'">
and (start_org_user_id = #{userId}
or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%'))
</if>
......@@ -100,7 +100,7 @@
and (end_org_name LIKE CONCAT('%', #{req.name}, '%')
or supplier_name LIKE CONCAT('%', #{req.name}, '%') or return_user LIKE CONCAT('%', #{req.name}, '%') )
</if>
<if test="req.name!=null and req.name!='' and req.orderType=='out'">
<if test="req.name!=null and req.name!='' and (req.orderType=='out' or req.orderType=='OUT')">
and (start_org_name LIKE CONCAT('%', #{req.name}, '%')
or supplier_name LIKE CONCAT('%', #{req.name}, '%') or return_user LIKE CONCAT('%', #{req.name}, '%') )
</if>
......
jyzb-boot/src/main/resources/application-prod.yml
......@@ -32,7 +32,7 @@ knife4j:
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
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
url: jdbc:mysql://192.168.1.128:3306/db_jyzb_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
username: root
password: 123456
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论