Skip to content

J
jyzb_platformV2
Commit 8fa04ff9 by 李小惠
Options

修改人员信息

parent e67b6c45
正在显示 包含 758 行增加 和 167 行删除
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 { ...@@ -13,6 +13,7 @@ public class PolicemanDto {
private String name; private String name;
private String cabinetBoxId; private String cabinetBoxId;
private List<CabinetBoxPoliceDto> cabinetBoxList;
private String policeCode; private String policeCode;
...@@ -34,7 +35,7 @@ public class PolicemanDto { ...@@ -34,7 +35,7 @@ public class PolicemanDto {
//组织机构id //组织机构id
private Long orgId; private Long orgId;
private String idCard; private String idCard;
//警员状态 //状态
private Integer state; private Integer state;
//是否有对应的账号 //是否有对应的账号
private Boolean isCreatedAccount; private Boolean isCreatedAccount;
...@@ -61,7 +62,7 @@ public class PolicemanDto { ...@@ -61,7 +62,7 @@ public class PolicemanDto {
/** /**
* 人脸照片list * 人脸照片list
*/ */
private List<String> faceInfoList; // private List<String> faceInfoList;
/** /**
* 指纹照片list * 指纹照片list
*/ */
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/CabinetBoxReq.java
...@@ -57,7 +57,14 @@ public class CabinetBoxReq extends BaseRequest { ...@@ -57,7 +57,14 @@ public class CabinetBoxReq extends BaseRequest {
@ApiModelProperty(value = "警员id") @ApiModelProperty(value = "警员id")
private String policeId; private String policeId;
/**
* 箱门类型：1单警柜，2公共柜
*/
@ApiModelProperty(value = "箱门类型：1单警柜，2公共柜")
private String boxType;
private String cabinetName;
private static final long serialVersionUID = 1L; 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; ...@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
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)
...@@ -18,9 +19,13 @@ public class PolicemanReq extends BaseRequest { ...@@ -18,9 +19,13 @@ public class PolicemanReq extends BaseRequest {
@NotBlank(message = "姓名不能为空", groups = {add.class}) @NotBlank(message = "姓名不能为空", groups = {add.class})
private String name; private String name;
@NotBlank(message = "箱门id不能为空", groups = {edit.class, delete.class}) @NotBlank(message = "箱门id不能为空", groups = { delete.class})
private String cabinetBoxId; private String cabinetBoxId;
private String cabinetId;
private List<CabinetBoxReq> boxList;
@NotNull(message = "组织机构id不能为空",groups = {add.class,page.class}) @NotNull(message = "组织机构id不能为空",groups = {add.class,page.class})
private Long orgId; private Long orgId;
...@@ -33,8 +38,8 @@ public class PolicemanReq extends BaseRequest { ...@@ -33,8 +38,8 @@ public class PolicemanReq extends BaseRequest {
private String faceInfo; private String faceInfo;
//1已生成，0未生成 //判断是否将系统账号和警员账号返回，如果是true，那么直接将警员返回，如果为空或者其他值，那么将系统账号和警员一起返回
private Integer isCreatedAccount; private String flag;
private String doorCode; private String doorCode;
...@@ -61,5 +66,8 @@ public class PolicemanReq extends BaseRequest { ...@@ -61,5 +66,8 @@ public class PolicemanReq extends BaseRequest {
private Integer state; private Integer state;
private String order;
private String column;
private static final long serialVersionUID = 1L; 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; ...@@ -13,7 +13,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class UpdatePolicemanReq extends BaseRequest { 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; private String id;
@NotBlank(message = "警员名字不能为空", groups = {add.class,edit.class}) @NotBlank(message = "警员名字不能为空", groups = {add.class,edit.class})
...@@ -80,6 +80,8 @@ public class UpdatePolicemanReq extends BaseRequest { ...@@ -80,6 +80,8 @@ public class UpdatePolicemanReq extends BaseRequest {
* 指纹照片list * 指纹照片list
*/ */
private List<String> fingerList; private List<String> fingerList;
@NotNull(message = "账号不能为空",groups = {updateStatus.class})
private Long userId; private Long userId;
private static final long serialVersionUID = 1L; 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; 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.constant.CommonConstant;
import com.junmp.v2.common.exception.IExceptionEnum; import com.junmp.v2.common.exception.IExceptionEnum;
import lombok.Getter; import lombok.Getter;
...@@ -16,6 +17,8 @@ public enum CabinetBoxExceptionEnum implements IExceptionEnum { ...@@ -16,6 +17,8 @@ public enum CabinetBoxExceptionEnum implements IExceptionEnum {
*/ */
CABINETBOX_IS_EXISTS(CommonConstant.DEFAULT_USER_ERROR_CODE,"箱子已经存在，箱门id重复"), 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 { ...@@ -63,6 +63,11 @@ public enum SupplierExceptionEnum implements IExceptionEnum {
* 标签重复 * 标签重复
*/ */
TAG_INFO_REPEAT_ERROR(CommonConstant.DEFAULT_USER_ERROR_CODE + JYZBConstant.JYZB_EXCEPTION_STEP_CODE + 23, "标签重复"), 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 { ...@@ -33,6 +33,7 @@ public class BussinessController {
@Resource @Resource
public BusFormService busFormService; public BusFormService busFormService;
//创建业务单 //创建业务单
@PostMapping("/AddBussinessOrder") @PostMapping("/AddBussinessOrder")
@ApiOperation("创建业务单") @ApiOperation("创建业务单")
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java
...@@ -259,5 +259,10 @@ public class InventoryController { ...@@ -259,5 +259,10 @@ public class InventoryController {
return ApiRes.success(inventorySummaryService.insertToSummary()); 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 { ...@@ -72,9 +72,9 @@ public class PoliceController {
} }
@PostMapping("/ChangePoliceState") @PostMapping("/ChangeUserState")
@ApiOperation("修改警员状态") @ApiOperation("修改账号状态")
public ApiRes<Boolean> ChangePoliceState(@RequestBody @Validated(ValidationApi.updateStatus.class) UpdatePolicemanReq req) { public ApiRes<Boolean> ChangeUserState(@RequestBody @Validated(ValidationApi.updateStatus.class) UpdatePolicemanReq req) {
boolean b = policemanService.ChangePoliceState(req); boolean b = policemanService.ChangePoliceState(req);
if (!b){ if (!b){
return ApiRes.failure("修改失败"); return ApiRes.failure("修改失败");
...@@ -186,14 +186,12 @@ public class PoliceController { ...@@ -186,14 +186,12 @@ public class PoliceController {
*/ */
@PostMapping("/PoliceBindBox") @PostMapping("/PoliceBindBox")
@ApiOperation("人员绑定箱门") @ApiOperation("人员绑定箱门")
public ApiRes<Boolean> PoliceBindBox(@RequestBody @Validated(ValidationApi.edit.class) PolicemanReq req){ public ApiRes<Boolean> PoliceBindBox(@RequestBody PolicemanReq req){
boolean b = policemanService.PoliceBindBox(req);
if (!b){ return ApiRes.success(policemanService.PoliceBindBox(req));
return ApiRes.failure("操作失败");
}
return ApiRes.success(b);
} }
//删除账号的同时，将警员的信息进行更新 //删除账号的同时，将警员的信息进行更新
@PostMapping("/UpdatePoliceInfo") @PostMapping("/UpdatePoliceInfo")
@ApiOperation("删除警员账号，修改警员信息") @ApiOperation("删除警员账号，修改警员信息")
...@@ -235,4 +233,11 @@ public class PoliceController { ...@@ -235,4 +233,11 @@ public class PoliceController {
return ApiRes.success(policemanService.GetPoliceEqs(req)); 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 { ...@@ -67,4 +67,10 @@ public class PubOrgController {
public ApiRes<List<OrgDto>> getLowOrg(@RequestBody QueryOrgReq req) { public ApiRes<List<OrgDto>> getLowOrg(@RequestBody QueryOrgReq req) {
return ApiRes.success(pubOrgService.getLowOrg(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; ...@@ -6,6 +6,7 @@ import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.Data; import lombok.Data;
import org.springframework.data.elasticsearch.annotations.Document;
/** /**
* *
...@@ -13,6 +14,7 @@ import lombok.Data; ...@@ -13,6 +14,7 @@ import lombok.Data;
*/ */
@TableName(value ="bussiness_bus_form") @TableName(value ="bussiness_bus_form")
@Data @Data
@Document(indexName = "busform", shards = 1, replicas = 1)
public class BusForm implements Serializable { public class BusForm implements Serializable {
/** /**
* id * id
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/CabinetBox.java
...@@ -57,5 +57,13 @@ public class CabinetBox implements Serializable { ...@@ -57,5 +57,13 @@ public class CabinetBox implements Serializable {
@TableField("log_map") @TableField("log_map")
private String logMap; private String logMap;
/**
* 箱门类型：1单警柜，2公共柜
*/
@ApiModelProperty(value = "箱门类型：1单警柜，2公共柜")
@TableField("box_type")
private Integer boxType;
private static final long serialVersionUID = 1L; 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; package com.junmp.jyzb.listener;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...@@ -8,6 +9,7 @@ import com.junmp.junmpProcess.utils.RabbitMQUtils2; ...@@ -8,6 +9,7 @@ import com.junmp.junmpProcess.utils.RabbitMQUtils2;
//import com.rabbitmq.client.Channel; //import com.rabbitmq.client.Channel;
//import com.rabbitmq.client.Connection; //import com.rabbitmq.client.Connection;
import com.junmp.jyzb.api.bean.dto.OrderDto; 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.query.OrderMainReq;
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;
...@@ -77,6 +79,10 @@ import java.util.stream.Collectors; ...@@ -77,6 +79,10 @@ import java.util.stream.Collectors;
// 获取流程定义ID // 获取流程定义ID
String processDefinitionId = event.getProcessDefinitionId(); String processDefinitionId = event.getProcessDefinitionId();
List<HistoricVariableInstance> orderType = historyService.createHistoricVariableInstanceQuery().processInstanceId(processInstanceId).variableName("orderType").list(); 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) { if(orderType.size()>0) {
...@@ -110,6 +116,13 @@ import java.util.stream.Collectors; ...@@ -110,6 +116,13 @@ import java.util.stream.Collectors;
BusForm busForm = busFormService.getOne(new LambdaQueryWrapper<BusForm>() BusForm busForm = busFormService.getOne(new LambdaQueryWrapper<BusForm>()
.eq(BusForm::getProcessId, processInstanceId)); .eq(BusForm::getProcessId, processInstanceId));
busForm.setExamineState("finished"); busForm.setExamineState("finished");
// if (){
// String detailList = busForm.getDetailList();
// List<BussinessOrderDetialReq> list = JSON.parseArray(detailList, BussinessOrderDetialReq.class);
// for (:) {
//
// }
// }
busFormService.updateById(busForm); busFormService.updateById(busForm);
} }
if (Type.equals("reassigment")){//调岗申请单 if (Type.equals("reassigment")){//调岗申请单
...@@ -117,6 +130,7 @@ import java.util.stream.Collectors; ...@@ -117,6 +130,7 @@ import java.util.stream.Collectors;
.eq(Reassignment::getProcessId, processInstanceId)); .eq(Reassignment::getProcessId, processInstanceId));
UpdateReassignmentReq updateReassignmentReq = new UpdateReassignmentReq(); UpdateReassignmentReq updateReassignmentReq = new UpdateReassignmentReq();
BeanPlusUtil.copyProperties(one,updateReassignmentReq); BeanPlusUtil.copyProperties(one,updateReassignmentReq);
updateReassignmentReq.setExamineState("finished");
policemanService.changePoliceOrg(updateReassignmentReq); policemanService.changePoliceOrg(updateReassignmentReq);
} }
if (Type.equals("stocktakeOrder")){//盘库申请单 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; ...@@ -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.dto.TjDto.TjOrgEqsDto;
import com.junmp.jyzb.api.bean.query.InventoryReq; import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.api.bean.query.InventorySumReq; import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.api.bean.query.SelectTotalNumReq;
import com.junmp.jyzb.entity.InventorySummary; import com.junmp.jyzb.entity.InventorySummary;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -57,4 +58,7 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> { ...@@ -57,4 +58,7 @@ public interface InventorySummaryMapper extends BaseMapper<InventorySummary> {
FinalTjOrgEqsDto getSumByViewOrgeqsSum(); FinalTjOrgEqsDto getSumByViewOrgeqsSum();
List<InventorySumDto> TjOrgEqsDetail(@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, @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> { ...@@ -44,5 +44,15 @@ public interface PolicemanMapper extends BaseMapper<Policeman> {
List<SysUserRoleDto> selectUserRoleInfo(@Param("userId") Long userId); 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; ...@@ -19,6 +19,10 @@ import java.util.List;
public interface BusFormService extends IService<BusForm> { public interface BusFormService extends IService<BusForm> {
/** /**
* 创建ES
*/
Object addEs();
/**
* 创建业务单、修改业务单 * 创建业务单、修改业务单
* @return * @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; ...@@ -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.InventorySumDto;
import com.junmp.jyzb.api.bean.dto.NormalInOutDto; import com.junmp.jyzb.api.bean.dto.NormalInOutDto;
import com.junmp.jyzb.api.bean.query.InventorySumReq; 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.CabinetInOutRecordsReq;
import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq; import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq;
import com.junmp.jyzb.entity.InventorySummary; import com.junmp.jyzb.entity.InventorySummary;
...@@ -45,4 +46,6 @@ public interface InventorySummaryService extends IService<InventorySummary> { ...@@ -45,4 +46,6 @@ public interface InventorySummaryService extends IService<InventorySummary> {
boolean insertToSummary(); 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> { ...@@ -42,7 +42,7 @@ public interface PolicemanService extends IService<Policeman> {
boolean AddFaceInfo(UpdatePolicemanReq req); boolean AddFaceInfo(UpdatePolicemanReq req);
//修改警员状态 //修改用户状态
boolean ChangePoliceState(UpdatePolicemanReq req); boolean ChangePoliceState(UpdatePolicemanReq req);
...@@ -98,4 +98,7 @@ public interface PolicemanService extends IService<Policeman> { ...@@ -98,4 +98,7 @@ public interface PolicemanService extends IService<Policeman> {
//添加人脸和指纹照片或修改 //添加人脸和指纹照片或修改
boolean addFaceAndfinger(UpdatePolicemanReq req); 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> { ...@@ -36,5 +36,6 @@ public interface PubOrgService extends IService<PubOrg> {
//根据组织机构id查询出组织机构是否存在 //根据组织机构id查询出组织机构是否存在
PubOrg PubOrgExist(Long 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; ...@@ -8,18 +8,17 @@ 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.junmpProcess.dto.StartProcessInstanceDTO; import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
import com.junmp.junmpProcess.service.IFlowInstanceService; 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.BusFormDto;
import com.junmp.jyzb.api.bean.dto.GeneratePurchaseQuicklyDto; import com.junmp.jyzb.api.bean.dto.GeneratePurchaseQuicklyDto;
import com.junmp.jyzb.api.bean.query.BussinessOrderDetialReq; import com.junmp.jyzb.api.bean.query.BussinessOrderDetialReq;
import com.junmp.jyzb.api.bean.query.InventorySumReq; import com.junmp.jyzb.api.bean.query.InventorySumReq;
import com.junmp.jyzb.api.bean.query.QueryBusFormReq; 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.GeneratePurchaseQuicklyReq;
import com.junmp.jyzb.api.bean.req.UpdateBusFormReq; import com.junmp.jyzb.api.bean.req.UpdateBusFormReq;
import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum; import com.junmp.jyzb.api.exception.enums.OrderExceptionEnum;
import com.junmp.jyzb.entity.BusForm; import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.entity.InventorySummary;
import com.junmp.jyzb.entity.OrderMain;
import com.junmp.jyzb.entity.OrderNum;
import com.junmp.jyzb.mapper.InventorySummaryMapper; import com.junmp.jyzb.mapper.InventorySummaryMapper;
import com.junmp.jyzb.service.BusFormService; import com.junmp.jyzb.service.BusFormService;
import com.junmp.jyzb.mapper.BusFormMapper; import com.junmp.jyzb.mapper.BusFormMapper;
...@@ -68,6 +67,14 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl ...@@ -68,6 +67,14 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
@Resource @Resource
protected TaskService taskService; protected TaskService taskService;
@Resource
private BusFormRepository busFormRepository;
public Object addEs() {
List<BusForm> esDto=this.list();
return busFormRepository.saveAll(esDto);
}
/** /**
* 创建业务单 * 创建业务单
* @param req * @param req
...@@ -115,10 +122,11 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl ...@@ -115,10 +122,11 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
busForm.setCreateTime(DateTimeUtil.getCurrentDateTime()); busForm.setCreateTime(DateTimeUtil.getCurrentDateTime());
} }
String processInstanceId=null; String processInstanceId=null;
StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
//执行工作流 //执行工作流
if (req.getExamineState().equals("working")) if (req.getExamineState().equals("working"))
{ {
StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO(); startProcessInstanceDTO=new StartProcessInstanceDTO();
startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId()); startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
startProcessInstanceDTO.setOrderId(busForm.getId()); startProcessInstanceDTO.setOrderId(busForm.getId());
startProcessInstanceDTO.setOrderType("bussinessOrder"); startProcessInstanceDTO.setOrderType("bussinessOrder");
...@@ -163,8 +171,9 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl ...@@ -163,8 +171,9 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
Task currentTask = taskService.createTaskQuery().processInstanceId(substring).singleResult(); Task currentTask = taskService.createTaskQuery().processInstanceId(substring).singleResult();
// 直接完成当前任务 // 直接完成当前任务
taskService.complete(currentTask.getId()); taskService.complete(currentTask.getId());
}else { }else if (processInstanceId!=null){
busForm.setProcessId(processInstanceId); busForm.setProcessId(processInstanceId);
String assigns= FlowInstanceService.GetNextAssign(processInstanceId);//这里需要手动更新审核人信息 String assigns= FlowInstanceService.GetNextAssign(processInstanceId);//这里需要手动更新审核人信息
busForm.setCurrentAssign(assigns); busForm.setCurrentAssign(assigns);
if (ObjectUtil.isNotNull(req.getId()) && !req.getId().trim().isEmpty()) { if (ObjectUtil.isNotNull(req.getId()) && !req.getId().trim().isEmpty()) {
...@@ -174,8 +183,16 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl ...@@ -174,8 +183,16 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
//保存 //保存
this.save(busForm); 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(); return busForm.getId();
} }
...@@ -204,6 +221,22 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl ...@@ -204,6 +221,22 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
BeanPlusUtil.copyProperties(busForm, busFormDto); BeanPlusUtil.copyProperties(busForm, busFormDto);
return busFormDto; return busFormDto;
}).collect(Collectors.toList()); }).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()); Page<BusFormDto> page1=new Page<>(req.getPageNo(),req.getPageSize());
page1.setRecords(collect); page1.setRecords(collect);
page1.setTotal(size); page1.setTotal(size);
...@@ -290,7 +323,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl ...@@ -290,7 +323,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
private LambdaQueryWrapper<BusForm> createWrapper(QueryBusFormReq req) { private LambdaQueryWrapper<BusForm> createWrapper(QueryBusFormReq req) {
LambdaQueryWrapper<BusForm> eq = new LambdaQueryWrapper<BusForm>() 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()) .like(ObjectUtil.isNotNull(req.getTypeName()),BusForm::getInvList,req.getTypeName())
...@@ -300,16 +333,16 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl ...@@ -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.getReturnUser()),BusForm::getReturnUser,req.getReturnUser())
//经办人 //经办人
.like(ObjectUtil.isNotNull(req.getAgent()),BusForm::getAgent,req.getAgent()) .like(ObjectUtil.isNotNull(req.getAgent()),BusForm::getAgent,req.getAgent())
//供应商名称 //厂商名称
.like(ObjectUtil.isNotNull(req.getSupplierName()),BusForm::getSupplierName,req.getSupplierName()) .like(ObjectUtil.isNotNull(req.getSupplierName()),BusForm::getSupplierName,req.getSupplierName())
//发物单位 //发物单位
.like(ObjectUtil.isNotNull(req.getStartOrgName()),BusForm::getStartOrgName,req.getStartOrgName()) .like(ObjectUtil.isNotNull(req.getStartOrgName()),BusForm::getStartOrgName,req.getStartOrgName())
//收物单位 //收物单位
.like(ObjectUtil.isNotNull(req.getEndOrgName()),BusForm::getEndOrgName,req.getEndOrgName()) .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()); .last("order by " + req.getColumn() + " " + req.getOrder());
//业务单据审核状态 //业务单据审核状态
...@@ -318,7 +351,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl ...@@ -318,7 +351,7 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
List<String> examineStateList=new ArrayList<>(); List<String> examineStateList=new ArrayList<>();
examineStateList.add("none"); examineStateList.add("none");
examineStateList.add("working"); 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")) { } else if (ObjectUtil.isNotNull(req.getExamineState()) && req.getExamineState().equals("finished")) {
eq.eq(ObjectUtil.isNotNull(req.getExamineState() ) && !req.getExamineState().trim().isEmpty(), BusForm::getExamineState, req.getExamineState()); 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 ...@@ -328,14 +361,26 @@ public class BusFormServiceImpl extends ServiceImpl<BusFormMapper, BusForm> impl
List<String> bussinessTypeList=new ArrayList<>(); List<String> bussinessTypeList=new ArrayList<>();
bussinessTypeList.add("remove"); bussinessTypeList.add("remove");
bussinessTypeList.add("destruction"); bussinessTypeList.add("destruction");
eq.in(ObjectUtil.isNotNull(req.getBussinessType() ) && !req.getBussinessType().trim().isEmpty(), BusForm::getBussinessType,bussinessTypeList); eq.in( BusForm::getBussinessType,bussinessTypeList);
}else { }else {
eq.eq(ObjectUtil.isNotNull(req.getBussinessType()) && !req.getBussinessType().trim().isEmpty(), BusForm::getBussinessType, req.getBussinessType()); eq.eq(ObjectUtil.isNotNull(req.getBussinessType()) && !req.getBussinessType().trim().isEmpty(), BusForm::getBussinessType, req.getBussinessType());
} }
if (ObjectUtil.isNotNull(req.getUserId())){ 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; 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; ...@@ -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.dto.WarehouseDto;
import com.junmp.jyzb.api.bean.query.InventoryReq; import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.api.bean.query.InventorySumReq; 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.CabinetInOutRecordsReq;
import com.junmp.jyzb.api.bean.req.RabbitMqOrderReq; 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.entity.*;
import com.junmp.jyzb.mapper.PriceSumSummaryMapper; import com.junmp.jyzb.mapper.PriceSumSummaryMapper;
import com.junmp.jyzb.service.*; import com.junmp.jyzb.service.*;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil; import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.factory.PageFactory; import com.junmp.v2.db.api.factory.PageFactory;
import com.junmp.v2.db.api.factory.PageResultFactory; import com.junmp.v2.db.api.factory.PageResultFactory;
...@@ -262,6 +265,20 @@ public class InventorySummaryServiceImpl extends ServiceImpl<InventorySummaryMa ...@@ -262,6 +265,20 @@ public class InventorySummaryServiceImpl extends ServiceImpl<InventorySummaryMa
return true; 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) { private LambdaQueryWrapper<InventorySummary> createWrapper(InventorySumReq req) {
LambdaQueryWrapper<InventorySummary> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<InventorySummary> wrapper = new LambdaQueryWrapper<>();
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
package com.junmp.jyzb.service.impl; package com.junmp.jyzb.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
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.fasterxml.jackson.databind.ObjectMapper;
import com.junmp.junmpProcess.dto.StartProcessInstanceDTO; import com.junmp.junmpProcess.dto.StartProcessInstanceDTO;
import com.junmp.junmpProcess.exception.WorkFlowException;
import com.junmp.junmpProcess.service.IFlowInstanceService; import com.junmp.junmpProcess.service.IFlowInstanceService;
import com.junmp.jyzb.api.bean.dto.*; import com.junmp.jyzb.api.bean.dto.*;
import com.junmp.jyzb.api.bean.query.CabinetBoxReq;
import com.junmp.jyzb.api.bean.query.CabinetReq; import com.junmp.jyzb.api.bean.query.CabinetReq;
import com.junmp.jyzb.api.bean.query.PolicemanReq; import com.junmp.jyzb.api.bean.query.PolicemanReq;
import com.junmp.jyzb.api.bean.query.QueryReassignmentReq; import com.junmp.jyzb.api.bean.query.QueryReassignmentReq;
import com.junmp.jyzb.api.bean.req.FormEqsReq;
import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq; import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
import com.junmp.jyzb.api.bean.req.UpdateReassignmentReq; import com.junmp.jyzb.api.bean.req.UpdateReassignmentReq;
import com.junmp.jyzb.api.exception.JYZBAppException;
import com.junmp.jyzb.api.exception.enums.*; import com.junmp.jyzb.api.exception.enums.*;
import com.junmp.jyzb.entity.*; import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.*; import com.junmp.jyzb.mapper.*;
import com.junmp.jyzb.service.*; import com.junmp.jyzb.service.*;
import com.junmp.jyzb.utils.*; import com.junmp.jyzb.utils.*;
import com.junmp.v2.auth.password.BcryptPasswordStoredEncrypt;
import com.junmp.v2.common.bean.dict.SimpleDict;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.enums.LogicDelEnum; import com.junmp.v2.common.enums.LogicDelEnum;
import com.junmp.v2.common.exception.base.ServiceException; import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil; import com.junmp.v2.common.util.BeanPlusUtil;
...@@ -36,29 +30,20 @@ import com.junmp.v2.db.api.factory.PageResultFactory; ...@@ -36,29 +30,20 @@ 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.file.api.constant.FileConstant; import com.junmp.v2.file.api.constant.FileConstant;
import com.junmp.v2.sys.api.bean.user.SysUserDto; import com.junmp.v2.sys.api.bean.user.SysUserDto;
import com.junmp.v2.sys.api.bean.user.UserSelectTreeNode;
import com.junmp.v2.sys.api.bean.user.req.SysUserReq; import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
import com.junmp.v2.sys.api.bean.user.req.UserOrgReq; import com.junmp.v2.sys.api.bean.user.req.UserOrgReq;
import com.junmp.v2.sys.user.entity.SysUser; import com.junmp.v2.sys.user.entity.SysUser;
import com.junmp.v2.sys.user.entity.SysUserOrg; import com.junmp.v2.sys.user.entity.SysUserOrg;
import com.junmp.v2.sys.user.entity.SysUserRole; import com.junmp.v2.sys.user.entity.SysUserRole;
import com.junmp.v2.sys.user.factory.SysUserCreateFactory; import com.junmp.v2.sys.user.factory.SysUserCreateFactory;
import com.junmp.v2.sys.user.mapper.SysUserMapper;
import com.junmp.v2.sys.user.service.SysUserOrgService; import com.junmp.v2.sys.user.service.SysUserOrgService;
import com.junmp.v2.sys.user.service.SysUserRoleService; import com.junmp.v2.sys.user.service.SysUserRoleService;
import com.junmp.v2.sys.user.service.SysUserService; import com.junmp.v2.sys.user.service.SysUserService;
import liquibase.pro.packaged.L;
import liquibase.pro.packaged.O;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.catalina.User;
import org.springframework.context.annotation.Bean;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -111,6 +96,10 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -111,6 +96,10 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
@Resource @Resource
private StocktakeService stocktakeService; private StocktakeService stocktakeService;
@Resource
private CabinetBoxPoliceService cabinetBoxPoliceService;
private static final String REDIS_POLICE = "Policeman_"; private static final String REDIS_POLICE = "Policeman_";
private static final String REDIS_ORG = "Organization_"; private static final String REDIS_ORG = "Organization_";
...@@ -244,6 +233,19 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -244,6 +233,19 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
BeanPlusUtil.copyProperties(cabinet,cabinetDto); BeanPlusUtil.copyProperties(cabinet,cabinetDto);
policemanDto.setCabinetInfo(cabinetDto); policemanDto.setCabinetInfo(cabinetDto);
} }
//将箱门信息展示：
List<CabinetBoxPolice> list = cabinetBoxPoliceService.list(new LambdaQueryWrapper<CabinetBoxPolice>()
.eq(CabinetBoxPolice::getPoliceId, req.getId()));
if (list.size()>0){
List<CabinetBoxPoliceDto> collect = list.stream().map(cabinetBoxPolice -> {
CabinetBoxPoliceDto cabinetBoxPoliceDto = new CabinetBoxPoliceDto();
BeanPlusUtil.copyProperties(cabinetBoxPolice, cabinetBoxPoliceDto);
return cabinetBoxPoliceDto;
}).collect(Collectors.toList());
policemanDto.setCabinetBoxList(collect);
}else {
policemanDto.setCabinetBoxList(new ArrayList<>());
}
BeanPlusUtil.copyProperties(one, policemanDto); BeanPlusUtil.copyProperties(one, policemanDto);
//将警员的指纹信息查询出来 //将警员的指纹信息查询出来
List<PoliceFinger> list1 = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>() List<PoliceFinger> list1 = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>()
...@@ -271,14 +273,8 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -271,14 +273,8 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
} }
policemanDto.setRolesList(roleIds); policemanDto.setRolesList(roleIds);
policemanDto.setRolesName(roleNames); policemanDto.setRolesName(roleNames);
List<PoliceFace> paceList = policeFaceService.list(new LambdaQueryWrapper<PoliceFace>()
.eq(PoliceFace::getPoliceId, req.getId()));
List<String> faceList=new ArrayList<>();
for (PoliceFace policeFace:paceList) {
faceList.add(policeFace.getFaceInfo());
}
policemanDto.setFaceInfoList(faceList);
policemanDto.setOrgName(pubOrg.getOrgName()); policemanDto.setOrgName(pubOrg.getOrgName());
return policemanDto; return policemanDto;
} }
...@@ -356,21 +352,19 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -356,21 +352,19 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
/** /**
* 修改警员状态 * 修改用户状态
* *
* @param req * @param req
* @return * @return
*/ */
@Override @Override
public boolean ChangePoliceState(UpdatePolicemanReq req) { public boolean ChangePoliceState(UpdatePolicemanReq req) {
//通过警员id查询出警员信息 if (req.getState()!=1 && req.getState()!=2){
Policeman one = PoliceExist(req.getId());
//判断状态码是否是0或1
if (req.getState()!=1 && req.getState()!=0){
throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR); throw new ServiceException(CabinetExceptionEnum.PARAMETER_ERROR);
} }
one.setState(req.getState()); SysUser sysUser = sysUserService.getById(req.getUserId());
return updateById(one); sysUser.setStatusFlag(req.getState());
return sysUserService.updateById(sysUser);
} }
...@@ -446,25 +440,40 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -446,25 +440,40 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
//查询出组织机构下的所有警员信息 //查询出组织机构下的所有警员信息
Long pageNo = req.getPageNo(); Long pageNo = req.getPageNo();
Long pageSize = req.getPageSize(); Long pageSize = req.getPageSize();
List<PolicemanDto> policemanDtos = policemanMapper.selectUserBypoliceIds(req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),req.getPhone(),(pageNo-1),pageSize); //排序字段（默认以用户状态进行排序）
// 查询出警员信息下的指纹列表信息 //(如果传其他不是数据库字段参数或者排序规则不是deac或者asc可能会出现错误)
for (PolicemanDto p : policemanDtos) { if (ObjectUtil.isNotNull(req.getColumn()) && !req.getColumn().trim().isEmpty() &&
List<PoliceFinger> list1 = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>() (req.getOrder().equalsIgnoreCase("asc")|| req.getOrder().equalsIgnoreCase("desc")) &&
.eq(ObjectUtil.isNotNull(p.getId()), PoliceFinger::getPoliceId, p.getId())); ObjectUtil.isNotNull(req.getOrder()) && !req.getOrder().trim().isEmpty()) {
List<PoliceFingerDto> policeFingerDtoList = new ArrayList<>(); //修改字段，和数据库字段进行统一
for (PoliceFinger policeFinger : list1) { req.setColumn(req.getColumn().replaceAll("[A-Z]", "_$0").toLowerCase());
PoliceFingerDto policeFingerDto = new PoliceFingerDto(); req.setOrder(req.getOrder().toLowerCase());
BeanPlusUtil.copyProperties(policeFinger, policeFingerDto); }else {
policeFingerDtoList.add(policeFingerDto); req.setOrder("desc");
req.setColumn("create_time");
}
long size=policemanMapper.count(req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),req.getState(),req.getPhone(),req.getFlag());
List<PolicemanDto> policemanDtos = policemanMapper.selectUserBypoliceIds
(req.getOrgId(),req.getAccount(),req.getName(),req.getPoliceCode(),
req.getState(),req.getPhone(),req.getFlag(),(pageNo-1),pageSize,req.getColumn(),req.getOrder());
//余数
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);
} }
p.setFingersList(policeFingerDtoList);
p.setOrgName(pubOrg.getOrgName());
} }
policemanDtos.addAll(collect1);
}
Page<PolicemanDto> page1 = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()); Page<PolicemanDto> page1 = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
// page1.setRecords(policemanDtos); page1.setRecords(policemanDtos);
// page1.setTotal(size); page1.setTotal(size);
return PageResultFactory.createPageResult(page1); return PageResultFactory.createPageResult(page1);
} }
...@@ -616,14 +625,55 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -616,14 +625,55 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
//人员绑定箱门 //人员绑定箱门
@Override @Override
@Transactional(rollbackFor = Exception.class)
public boolean PoliceBindBox(PolicemanReq req) { public boolean PoliceBindBox(PolicemanReq req) {
Policeman policeman = PoliceExist(req.getId()); Policeman policeman = PoliceExist(req.getId());
BeanPlusUtil.copyProperties(req, policeman);
//判断箱子是否存在 //判断箱子是否存在
if (req.getCabinetBoxId()!=null && !req.getCabinetBoxId().isEmpty()){
cabinetBoxService.CabinetBoxExist(req.getCabinetBoxId()); cabinetBoxService.CabinetBoxExist(req.getCabinetBoxId());
}
//判断箱门是否存在
if (req.getBoxList().size()>0){
// List<String> collect1 = req.getBoxList().stream()
// .map(CabinetBoxReq::getId)
// .collect(Collectors.toList());
// List<CabinetBox> list = cabinetBoxService.list(new LambdaQueryWrapper<CabinetBox>()
// .notIn(CabinetBox::getId, collect1));
// if (list.size()>0){
// List<String> collect = list.stream()
// .map(CabinetBox::getId)
// .collect(Collectors.toList());
// String msg="以下箱门号不存在：" +String.join(",", collect);
// throw new JYZBAppException(CabinetBoxExceptionEnum.BOXS_ISNOT_EXISTS, msg);
// }
//根据警员id和箱门id绑定公共柜
List<CabinetBoxPolice> cabinetBoxPoliceList=new ArrayList<>();
List<CabinetBoxReq> boxList = req.getBoxList();
//将箱门全部清除
cabinetBoxPoliceService.remove(new LambdaQueryWrapper<CabinetBoxPolice>().eq(CabinetBoxPolice::getPoliceId, req.getId()));
for (CabinetBoxReq boxReq:boxList ) {
CabinetBoxPolice cabinetBoxPolice = new CabinetBoxPolice();
cabinetBoxPolice.setPoliceId(req.getId());
cabinetBoxPolice.setCabinetId(boxReq.getCabinetId());
cabinetBoxPolice.setCabinetBoxId(boxReq.getId());
cabinetBoxPolice.setCreateTime(DateTimeUtil.getCurrentDateTime());
cabinetBoxPolice.setCabinetName(boxReq.getCabinetName());
cabinetBoxPolice.setNum(boxReq.getNum());
cabinetBoxPoliceList.add(cabinetBoxPolice);
}
if (cabinetBoxPoliceList.size()>0){
cabinetBoxPoliceService.saveBatch(cabinetBoxPoliceList);
}
}
//将单警柜绑定到警员
policeman.setCabinetBoxId(req.getCabinetBoxId());
return updateById(policeman); return updateById(policeman);
} }
/** /**
* 通过警员id判断警员是否存在，不存在则抛出异常 * 通过警员id判断警员是否存在，不存在则抛出异常
*/ */
...@@ -658,14 +708,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -658,14 +708,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
Policeman policeman = getById(req.getPoliceId()); Policeman policeman = getById(req.getPoliceId());
//将其组织机构号设为空 //将其组织机构号设为空
policeman.setOrgId(null); policeman.setOrgId(null);
//如果警员绑定账号，将警员的账号进行删除 //将角色关联表进行删除
if (ObjectUtil.isNotNull(policeman.getUserId())){
policeman.setUserId(null);
policeman.setPassword(null);
sysUserService.removeById(policeman.getUserId());
}
//角色账号信息也进行删除 //角色账号信息也进行删除
sysUserRoleService.delByUserId(policeman.getUserId()); // sysUserRoleService.delByUserId(policeman.getUserId());
//修改警员的个人信息(删除指纹信息) //修改警员的个人信息(删除指纹信息)
List<PoliceFinger> fingerList = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>() List<PoliceFinger> fingerList = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>()
.eq(PoliceFinger::getPoliceId, policeman.getId())); .eq(PoliceFinger::getPoliceId, policeman.getId()));
...@@ -673,15 +718,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -673,15 +718,14 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
policeFingerService.removeBatchByIds(fingerList); policeFingerService.removeBatchByIds(fingerList);
} }
//人脸信息删除 //人脸信息删除
List<PoliceFace> faceInfoList=policeFaceService.list(new LambdaQueryWrapper<PoliceFace>() policeman.setFaceInfo(null);
.eq(PoliceFace::getName,policeman.getId()));
if (faceInfoList.size()!=0){
policeFingerService.removeBatchByIds(faceInfoList);
}
//如果绑定箱门，进行解绑 //如果绑定箱门，进行解绑
if (ObjectUtil.isNotNull(policeman.getCabinetBoxId())){ if (ObjectUtil.isNotNull(policeman.getCabinetBoxId())){
policeman.setCabinetBoxId(null); policeman.setCabinetBoxId(null);
} }
cabinetBoxPoliceService.remove(new LambdaQueryWrapper<CabinetBoxPolice>()
.eq(CabinetBoxPolice::getPoliceId,policeman.getId()));
//查询出该警员的所有装备信息 //查询出该警员的所有装备信息
LambdaQueryWrapper<PoliceEquipment> eq = new LambdaQueryWrapper<PoliceEquipment>() LambdaQueryWrapper<PoliceEquipment> eq = new LambdaQueryWrapper<PoliceEquipment>()
.eq(PoliceEquipment::getPoliceId, policeman.getId()); .eq(PoliceEquipment::getPoliceId, policeman.getId());
...@@ -777,7 +821,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -777,7 +821,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
} }
reassignment.setCreateTime(DateTimeUtil.getCurrentDateTime()); reassignment.setCreateTime(DateTimeUtil.getCurrentDateTime());
if (ObjectUtil.isNull(req.getId()) || req.getId().isEmpty()){ if (ObjectUtil.isNull(req.getId()) || req.getId().isEmpty()){
OrderNum orderNum = stocktakeService.setOrderCode("", req.getOrgId()); OrderNum orderNum = stocktakeService.setOrderCode("transfer", req.getOrgId());
String codeValue=String.format("%04d",orderNum.getNum()); String codeValue=String.format("%04d",orderNum.getNum());
reassignment.setOrderCode(orderNum.getBussinessType()+orderNum.getYear()+ reassignment.setOrderCode(orderNum.getBussinessType()+orderNum.getYear()+
String.format("%02d", LocalDateTime.now().getMonth().getValue())+ String.format("%02d", LocalDateTime.now().getMonth().getValue())+
...@@ -892,53 +936,71 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -892,53 +936,71 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
//添加人脸和指纹照片或修改 //添加人脸和指纹照片或修改
@Override @Override
public boolean addFaceAndfinger(UpdatePolicemanReq req) { public boolean addFaceAndfinger(UpdatePolicemanReq req) {
List<PoliceFace> addFaceInfoList=new ArrayList<>(); // List<PoliceFace> addFaceInfoList=new ArrayList<>();
List<PoliceFace> delFaceInfoList=new ArrayList<>(); // List<PoliceFace> delFaceInfoList=new ArrayList<>();
//库中存储的照片信息 // //库中存储的照片信息
List<PoliceFace> faceList = policeFaceService.list(new LambdaQueryWrapper<PoliceFace>() // List<PoliceFace> faceList = policeFaceService.list(new LambdaQueryWrapper<PoliceFace>()
.eq(PoliceFace::getPoliceId, req.getId())); // .eq(PoliceFace::getPoliceId, req.getId()));
List<String> faceInfoList = req.getFaceInfoList(); // List<String> faceInfoList = req.getFaceInfoList();
Set<String> set = new HashSet<>(); // Set<String> set = new HashSet<>();
for (PoliceFace face : faceList) { // for (PoliceFace face : faceList) {
set.add(face.getFaceInfo()); // set.add(face.getFaceInfo());
} // }
if (faceList.size()>0){ // if (faceList.size()>0){
if (faceInfoList.size()>0){ // if (faceInfoList.size()>0){
for (String face : faceInfoList) { // for (String face : faceInfoList) {
if (!set.contains(face)) { // if (!set.contains(face)) {
PoliceFace policeFace = new PoliceFace(); // PoliceFace policeFace = new PoliceFace();
policeFace.setFaceInfo(face); // policeFace.setFaceInfo(face);
policeFace.setPoliceId(req.getId()); // policeFace.setPoliceId(req.getId());
policeFace.setCreateTime(DateTimeUtil.getCurrentDateTime()); // policeFace.setCreateTime(DateTimeUtil.getCurrentDateTime());
addFaceInfoList.add(policeFace); // addFaceInfoList.add(policeFace);
} // }
} // }
for (PoliceFace face : faceList) { // for (PoliceFace face : faceList) {
if (!faceInfoList.contains(face.getFaceInfo())) { // if (!faceInfoList.contains(face.getFaceInfo())) {
delFaceInfoList.add(face); // delFaceInfoList.add(face);
} // }
} // }
// }else {
// delFaceInfoList.addAll(faceList);
// }
// }else {
// if (faceInfoList.size()>0){
// for (String face:faceInfoList) {
// PoliceFace policeFace = new PoliceFace();
// policeFace.setFaceInfo(face);
// policeFace.setPoliceId(req.getId());
// policeFace.setCreateTime(DateTimeUtil.getCurrentDateTime());
// addFaceInfoList.add(policeFace);
// }
// }
// }
// boolean a=true;
// if (addFaceInfoList.size()>0){
// a=policeFaceService.saveBatch(addFaceInfoList);
// }
// boolean b=true;
// if (delFaceInfoList.size()>0){
// b=policeFaceService.removeByIds(delFaceInfoList);
// }
//人脸
boolean a=true;
boolean flag=false;
Policeman one = getById(req.getId());
if (one.getFaceInfo()!=null && !one.getFaceInfo().isEmpty()){
flag=true;
if(req.getFaceInfoList().size()>0 && !req.getFaceInfoList().get(0).equals(one.getFaceInfo())){
one.setFaceInfo(req.getFaceInfoList().get(0));
}else { }else {
delFaceInfoList.addAll(faceList); one.setFaceInfo(null);
} }
a = updateById(one);
}else { }else {
if (faceInfoList.size()>0){ flag=true;
for (String face:faceInfoList) { one.setFaceInfo(req.getFaceInfoList().get(0));
PoliceFace policeFace = new PoliceFace(); a = updateById(one);
policeFace.setFaceInfo(face);
policeFace.setPoliceId(req.getId());
policeFace.setCreateTime(DateTimeUtil.getCurrentDateTime());
addFaceInfoList.add(policeFace);
}
}
}
boolean a=true;
if (addFaceInfoList.size()>0){
a=policeFaceService.saveBatch(addFaceInfoList);
}
boolean b=true;
if (delFaceInfoList.size()>0){
b=policeFaceService.removeByIds(delFaceInfoList);
} }
//指纹 //指纹
...@@ -984,13 +1046,27 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman ...@@ -984,13 +1046,27 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
} }
boolean c=true; boolean c=true;
if (addFingerList.size()>0){ if (addFingerList.size()>0){
flag=true;
c=policeFingerService.saveBatch(addFingerList); c=policeFingerService.saveBatch(addFingerList);
} }
boolean d=true; boolean d=true;
if (delFingerList.size()>0){ if (delFingerList.size()>0){
policeFingerService.removeByIds(delFingerList); flag=true;
d=policeFingerService.removeByIds(delFingerList);
}
return (a && c && d);
} }
return (a && b && c && d);
//查询组织机构为null的警员
@Override
public List<PolicemanDto> getPoliceWithoutOrg() {
List<Policeman> list = list(new LambdaQueryWrapper<Policeman>().isNull(Policeman::getOrgId));
List<PolicemanDto> collect = list.stream().map(policeman -> {
PolicemanDto policemanDto = new PolicemanDto();
BeanPlusUtil.copyProperties(policeman, policemanDto);
return policemanDto;
}).collect(Collectors.toList());
return collect;
} }
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java
...@@ -749,6 +749,16 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem ...@@ -749,6 +749,16 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg> implem
return puborg; 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 ...@@ -31,6 +31,10 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
@Override @Override
public String AddSupplier(UpdateSupplierReq req) { 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(); Supplier supplier = new Supplier();
String ID=UUID.randomUUID().toString(); String ID=UUID.randomUUID().toString();
req.setId(ID); req.setId(ID);
...@@ -142,6 +146,8 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i ...@@ -142,6 +146,8 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
} }
//根据供应商短码查询查询 //根据供应商短码查询查询
wrapper.like(ObjectUtil.isNotEmpty(req.getCode()), Supplier::getCode, req.getCode()); wrapper.like(ObjectUtil.isNotEmpty(req.getCode()), Supplier::getCode, req.getCode());
//类型
wrapper.eq(ObjectUtil.isNotEmpty(req.getAgencyType()), Supplier::getAgencyType, req.getAgencyType());
//供应商ID //供应商ID
wrapper.like(ObjectUtil.isNotEmpty(req.getId()), Supplier::getId, req.getId()); 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 @@ ...@@ -446,4 +446,15 @@
size_name size_name
ORDER BY type_id ORDER BY type_id
</select> </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> </mapper>
\ No newline at end of file
jyzb-biz/src/main/resources/mapper/PolicemanMapper.xml
...@@ -248,7 +248,76 @@ WHERE o.org_id IN ...@@ -248,7 +248,76 @@ WHERE o.org_id IN
join sys_role sr on sur.role_id=sr.role_id join sys_role sr on sur.role_id=sr.role_id
WHERE su.user_id=#{userId} WHERE su.user_id=#{userId}
</select> </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> </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 ...@@ -187,10 +187,7 @@ public class FlowInstanceServiceImpl extends FlowServiceFactory implements IFlow
return "skip"+processInstance.getId(); return "skip"+processInstance.getId();
} }
else{ 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 task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).list().get(0);
task.setAssignee(StartUser.getUserId().toString()); task.setAssignee(StartUser.getUserId().toString());
return processInstance.getProcessInstanceId(); 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; ...@@ -23,6 +23,7 @@ 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.vo.*; 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.bean.login.LoginUser;
import com.junmp.v2.auth.api.context.LoginContext; import com.junmp.v2.auth.api.context.LoginContext;
import com.junmp.v2.common.bean.response.ApiRes; import com.junmp.v2.common.bean.response.ApiRes;
...@@ -264,7 +265,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -264,7 +265,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
StartUser= sysUserService.getById(LoginContext.getContext().getLoginUser()); StartUser= sysUserService.getById(LoginContext.getContext().getLoginUser());
} }
TaskQuery taskQuery = taskService.createTaskQuery().taskAssignee(StartUser.getUserId().toString()) TaskQuery taskQuery = taskService.createTaskQuery().taskAssignee(StartUser.getUserId().toString())
.includeProcessVariables() .includeProcessVariables().taskCreatedAfter(taskDTO.getStartTime()).taskCreatedBefore(taskDTO.getEndTime())
.orderByTaskCreateTime().desc(); .orderByTaskCreateTime().desc();
//条件查询（流程名称，开始时间，结束时间,发物单位，装备名称） //条件查询（流程名称，开始时间，结束时间,发物单位，装备名称）
if (ObjectUtil.isNotNull(taskDTO.getProcessDefinitionName()) && ! taskDTO.getProcessDefinitionName().trim().isEmpty()){ if (ObjectUtil.isNotNull(taskDTO.getProcessDefinitionName()) && ! taskDTO.getProcessDefinitionName().trim().isEmpty()){
...@@ -291,18 +292,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -291,18 +292,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
}else if (ObjectUtil.isNotNull(taskDTO.getBusinessStatus()) && taskDTO.getBusinessStatus().equals("已结束")){ }else if (ObjectUtil.isNotNull(taskDTO.getBusinessStatus()) && taskDTO.getBusinessStatus().equals("已结束")){
taskQuery=taskQuery.processVariableValueEquals(PROCESS_STATUS,taskDTO.getBusinessStatus()); taskQuery=taskQuery.processVariableValueEquals(PROCESS_STATUS,taskDTO.getBusinessStatus());
} }
// taskQuery.
// //开始时间
// 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());
// }
List<Task> tasks = taskQuery.listPage((taskDTO.getPageNo() - 1) * taskDTO.getPageSize(), taskDTO.getPageSize()); List<Task> tasks = taskQuery.listPage((taskDTO.getPageNo() - 1) * taskDTO.getPageSize(), taskDTO.getPageSize());
//根据条件查询符合条件的数据并统计数量条数 //根据条件查询符合条件的数据并统计数量条数
long count = taskQuery.count(); long count = taskQuery.count();
...@@ -344,6 +334,21 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -344,6 +334,21 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
} }
taskVOS.add(taskVO); 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.setRecords(taskVOS);
page.setTotal(count); page.setTotal(count);
...@@ -365,7 +370,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -365,7 +370,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
} }
HistoricTaskInstanceQuery historicTaskQuery = historyService.createHistoricTaskInstanceQuery() HistoricTaskInstanceQuery historicTaskQuery = historyService.createHistoricTaskInstanceQuery()
.taskAssignee(StartUser.getUserId().toString()) .taskAssignee(StartUser.getUserId().toString())
.finished() .finished().taskCreatedAfter(taskDTO.getStartTime()).taskCreatedBefore(taskDTO.getEndTime())
.includeCaseVariables().includeProcessVariables().includeTaskLocalVariables().includeIdentityLinks() .includeCaseVariables().includeProcessVariables().includeTaskLocalVariables().includeIdentityLinks()
.orderByTaskCreateTime().desc(); .orderByTaskCreateTime().desc();
...@@ -373,15 +378,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -373,15 +378,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
if (ObjectUtil.isNotNull(taskDTO.getProcessDefinitionName()) && ! taskDTO.getProcessDefinitionName().trim().isEmpty()){ if (ObjectUtil.isNotNull(taskDTO.getProcessDefinitionName()) && ! taskDTO.getProcessDefinitionName().trim().isEmpty()){
historicTaskQuery = historicTaskQuery.processDefinitionNameLike("%"+taskDTO.getProcessDefinitionName()+"%"); 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()){ if (ObjectUtil.isNotNull(taskDTO.getTypeName()) && ! taskDTO.getTypeName().trim().isEmpty()){
historicTaskQuery=historicTaskQuery.processVariableValueLike(INVLIST,"%"+taskDTO.getTypeName()+"%"); historicTaskQuery=historicTaskQuery.processVariableValueLike(INVLIST,"%"+taskDTO.getTypeName()+"%");
...@@ -463,7 +460,21 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -463,7 +460,21 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
taskVO.setDuration(spendTimes); taskVO.setDuration(spendTimes);
taskVOS.add(taskVO); 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.setRecords(taskVOS);
page.setCurrent(taskDTO.getPageNo()); page.setCurrent(taskDTO.getPageNo());
page.setSize(taskDTO.getPageSize()); page.setSize(taskDTO.getPageSize());
...@@ -575,6 +586,22 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask ...@@ -575,6 +586,22 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
historyProcessInstanceVO.setDuration(spendTimes); historyProcessInstanceVO.setDuration(spendTimes);
historyProcessInstanceVOS.add(historyProcessInstanceVO); 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.setRecords(historyProcessInstanceVOS);
// pageResult.setTotalRows(Long.valueOf(applyDTO.getPageNo())); // pageResult.setTotalRows(Long.valueOf(applyDTO.getPageNo()));
pageResult.setTotalRows(count); pageResult.setTotalRows(count);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论