Skip to content

J
jyzb_platformV2
Commit 8fa04ff9 by 李小惠
Options

修改人员信息

parent e67b6c45
正在显示 包含 575 行增加 和 60 行删除
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/CabinetBoxPoliceDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.util.Date;
@Data
public class CabinetBoxPoliceDto {
private Long id;
/**
* 单警柜箱号
*/
private String cabinetBoxId;
/**
* 警员id
*/
private String policeId;
private Integer num;
/**
* 主柜号
*/
private String cabinetId;
/**
* 主柜号
*/
private String cabinetName;
/**
*
*/
private Date createTime;
private Date updateTime;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/PolicemanDto.java
......@@ -13,6 +13,7 @@ public class PolicemanDto {
private String name;
private String cabinetBoxId;
private List<CabinetBoxPoliceDto> cabinetBoxList;
private String policeCode;
......@@ -34,7 +35,7 @@ public class PolicemanDto {
//组织机构id
private Long orgId;
private String idCard;
//警员状态
//状态
private Integer state;
//是否有对应的账号
private Boolean isCreatedAccount;
......@@ -61,7 +62,7 @@ public class PolicemanDto {
/**
* 人脸照片list
*/
private List<String> faceInfoList;
// private List<String> faceInfoList;
/**
* 指纹照片list
*/
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/CabinetBoxReq.java
......@@ -57,7 +57,14 @@ public class CabinetBoxReq extends BaseRequest {
@ApiModelProperty(value = "警员id")
private String policeId;
/**
* 箱门类型：1单警柜，2公共柜
*/
@ApiModelProperty(value = "箱门类型：1单警柜，2公共柜")
private String boxType;
private String cabinetName;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/PolicemanReq.java
......@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
@Data
@EqualsAndHashCode(callSuper = true)
......@@ -18,9 +19,13 @@ public class PolicemanReq extends BaseRequest {
@NotBlank(message = "姓名不能为空", groups = {add.class})
private String name;
@NotBlank(message = "箱门id不能为空", groups = {edit.class, delete.class})
@NotBlank(message = "箱门id不能为空", groups = { delete.class})
private String cabinetBoxId;
private String cabinetId;
private List<CabinetBoxReq> boxList;
@NotNull(message = "组织机构id不能为空",groups = {add.class,page.class})
private Long orgId;
......@@ -33,8 +38,8 @@ public class PolicemanReq extends BaseRequest {
private String faceInfo;
//1已生成，0未生成
private Integer isCreatedAccount;
//判断是否将系统账号和警员账号返回，如果是true，那么直接将警员返回，如果为空或者其他值，那么将系统账号和警员一起返回
private String flag;
private String doorCode;
......@@ -61,5 +66,8 @@ public class PolicemanReq extends BaseRequest {
private Integer state;
private String order;
private String column;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/SelectTotalNumReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query;
import lombok.Data;
import java.util.List;
@Data
public class SelectTotalNumReq {
private Long orgId;
private List<InventorySumReq> list;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdatePolicemanReq.java
......@@ -13,7 +13,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
public class UpdatePolicemanReq extends BaseRequest {
@NotBlank(message = "警员主键不能为空", groups = {edit.class, delete.class, detail.class,updateStatus.class})
@NotBlank(message = "警员主键不能为空", groups = {edit.class, delete.class, detail.class})
private String id;
@NotBlank(message = "警员名字不能为空", groups = {add.class,edit.class})
......@@ -80,6 +80,8 @@ public class UpdatePolicemanReq extends BaseRequest {
* 指纹照片list
*/
private List<String> fingerList;
@NotNull(message = "账号不能为空",groups = {updateStatus.class})
private Long userId;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/CabinetBoxExceptionEnum.java
package com.junmp.jyzb.api.exception.enums;
import com.junmp.jyzb.api.constant.JYZBConstant;
import com.junmp.v2.common.constant.CommonConstant;
import com.junmp.v2.common.exception.IExceptionEnum;
import lombok.Getter;
......@@ -16,6 +17,8 @@ public enum CabinetBoxExceptionEnum implements IExceptionEnum {
*/
CABINETBOX_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"箱子已经存在，箱门id重复"),
BOXS_ISNOT_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE+ JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 13, "{}"),
;
/**
* 错误编码
......
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/SupplierExceptionEnum.java
......@@ -63,6 +63,11 @@ public enum SupplierExceptionEnum implements IExceptionEnum {
* 标签重复
*/
TAG_INFO_REPEAT_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 23, "标签重复"),
/**
* 供应商信息不存在
*/
SUPPLIER_IS_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE, "供应商已存在"),
;
......
jyzb-biz/src/main/java/com/junmp/jyzb/Repository/BusFormRepository.java 0 → 100644
package com.junmp.jyzb.Repository;
import com.junmp.jyzb.entity.BusForm;
import com.junmp.jyzb.entity.ES.Blog;
import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
public interface BusFormRepository extends ElasticsearchRepository<BusForm, Long> {
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/BussinessController.java
......@@ -33,6 +33,7 @@ public class BussinessController {
@Resource
public BusFormService busFormService;
//创建业务单
@PostMapping("/AddBussinessOrder")
@ApiOperation("创建业务单")
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java
......@@ -259,5 +259,10 @@ public class InventoryController {
return ApiRes.success(inventorySummaryService.insertToSummary());
}
@PostMapping("/selectTotalNum")
@ApiOperation("根据组织机构和装备查询库存")
public ApiRes<List<InventorySumDto>> selectTotalNum(@RequestBody SelectTotalNumReq req){
return ApiRes.success(inventorySummaryService.selectTotalNum(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java
......@@ -72,9 +72,9 @@ public class PoliceController {
}
@PostMapping("/ChangePoliceState")
@ApiOperation("修改警员状态")
public ApiRes<Boolean> ChangePoliceState(@RequestBody @Validated(ValidationApi.updateStatus.class) UpdatePolicemanReq req) {
@PostMapping("/ChangeUserState")
@ApiOperation("修改账号状态")
public ApiRes<Boolean> ChangeUserState(@RequestBody @Validated(ValidationApi.updateStatus.class) UpdatePolicemanReq req) {
boolean b = policemanService.ChangePoliceState(req);
if (!b){
return ApiRes.failure("修改失败");
......@@ -186,14 +186,12 @@ public class PoliceController {
*/
@PostMapping("/PoliceBindBox")
@ApiOperation("人员绑定箱门")
public ApiRes<Boolean> PoliceBindBox(@RequestBody @Validated(ValidationApi.edit.class) PolicemanReq req){
boolean b = policemanService.PoliceBindBox(req);
if (!b){
return ApiRes.failure("操作失败");
}
return ApiRes.success(b);
public ApiRes<Boolean> PoliceBindBox(@RequestBody PolicemanReq req){
return ApiRes.success(policemanService.PoliceBindBox(req));
}
//删除账号的同时，将警员的信息进行更新
@PostMapping("/UpdatePoliceInfo")
@ApiOperation("删除警员账号，修改警员信息")
......@@ -235,4 +233,11 @@ public class PoliceController {
return ApiRes.success(policemanService.GetPoliceEqs(req));
}
//查询组织机构为null的警员
@PostMapping("/getPoliceWithoutOrg")
@ApiOperation("查询组织机构为空的警员")
public ApiRes<List<PolicemanDto>> getPoliceWithoutOrg(){
return ApiRes.success(policemanService.getPoliceWithoutOrg());
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PubOrgController.java
......@@ -67,4 +67,10 @@ public class PubOrgController {
public ApiRes<List<OrgDto>> getLowOrg(@RequestBody QueryOrgReq req) {
return ApiRes.success(pubOrgService.getLowOrg(req)) ;
}
//通过组织机构id获取上一层的组织机构数据
@PostMapping("getUpOrgInfo")
@ApiOperation("获取上级组织机构信息")
public ApiRes<OrgDto> getUpOrgInfo(@RequestBody QueryOrgReq req){
return ApiRes.success(pubOrgService.getUpOrgInfo(req));
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/entity/BusForm.java
......@@ -6,6 +6,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
import org.springframework.data.elasticsearch.annotations.Document;
/**
*
......@@ -13,6 +14,7 @@ import lombok.Data;
*/
@TableName(value ="bussiness_bus_form")
@Data
@Document(indexName = "busform", shards = 1, replicas = 1)
public class BusForm implements Serializable {
/**
* id
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/CabinetBox.java
......@@ -57,5 +57,13 @@ public class CabinetBox implements Serializable {
@TableField("log_map")
private String logMap;
/**
* 箱门类型：1单警柜，2公共柜
*/
@ApiModelProperty(value = "箱门类型：1单警柜，2公共柜")
@TableField("box_type")
private Integer boxType;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/entity/CabinetBoxPolice.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
*
* @TableName base_cabinet_box_police
*/
@TableName(value ="base_cabinet_box_police")
@Data
public class CabinetBoxPolice implements Serializable {
/**
*
*/
@TableField(value = "id")
private Long id;
/**
* 单警柜箱号
*/
@TableField(value = "cabinet_box_id")
private String cabinetBoxId;
/**
* 警员id
*/
@TableField(value = "police_id")
private String policeId;
/**
* 主柜号
*/
@TableField(value = "cabinet_id")
private String cabinetId;
/**
* 主柜号名称+箱门名称
*/
@TableField(value = "cabinet_name")
private String cabinetName;
@TableField(value = "num")
private Integer num;
/**
*
*/
@TableField(value = "create_time")
private Date createTime;
/**
*
*/
@TableField(value = "update_time")
private Date updateTime;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/listener/GlobalEndListener.java
package com.junmp.jyzb.listener;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -8,6 +9,7 @@ import com.junmp.junmpProcess.utils.RabbitMQUtils2;
//import com.rabbitmq.client.Channel;
//import com.rabbitmq.client.Connection;
import com.junmp.jyzb.api.bean.dto.OrderDto;
import com.junmp.jyzb.api.bean.query.BussinessOrderDetialReq;
import com.junmp.jyzb.api.bean.query.OrderMainReq;
import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
import com.junmp.jyzb.api.bean.req.UpdateOrderDetailReq;
......@@ -77,6 +79,10 @@ import java.util.stream.Collectors;
// 获取流程定义ID
String processDefinitionId = event.getProcessDefinitionId();
List<HistoricVariableInstance> orderType = historyService.createHistoricVariableInstanceQuery().processInstanceId(processInstanceId).variableName("orderType").list();
List<HistoricVariableInstance> bussinessType = historyService.createHistoricVariableInstanceQuery().processInstanceId(processInstanceId).variableName("bussinessType").list();
for (HistoricVariableInstance a:bussinessType) {
System.out.println("a = " + a);
}
if(orderType.size()>0) {
......@@ -110,6 +116,13 @@ import java.util.stream.Collectors;
BusForm busForm = busFormService.getOne(new LambdaQueryWrapper<BusForm>()
.eq(BusForm::getProcessId, processInstanceId));
busForm.setExamineState("finished");
// if (){
// String detailList = busForm.getDetailList();
// List<BussinessOrderDetialReq> list = JSON.parseArray(detailList, BussinessOrderDetialReq.class);
// for (:) {
//
// }
// }
busFormService.updateById(busForm);
}
if (Type.equals("reassigment")){//调岗申请单
......@@ -117,6 +130,7 @@ import java.util.stream.Collectors;
.eq(Reassignment::getProcessId, processInstanceId));
UpdateReassignmentReq updateReassignmentReq = new UpdateReassignmentReq();
BeanPlusUtil.copyProperties(one,updateReassignmentReq);
updateReassignmentReq.setExamineState("finished");
policemanService.changePoliceOrg(updateReassignmentReq);
}
if (Type.equals("stocktakeOrder")){//盘库申请单
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/CabinetBoxPoliceMapper.java 0 → 100644
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.entity.CabinetBoxPolice;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author lxh专属坐骑
* @description 针对表【base_cabinet_box_police】的数据库操作Mapper
* @createDate 2023-11-23 13:40:04
* @Entity com.junmp.jyzb.entity.CabinetBoxPolice
*/
public interface CabinetBoxPoliceMapper extends BaseMapper<CabinetBoxPolice> {
}
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventorySummaryMapper.java
......@@ -6,6 +6,7 @@ import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgEqsDto;
import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgEqsDto;
import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.api.bean.query.SelectTotalNumReq;
import com.junmp.jyzb.entity.InventorySummary;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......@@ -57,4 +58,7 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> {
FinalTjOrgEqsDto getSumByViewOrgeqsSum();
List<InventorySumDto> TjOrgEqsDetail(@Param("orgId") Long orgId, @Param("typeIdsList") List<String> typeIdsList, @Param("sizeNameList") List<String> sizeNameList);
List<InventorySumDto> selectTotalNum(@Param("orgId") Long orgId,@Param("list") List<Object[]> searchCriteria );
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PolicemanMapper.java
......@@ -44,5 +44,15 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
List<SysUserRoleDto> selectUserRoleInfo(@Param("userId") Long userId);
List<PolicemanDto> selectUserBypoliceIds(Long orgId, String account, String name, String policeCode, String phone, long l, Long pageSize);
List<PolicemanDto> selectUserBypoliceIds(@Param("orgId") Long orgId, @Param("account")String account,
@Param("name") String name, @Param("policeCode")String policeCode,
@Param("state")Integer state,
@Param("phone")String phone,@Param("flag") String flag,
@Param("pageNo")long pageNo, @Param("pageSize") Long pageSize,
@Param("column") String column,@Param("order") String order);
long count(@Param("orgId") Long orgId, @Param("account")String account,
@Param("name") String name, @Param("policeCode")String policeCode,
@Param("state")Integer state,
@Param("phone")String phone,@Param("flag") String flag);
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/service/BusFormService.java
......@@ -19,6 +19,10 @@ import java.util.List;
public interface BusFormService extends IService<BusForm> {
/**
* 创建ES
*/
Object addEs();
/**
* 创建业务单、修改业务单
* @return
*/
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/CabinetBoxPoliceService.java 0 → 100644
package com.junmp.jyzb.service;
import com.junmp.jyzb.entity.CabinetBoxPolice;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author lxh专属坐骑
* @description 针对表【base_cabinet_box_police】的数据库操作Service
* @createDate 2023-11-23 13:40:04
*/
public interface CabinetBoxPoliceService extends IService<CabinetBoxPolice> {
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/InventorySummaryService.java
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.dto.InventorySumDto;
import com.junmp.jyzb.api.bean.dto.NormalInOutDto;
import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.api.bean.query.SelectTotalNumReq;
import com.junmp.jyzb.api.bean.req.CabinetInOutRecordsReq;
import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
import com.junmp.jyzb.entity.InventorySummary;
......@@ -45,4 +46,6 @@ public interface InventorySummaryService extends IService<InventorySummary> {
boolean insertToSummary();
List<InventorySumDto> selectTotalNum(SelectTotalNumReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java
......@@ -42,7 +42,7 @@ public interface PolicemanService extends IService<Policeman> {
boolean AddFaceInfo(UpdatePolicemanReq req);
//修改警员状态
//修改用户状态
boolean ChangePoliceState(UpdatePolicemanReq req);
......@@ -98,4 +98,7 @@ public interface PolicemanService extends IService<Policeman> {
//添加人脸和指纹照片或修改
boolean addFaceAndfinger(UpdatePolicemanReq req);
//查询组织机构为null的警员
List<PolicemanDto> getPoliceWithoutOrg();
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/PubOrgService.java
......@@ -36,5 +36,6 @@ public interface PubOrgService extends IService<PubOrg> {
//根据组织机构id查询出组织机构是否存在
PubOrg PubOrgExist(Long id);
//通过组织机构id获取上一层的组织机构数据
OrgDto getUpOrgInfo(QueryOrgReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/BusFormServiceImpl.java
......@@ -8,18 +8,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
import com.junmp.junmpProcess.service.IFlowInstanceService;
import com.junmp.jyzb.Repository.BusFormRepository;
import com.junmp.jyzb.api.bean.dto.BusFormDto;
import com.junmp.jyzb.api.bean.dto.GeneratePurchaseQuicklyDto;
import com.junmp.jyzb.api.bean.query.BussinessOrderDetialReq;
import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.api.bean.query.QueryBusFormReq;
import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
import com.junmp.jyzb.api.bean.req.GeneratePurchaseQuicklyReq;
import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum;
import com.junmp.jyzb.entity.BusForm;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.jyzb.entity.OrderMain;
import com.junmp.jyzb.entity.OrderNum;
import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.InventorySummaryMapper;
import com.junmp.jyzb.service.BusFormService;
import com.junmp.jyzb.mapper.BusFormMapper;
......@@ -68,6 +67,14 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
@Resource
protected TaskService taskService;
@Resource
private BusFormRepository busFormRepository;
public Object addEs() {
List<BusForm> esDto=this.list();
return busFormRepository.saveAll(esDto);
}
/**
* 创建业务单
* @param req
......@@ -115,10 +122,11 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
busForm.setCreateTime(DateTimeUtil.getCurrentDateTime());
}
String processInstanceId=null;
StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
//执行工作流
if (req.getExamineState().equals("working"))
{
StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
startProcessInstanceDTO=new StartProcessInstanceDTO();
startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
startProcessInstanceDTO.setOrderId(busForm.getId());
startProcessInstanceDTO.setOrderType("bussinessOrder");
......@@ -163,8 +171,9 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
Task currentTask = taskService.createTaskQuery().processInstanceId(substring).singleResult();
// 直接完成当前任务
taskService.complete(currentTask.getId());
}else {
}else if (processInstanceId!=null){
busForm.setProcessId(processInstanceId);
String assigns= FlowInstanceService.GetNextAssign(processInstanceId);//这里需要手动更新审核人信息
busForm.setCurrentAssign(assigns);
if (ObjectUtil.isNotNull(req.getId()) && !req.getId().trim().isEmpty()) {
......@@ -174,8 +183,16 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
//保存
this.save(busForm);
}
}else {
if (ObjectUtil.isNotNull(req.getId()) && !req.getId().trim().isEmpty()) {
//已经是一个草稿，在点击提交的时候只需要更新即可，因为数据库中已经存在该单据
updateById(busForm);
} else {
//保存
this.save(busForm);
}
}
busFormRepository.save(busForm);
return busForm.getId();
}
......@@ -204,6 +221,22 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
BeanPlusUtil.copyProperties(busForm, busFormDto);
return busFormDto;
}).collect(Collectors.toList());
//余数
long num= size % 10;
//整数
long integer=size / 10;
List<BusFormDto> collect1=new ArrayList<>();
if (num!=0){
//判断整数是什么，就在第几页进行补
if(req.getPageNo()-1==integer){
for (int i = 0; i < 10-num; i++) {
BusFormDto busFormDto = new BusFormDto();
collect1.add(busFormDto);
}
}
collect.addAll(collect1);
}
Page<BusFormDto> page1=new Page<>(req.getPageNo(),req.getPageSize());
page1.setRecords(collect);
page1.setTotal(size);
......@@ -290,7 +323,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
private LambdaQueryWrapper<BusForm> createWrapper(QueryBusFormReq req) {
LambdaQueryWrapper<BusForm> eq = new LambdaQueryWrapper<BusForm>()
//组织机构
.eq(ObjectUtil.isNotNull(req.getOrgId()),BusForm::getOrgId,req.getOrgId())
.eq(ObjectUtil.isNotNull(req.getOrgId()) && !req.getBussinessType().equals("allocate"),BusForm::getOrgId,req.getOrgId())
//装备名称模糊查询
.like(ObjectUtil.isNotNull(req.getTypeName()),BusForm::getInvList,req.getTypeName())
......@@ -300,16 +333,16 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
.like(ObjectUtil.isNotNull(req.getReturnUser()),BusForm::getReturnUser,req.getReturnUser())
//经办人
.like(ObjectUtil.isNotNull(req.getAgent()),BusForm::getAgent,req.getAgent())
//供应商名称
//厂商名称
.like(ObjectUtil.isNotNull(req.getSupplierName()),BusForm::getSupplierName,req.getSupplierName())
//发物单位
.like(ObjectUtil.isNotNull(req.getStartOrgName()),BusForm::getStartOrgName,req.getStartOrgName())
//收物单位
.like(ObjectUtil.isNotNull(req.getEndOrgName()),BusForm::getEndOrgName,req.getEndOrgName())
//开始时间
.ge(ObjectUtil.isNotNull(req.getStartTime()), BusForm::getCreateTime, req.getStartTime())
.ge(ObjectUtil.isNotNull(req.getStartTime()),BusForm::getCreateTime, req.getStartTime())
//结束时间
.le(ObjectUtil.isNotNull(req.getEndTime()), BusForm::getCreateTime, req.getEndTime())
.le(ObjectUtil.isNotNull(req.getEndTime()),BusForm::getCreateTime, req.getEndTime())
.last("order by " + req.getColumn() + " " + req.getOrder());
//业务单据审核状态
......@@ -318,7 +351,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
List<String> examineStateList=new ArrayList<>();
examineStateList.add("none");
examineStateList.add("working");
eq.in(ObjectUtil.isNotNull(req.getExamineState() ) && !req.getExamineState().trim().isEmpty(), BusForm::getExamineState,examineStateList);
eq.in( BusForm::getExamineState,examineStateList);
} else if (ObjectUtil.isNotNull(req.getExamineState()) && req.getExamineState().equals("finished")) {
eq.eq(ObjectUtil.isNotNull(req.getExamineState() ) && !req.getExamineState().trim().isEmpty(), BusForm::getExamineState, req.getExamineState());
}
......@@ -328,14 +361,26 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
List<String> bussinessTypeList=new ArrayList<>();
bussinessTypeList.add("remove");
bussinessTypeList.add("destruction");
eq.in(ObjectUtil.isNotNull(req.getBussinessType() ) && !req.getBussinessType().trim().isEmpty(), BusForm::getBussinessType,bussinessTypeList);
eq.in( BusForm::getBussinessType,bussinessTypeList);
}else {
eq.eq(ObjectUtil.isNotNull(req.getBussinessType()) && !req.getBussinessType().trim().isEmpty(), BusForm::getBussinessType, req.getBussinessType());
}
if (ObjectUtil.isNotNull(req.getUserId())){
//当前登录人
eq.and(wrapper-> wrapper.eq(BusForm::getAgent,req.getUserId()).or().eq(BusForm::getCurrentAssign,req.getUserId()));
eq.and(wrapper-> wrapper.eq(BusForm::getAgentId,req.getUserId()).or().eq(BusForm::getCurrentAssign,req.getUserId()));
}
if (req.getBussinessType().equals("allocate")){
if (req.getStartOrgId()!=null){
eq.eq(BusForm::getStartOrgId,req.getStartOrgId());
}
if (req.getEndOrgId()!=null){
eq.eq(BusForm::getEndOrgId,req.getEndOrgId());
}
if (req.getStartOrgId()!=null && req.getEndOrgId()!=null){
eq.and(wrapper-> wrapper.eq(BusForm::getStartOrgId,req.getOrgId()).or().eq(BusForm::getEndOrgId,req.getOrgId()));
}
eq.eq(ObjectUtil.isNotNull(req.getAllocateType()) && !req.getAllocateType().isEmpty(),BusForm::getAllocateType,req.getAllocateType());
}
return eq;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/CabinetBoxPoliceServiceImpl.java 0 → 100644
package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.entity.CabinetBoxPolice;
import com.junmp.jyzb.service.CabinetBoxPoliceService;
import com.junmp.jyzb.mapper.CabinetBoxPoliceMapper;
import org.springframework.stereotype.Service;
/**
* @author lxh专属坐骑
* @description 针对表【base_cabinet_box_police】的数据库操作Service实现
* @createDate 2023-11-23 13:40:04
*/
@Service
public class CabinetBoxPoliceServiceImpl extends ServiceImpl<CabinetBoxPoliceMapper, CabinetBoxPolice>
implements CabinetBoxPoliceService{
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventorySummaryServiceImpl.java
......@@ -9,11 +9,14 @@ import com.junmp.jyzb.api.bean.dto.NormalInOutDto;
import com.junmp.jyzb.api.bean.dto.WarehouseDto;
import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.api.bean.query.SelectTotalNumReq;
import com.junmp.jyzb.api.bean.req.CabinetInOutRecordsReq;
import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
import com.junmp.jyzb.api.exception.enums.CabinetExceptionEnum;
import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.PriceSumSummaryMapper;
import com.junmp.jyzb.service.*;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.factory.PageFactory;
import com.junmp.v2.db.api.factory.PageResultFactory;
......@@ -262,6 +265,20 @@ public class InventorySummaryServiceImpl extends ServiceImpl<InventorySummaryMa
return true;
}
@Override
public List<InventorySumDto> selectTotalNum(SelectTotalNumReq req) {
List<Object[]> searchCriteria=new ArrayList<>();
if (req.getList().isEmpty()){
throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR) ;
}
for (InventorySumReq inventorySumReq:req.getList()) {
Object[] criteria=new Object[]{inventorySumReq.getTypeId(),inventorySumReq.getSizeId()};
searchCriteria.add(criteria);
}
List<InventorySumDto> inventorySumDtoList=inventorySummaryMapper.selectTotalNum(req.getOrgId(),searchCriteria);
return inventorySumDtoList;
}
private LambdaQueryWrapper<InventorySummary> createWrapper(InventorySumReq req) {
LambdaQueryWrapper<InventorySummary> wrapper = new LambdaQueryWrapper<>();
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java
......@@ -749,6 +749,16 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem
return puborg;
}
//通过组织机构id获取上一层的组织机构数据
@Override
public OrgDto getUpOrgInfo(QueryOrgReq req) {
Long orgParentId = getById(req.getOrgId()).getOrgParentId();
PubOrg pubOrg = getById(orgParentId);
OrgDto orgDto = new OrgDto();
BeanPlusUtil.copyProperties(pubOrg,orgDto);
return orgDto;
}
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.java
......@@ -31,6 +31,10 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
@Override
public String AddSupplier(UpdateSupplierReq req) {
Supplier one = getOne(new LambdaQueryWrapper<Supplier>().eq(Supplier::getName, req.getName()));
if (one != null){
throw new ServiceException(SupplierExceptionEnum.SUPPLIER_IS_EXIST);
}
Supplier supplier = new Supplier();
String ID=UUID.randomUUID().toString();
req.setId(ID);
......@@ -142,6 +146,8 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
}
//根据供应商短码查询查询
wrapper.like(ObjectUtil.isNotEmpty(req.getCode()), Supplier::getCode, req.getCode());
//类型
wrapper.eq(ObjectUtil.isNotEmpty(req.getAgencyType()), Supplier::getAgencyType, req.getAgencyType());
//供应商ID
wrapper.like(ObjectUtil.isNotEmpty(req.getId()), Supplier::getId, req.getId());
//供应商名称模糊查询
......
jyzb-biz/src/main/java/com/junmp/jyzb/utils/cacu.java 0 → 100644
package com.junmp.jyzb.utils;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.PageUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.junmp.jyzb.api.bean.dto.PolicemanDto;
import com.junmp.v2.db.api.page.PageResult;
import java.util.ArrayList;
import java.util.List;
public class cacu {
// public static <T> PageResult<T> createPageResult(List<T> info) {
//余数
// long num= size % 10;
// //整数
// long integer=size / 10;
// List<PolicemanDto> collect1=new ArrayList<>();
// if (num!=0){
// //判断整数是什么，就在第几页进行补
// if(req.getPageNo()-1==integer){
// for (int i = 0; i < 10-num; i++) {
// PolicemanDto policemanDto = new PolicemanDto();
// collect1.add(policemanDto);
// }
// }
// policemanDtos.addAll(collect1);
// }
// }
}
jyzb-biz/src/main/resources/mapper/CabinetBoxPoliceMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.CabinetBoxPoliceMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.CabinetBoxPolice">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="cabinetBoxId" column="cabinet_box_id" jdbcType="VARCHAR"/>
<result property="policeId" column="police_id" jdbcType="VARCHAR"/>
<result property="cabinetId" column="cabinet_id" jdbcType="VARCHAR"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
id,cabinet_box_id,police_id,
cabinet_id,create_time,update_time
</sql>
</mapper>
jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml
......@@ -446,4 +446,15 @@
size_name
ORDER BY type_id
</select>
<select id="selectTotalNum" resultType="com.junmp.jyzb.api.bean.dto.InventorySumDto">
<foreach collection="list" item="item" separator="union all">
SELECT COALESCE(SUM(stock_number), 0) as stock_number,
COALESCE(size_id,${item[0]}) as size_id ,
COALESCE( type_id,'${item[1]}') as type_id
FROM base_inventory_summary
WHERE org_id_int = #{orgId} and (type_id = ${item[0]} AND size_id = '${item[1]}')
</foreach>
</select>
</mapper>
\ No newline at end of file
jyzb-biz/src/main/resources/mapper/PolicemanMapper.xml
......@@ -248,7 +248,76 @@ WHERE o.org_id IN
join sys_role sr on sur.role_id=sr.role_id
WHERE su.user_id=#{userId}
</select>
<select id="selectUserBypoliceIds" resultType="com.junmp.jyzb.api.bean.dto.PolicemanDto">
select b.* FROM(
select
su.user_id,su.account,su.status_flag as state,suo.org_id,p.id,p.name,p.cabinet_box_id,p.police_code,
p.face_info,p.password,p.photo,p.phone,p.id_card,p.identity,su.create_time
FROM sys_user su
join sys_user_org suo on su.user_id=suo.user_id and suo.org_id=#{orgId}
left join base_policeman p on p.user_id=su.user_id
and p.org_id_int=#{orgId}
where 1=1
<if test="account!=null and account!=''">
and su.account like CONCAT('%', #{account}, '%')
</if>
<if test="policeCode!=null and policeCode!=''">
and p.police_code like CONCAT('%', #{policeCode}, '%')
</if>
<if test="name!=null and name!=''">
and p.name like CONCAT('%', #{name}, '%')
</if>
<if test="phone!=null and phone!=''">
and p.phone like CONCAT('%', #{phone}, '%')
</if>
<if test="state!=null and state!=''">
and su.status_flag=#{state}
</if>
) as b
<if test="flag == 'true'">
where b.id is not null
</if>
<if test="column != null and column != '' and order != null and order != '' ">
order by ${column} ${order}
</if>
<if test="pageNo!=null and pageNo!='' and pageSize!=null and pageSize!=''">
limit #{pageNo},#{pageSize}
</if>
</select>
<select id="count" resultType="java.lang.Long">
select count(*) from(
select b.* FROM
(select
su.user_id,su.account,su.status_flag as state,suo.org_id,p.id,p.name,p.cabinet_box_id,p.police_code,p.face_info,p.password,p.photo,p.phone,p.id_card,p.identity,p.hk_face_device
FROM sys_user su
join sys_user_org suo on su.user_id=suo.user_id and suo.org_id=#{orgId}
left join base_policeman p on p.user_id=su.user_id
and p.org_id_int=#{orgId}
where 1=1
<if test="account!=null and account!=''">
and su.account like CONCAT('%', #{account}, '%')
</if>
<if test="policeCode!=null and policeCode!=''">
and p.police_code like CONCAT('%', #{policeCode}, '%')
</if>
<if test="name!=null and name!=''">
and p.name like CONCAT('%', #{name}, '%')
</if>
<if test="phone!=null and phone!=''">
and p.phone like CONCAT('%', #{phone}, '%')
</if>
<if test="state!=null and state!=''">
and su.status_flag=#{state}
</if>
) as b
<if test="flag == 'true'">
where b.id is not null
</if>
)
as f
</select>
</mapper>
\ No newline at end of file
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowInstanceServiceImpl.java
......@@ -187,10 +187,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
return "skip"+processInstance.getId();
}
else{
List<Task> list = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list();
for (Task a:list) {
System.out.println("a = " + a);
}
Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list().get(0);
task.setAssignee(StartUser.getUserId().toString());
return processInstance.getProcessInstanceId();
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java
......@@ -23,6 +23,7 @@ import com.junmp.junmpProcess.service.IFlowInstanceService;
import com.junmp.junmpProcess.service.IFlowTaskService;
import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
import com.junmp.junmpProcess.vo.*;
import com.junmp.jyzb.api.bean.dto.BusFormDto;
import com.junmp.v2.auth.api.bean.login.LoginUser;
import com.junmp.v2.auth.api.context.LoginContext;
import com.junmp.v2.common.bean.response.ApiRes;
......@@ -264,7 +265,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
StartUser= sysUserService.getById(LoginContext.getContext().getLoginUser());
}
TaskQuery taskQuery = taskService.createTaskQuery().taskAssignee(StartUser.getUserId().toString())
.includeProcessVariables()
.includeProcessVariables().taskCreatedAfter(taskDTO.getStartTime()).taskCreatedBefore(taskDTO.getEndTime())
.orderByTaskCreateTime().desc();
//条件查询（流程名称，开始时间，结束时间,发物单位，装备名称）
if (ObjectUtil.isNotNull(taskDTO.getProcessDefinitionName()) && ! taskDTO.getProcessDefinitionName().trim().isEmpty()){
......@@ -291,18 +292,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}else if (ObjectUtil.isNotNull(taskDTO.getBusinessStatus()) && taskDTO.getBusinessStatus().equals("已结束")){
taskQuery=taskQuery.processVariableValueEquals(PROCESS_STATUS,taskDTO.getBusinessStatus());
}
// //开始时间
// if (ObjectUtil.isNotNull(taskDTO.getStartTime())) {
// taskQuery = taskQuery.taskCreatedAfter(taskDTO.getStartTime());
// taskQuery.taskDueAfter(taskDTO.getStartTime());
//
// }
// //结束时间
// if (ObjectUtil.isNotNull(taskDTO.getEndTime())){
// taskQuery=taskQuery.taskCreatedBefore(taskDTO.getEndTime());
// taskQuery.taskDueBefore(taskDTO.getEndTime());
// }
// taskQuery.
List<Task> tasks = taskQuery.listPage((taskDTO.getPageNo() - 1) * taskDTO.getPageSize(), taskDTO.getPageSize());
//根据条件查询符合条件的数据并统计数量条数
long count = taskQuery.count();
......@@ -344,6 +334,21 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}
taskVOS.add(taskVO);
}
// //余数
long num= count % 10;
//整数
long integer=count / 10;
List<TaskVO> taskVOList=new ArrayList<>();
if (num!=0){
//判断整数是什么，就在第几页进行补
if(taskDTO.getPageNo()-1==integer){
for (int i = 0; i < 10-num; i++) {
TaskVO taskVO=new TaskVO();
taskVOList.add(taskVO);
}
}
taskVOS.addAll(taskVOList);
}
page.setRecords(taskVOS);
page.setTotal(count);
......@@ -365,7 +370,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}
HistoricTaskInstanceQuery historicTaskQuery = historyService.createHistoricTaskInstanceQuery()
.taskAssignee(StartUser.getUserId().toString())
.finished()
.finished().taskCreatedAfter(taskDTO.getStartTime()).taskCreatedBefore(taskDTO.getEndTime())
.includeCaseVariables().includeProcessVariables().includeTaskLocalVariables().includeIdentityLinks()
.orderByTaskCreateTime().desc();
......@@ -373,15 +378,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
if (ObjectUtil.isNotNull(taskDTO.getProcessDefinitionName()) && ! taskDTO.getProcessDefinitionName().trim().isEmpty()){
historicTaskQuery = historicTaskQuery.processDefinitionNameLike("%"+taskDTO.getProcessDefinitionName()+"%");
}
//开始时间
// if (ObjectUtil.isNotNull(taskDTO.getStartTime())) {
// historicTaskQuery = historicTaskQuery.taskCompletedAfter(taskDTO.getStartTime());
//
// }
// //结束时间
// if (ObjectUtil.isNotNull(taskDTO.getEndTime())){
// historicTaskQuery = historicTaskQuery.taskCompletedAfter(taskDTO.getEndTime());
// }
//装备名称
if (ObjectUtil.isNotNull(taskDTO.getTypeName()) && ! taskDTO.getTypeName().trim().isEmpty()){
historicTaskQuery=historicTaskQuery.processVariableValueLike(INVLIST,"%"+taskDTO.getTypeName()+"%");
......@@ -463,7 +460,21 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
taskVO.setDuration(spendTimes);
taskVOS.add(taskVO);
}
//余数
long num= count % 10;
//整数
long integer=count / 10;
List<TaskVO> taskVOList=new ArrayList<>();
if (num!=0){
//判断整数是什么，就在第几页进行补
if(taskDTO.getPageNo()-1==integer){
for (int i = 0; i < 10-num; i++) {
TaskVO taskVO = new TaskVO();
taskVOList.add(taskVO);
}
}
taskVOS.addAll(taskVOList);
}
page.setRecords(taskVOS);
page.setCurrent(taskDTO.getPageNo());
page.setSize(taskDTO.getPageSize());
......@@ -575,6 +586,22 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
historyProcessInstanceVO.setDuration(spendTimes);
historyProcessInstanceVOS.add(historyProcessInstanceVO);
}
//余数
long num= count % 10;
//整数
long integer=count / 10;
List<HistoryProcessInstanceVO> historyProcessInstanceVOList=new ArrayList<>();
if (num!=0){
//判断整数是什么，就在第几页进行补
if(applyDTO.getPageNo()-1==integer){
for (int i = 0; i < 10-num; i++) {
HistoryProcessInstanceVO historyProcessInstanceVO = new HistoryProcessInstanceVO();
historyProcessInstanceVOList.add(historyProcessInstanceVO);
}
}
historyProcessInstanceVOS.addAll(historyProcessInstanceVOList);
}
pageResult.setRecords(historyProcessInstanceVOS);
// pageResult.setTotalRows(Long.valueOf(applyDTO.getPageNo()));
pageResult.setTotalRows(count);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论