Skip to content

J
jyzb_platformV2
Commit 831b1535 by 赵剑炜
Options

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

parents 9f461bb0 bbdd0281
正在显示 包含 365 行增加 和 128 行删除
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/FinalTjCountDto.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/FinalTjOrgCountDto.java
......@@ -3,11 +3,10 @@ package com.junmp.jyzb.api.bean.dto.TjDto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class FinalTjCountDto implements Serializable {
public class FinalTjOrgCountDto implements Serializable {
/**
* 使用次数
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/FinalTjOrgPoliceDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto.TjDto;
import lombok.Data;
@Data
public class FinalTjOrgPoliceDto {
private String policeId;
private String policeName;
private String policeCode;
private Integer number;
private Integer inStockNum;
private Integer outStockNum;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/TjCountDto.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/TjOrgCountDto.java
package com.junmp.jyzb.api.bean.dto.TjDto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
@Data
public class TjCountDto implements Serializable {
public class TjOrgCountDto implements Serializable {
/**
......@@ -32,7 +27,7 @@ public class TjCountDto implements Serializable {
/**
* 父id
*/
private Integer parentId;
private Long parentId;
/**
* 组织机构简称
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/TjDto/TjOrgPoliceDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto.TjDto;
import lombok.Data;
@Data
public class TjOrgPoliceDto {
private String policeId;
private String policeName;
private String sizeId;
private String sizeName;
private String typeId;
private String typeName;
private String locationId;
private String locationName;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/UploadPolicePhotoDto.java 0 → 100644
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
/**
* 本地主机人脸机上传图片返回接口实体类
*/
@Data
public class UploadPolicePhotoDto {
private String policeId;
private String photo;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TjReq/TjCountReq.java → jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TjReq/TjOrgCountReq.java
......@@ -3,15 +3,17 @@ package com.junmp.jyzb.api.bean.query.TjReq;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import java.io.Serializable;
import javax.validation.constraints.NotNull;
import java.util.List;
@Data
public class TjCountReq extends BaseRequest {
public class TjOrgCountReq extends BaseRequest {
//组织机构
@NotNull(message = "组织机构不能为空",groups = detail.class)
private Long orgId;
private List<String> typeIdsList;
private List<String> sizeNameList;
@NotNull(message = "年份不能为空",groups = detail.class)
private Integer year;
}
\ No newline at end of file
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/TjReq/TjOrgPoliceReq.java 0 → 100644
package com.junmp.jyzb.api.bean.query.TjReq;
import com.junmp.v2.common.bean.request.BaseRequest;
import lombok.Data;
import java.util.List;
@Data
public class TjOrgPoliceReq extends BaseRequest {
private Long orgId;
private String policeName;
List<String> typeIdsList;
private List<String> sizeNameList;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdatePolicemanReq.java
......@@ -42,6 +42,8 @@ public class UpdatePolicemanReq extends BaseRequest {
private String password;
private Long fileId;
private String photo;
private String phone;
......
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UploadPolicePhotoReq.java 0 → 100644
package com.junmp.jyzb.api.bean.req;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
/**
* 本地主机人脸机上传图片返回接口实体类
*/
@Data
public class UploadPolicePhotoReq {
private String policeId;
private MultipartFile picture;
}
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/ProcessExceptionEnum.java 0 → 100644
package com.junmp.jyzb.api.exception.enums;
import com.junmp.v2.common.constant.CommonConstant;
import com.junmp.v2.common.exception.IExceptionEnum;
import lombok.Getter;
@Getter
public enum ProcessExceptionEnum implements IExceptionEnum {
/**
* 流程不存在
*/
PROCESS_ISNOT_EXIST(CommonConstant.DEFAULT_USER_ERROR_CODE,"设计流程不存在，请先设计流程");
/**
* 错误编码
*/
private final Integer code;
/**
* 提示用户信息
*/
private final String message;
ProcessExceptionEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
}
jyzb-api/src/main/java/com/junmp/jyzb/api/exception/enums/PublicExceptionEnum.java 0 → 100644
package com.junmp.jyzb.api.exception.enums;
import com.junmp.v2.common.constant.CommonConstant;
import com.junmp.v2.common.exception.IExceptionEnum;
import lombok.Getter;
@Getter
public enum PublicExceptionEnum implements IExceptionEnum {
FILE_DEL_FAILTURE(CommonConstant.DEFAULT_USER_ERROR_CODE,"文件删除失败");
/**
* 错误编码
*/
private final Integer code;
/**
* 提示用户信息
*/
private final String message;
PublicExceptionEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
}
jyzb-biz/pom.xml
......@@ -125,6 +125,10 @@
<artifactId>dict-biz</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>file-biz</artifactId>
</dependency>
<dependency>
<groupId>com.junmp.jyzb</groupId>
<artifactId>jyzb-process</artifactId>
</dependency>
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PublicController.java
......@@ -3,20 +3,36 @@ package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.AES;
import com.junmp.jyzb.api.bean.dto.UploadPolicePhotoDto;
import com.junmp.jyzb.api.bean.query.DbAccessReq;
import com.junmp.jyzb.api.bean.query.PolicemanReq;
import com.junmp.jyzb.api.bean.req.UploadPolicePhotoReq;
import com.junmp.jyzb.api.bean.vo.AuthAccessVo;
import com.junmp.jyzb.api.exception.enums.PublicExceptionEnum;
import com.junmp.jyzb.entity.Policeman;
import com.junmp.jyzb.entity.PubOrg;
import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.service.PubOrgService;
import com.junmp.jyzb.utils.FileUtil;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.exception.enums.DefaultBizExceptionEnum;
import com.junmp.v2.file.api.bean.req.SysFileInfoReq;
import com.junmp.v2.file.api.bean.res.SysFileInfoResp;
import com.junmp.v2.file.biz.entity.SysFileInfo;
import com.junmp.v2.file.biz.service.SysFileInfoService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.IOUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.net.URL;
/**
......@@ -36,6 +52,10 @@ import java.net.URL;
@RequestMapping("/api")
public class PublicController {
@Resource
private PolicemanService policemanService;
private final static String DB_URL_TEMPLATE = "jdbc:mysql://{}:{}/{}?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true";
@GetMapping(path = "/pub/authInfo", name = "生成数据库认证信息")
......@@ -57,12 +77,12 @@ public class PublicController {
}
// @PostMapping("/downloadPhoto")
// @ApiOperation("/下载图片并返回图片内容信息")
// public ApiRes<byte[]> downloadPhoto (@RequestBody PolicemanReq req)throws Exception{
// byte[] bytes = FileUtil.fileToByte(req.getPhoto());
//
// return ApiRes.success(bytes);
// }
@PostMapping("/uploadPolicePhoto")
public UploadPolicePhotoDto uploadPolicePhoto(@RequestBody UploadPolicePhotoReq req) {
return policemanService.uploadPolicePhoto(req);
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/controller/TjController.java
......@@ -2,16 +2,18 @@ package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.dto.InventorySumDto;
import com.junmp.jyzb.api.bean.dto.TjDto.*;
import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjCountReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPoliceReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
import com.junmp.jyzb.service.TjService;
import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
......@@ -89,33 +91,57 @@ public class TjController {
/**
* --------------------------------------使用统计报表-------------------------------------------
*/
//财务统计报表
@PostMapping("/TjOrgCount")
@ApiOperation("/财务统计报表")
public ApiRes<PageResult<TjCountDto>> TjOrgCount(@RequestBody TjCountReq req){
@ApiOperation("/使用统计报表")
public ApiRes<PageResult<TjOrgCountDto>> TjOrgCount(@RequestBody @Validated(ValidationApi.detail.class) TjOrgCountReq req){
return ApiRes.success(tjService.TjOrgCount(req));
}
@PostMapping("/TjOrgCountSum")
@ApiOperation("/财务统计报表汇总")
public ApiRes<FinalTjCountDto> TjOrgCountSum(@RequestBody TjCountReq req){
@ApiOperation("/使用统计报表汇总")
public ApiRes<FinalTjOrgCountDto> TjOrgCountSum(@RequestBody @Validated(ValidationApi.detail.class) TjOrgCountReq req){
return ApiRes.success(tjService.TjOrgCountSum(req));
}
//财务统计报表（点击+后里面的数据）
@PostMapping("/TjOrgCountDetailPage")
@ApiOperation("/查询组织机构下的财务统计明细")
public ApiRes<PageResult<TjCountDto>> TjOrgPriceDetailPage(@RequestBody TjCountReq req){
@ApiOperation("/查询组织机构下的使用统计明细")
public ApiRes<PageResult<TjOrgCountDto>> TjOrgPriceDetailPage(@RequestBody TjOrgCountReq req){
return ApiRes.success(tjService.TjOrgCountDetailPage(req));
}
@PostMapping("/TjOrgCountDetailList")
@ApiOperation("/查询组织机构下的财务统计明细")
public ApiRes<List<TjCountDto>> TjOrgCountDetailList(@RequestBody TjCountReq req){
@ApiOperation("/查询组织机构下的使用统计明细")
public ApiRes<List<TjOrgCountDto>> TjOrgCountDetailList(@RequestBody TjOrgCountReq req){
return ApiRes.success(tjService.TjOrgCountDetailList(req));
}
/**
* --------------------------------------人员统计报表-------------------------------------------
*/
// @PostMapping("/TjOrgPolice")
// @ApiOperation("/人员统计报表")
// public ApiRes<PageResult<TjOrgPoliceDto>> TjOrgPolice(@RequestBody TjOrgPoliceReq req){
// return ApiRes.success(tjService.TjOrgPolice(req));
// }
// @PostMapping("/TjOrgPoliceSum")
// @ApiOperation("/人员统计报表汇总")
// public ApiRes<FinalTjOrgPoliceDto> TjOrgPoliceSum(@RequestBody TjOrgPoliceReq req){
// return ApiRes.success(tjService.TjOrgPoliceSum(req));
// }
//
// //财务统计报表（点击+后里面的数据）
// @PostMapping("/TjOrgPoliceDetailPage")
// @ApiOperation("/查询组织机构下的人员统计明细")
// public ApiRes<PageResult<TjOrgPoliceDto>> TjOrgPoliceDetailPage(@RequestBody TjOrgPoliceReq req){
// return ApiRes.success(tjService.TjOrgPoliceDetailPage(req));
// }
// @PostMapping("/TjOrgPoliceDetailList")
// @ApiOperation("/查询组织机构下的人员统计明细")
// public ApiRes<List<TjOrgPoliceDto>> TjOrgPoliceDetailList(@RequestBody TjOrgPoliceReq req){
// return ApiRes.success(tjService.TjOrgPoliceDetailList(req));
// }
/**
* --------------------------------------温湿度记录-------------------------------------------
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Policeman.java
......@@ -46,6 +46,9 @@ public class Policeman implements Serializable {
@TableField(value = "password",updateStrategy = FieldStrategy.IGNORED)
private String password;
@TableField(value = "file_id")
private Long fileId;
@TableField(value = "photo")
private String photo;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/EquipmentCountSummaryMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjCountDto;
import com.junmp.jyzb.api.bean.dto.TjDto.TjCountDto;
import com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgCountDto;
import com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto;
import com.junmp.jyzb.entity.EquipmentCountSummary;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
......@@ -18,26 +18,26 @@ public interface EquipmentCountSummaryMapper extends BaseMapper<EquipmentCountSu
void addInfo();
List<TjCountDto> TjOrgCount(@Param("orgId") Long orgId,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("year")Integer year);
List<TjOrgCountDto> TjOrgCount(@Param("orgId") Long orgId,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("year")Integer year);
FinalTjCountDto TjOrgCountSum(@Param("orgId") Long orgId,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("year")Integer year);
FinalTjOrgCountDto TjOrgCountSum(@Param("orgId") Long orgId,
@Param("sizeNameList") List<String> sizeNameList,
@Param("typeIdsList") List<String> typeIdsList,
@Param("year")Integer year);
int TjOrgCountDetailSum(@Param("orgId")Long orgId,
@Param("year") Integer year,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList);
List<TjCountDto> TjOrgCountDetail(@Param("orgId")Long orgId,
@Param("year") Integer year,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize);
List<TjOrgCountDto> TjOrgCountDetail(@Param("orgId")Long orgId,
@Param("year") Integer year,
@Param("typeIdsList") List<String> typeIdsList,
@Param("sizeNameList") List<String> sizeNameList,
@Param("pageNo")Long pageNo, @Param("pageSize") Long pageSize);
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java
......@@ -3,11 +3,13 @@ package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.dto.PolicemanDto;
import com.junmp.jyzb.api.bean.dto.ReassignmentDto;
import com.junmp.jyzb.api.bean.dto.UploadPolicePhotoDto;
import com.junmp.jyzb.api.bean.query.CabinetReq;
import com.junmp.jyzb.api.bean.query.PolicemanReq;
import com.junmp.jyzb.api.bean.query.QueryReassignmentReq;
import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
import com.junmp.jyzb.api.bean.req.UpdateReassignmentReq;
import com.junmp.jyzb.api.bean.req.UploadPolicePhotoReq;
import com.junmp.jyzb.entity.PoliceEquipment;
import com.junmp.jyzb.entity.Policeman;
import com.junmp.jyzb.entity.Reassignment;
......@@ -101,4 +103,5 @@ public interface PolicemanService extends IService<Policeman> {
//查询组织机构为null的警员
List<PolicemanDto> getPoliceWithoutOrg();
UploadPolicePhotoDto uploadPolicePhoto(UploadPolicePhotoReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/TjService.java
......@@ -3,7 +3,7 @@ package com.junmp.jyzb.service;
import com.junmp.jyzb.api.bean.dto.InventorySumDto;
import com.junmp.jyzb.api.bean.dto.TjDto.*;
import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjCountReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
import com.junmp.v2.db.api.page.PageResult;
......@@ -33,11 +33,11 @@ public interface TjService {
FinalTjOrgPriceDto TjOrgPriceSum(TjOrgPriceReq req);
PageResult<TjCountDto> TjOrgCount(TjCountReq req);
PageResult<TjOrgCountDto> TjOrgCount(TjOrgCountReq req);
FinalTjCountDto TjOrgCountSum(TjCountReq req);
FinalTjOrgCountDto TjOrgCountSum(TjOrgCountReq req);
PageResult<TjCountDto> TjOrgCountDetailPage(TjCountReq req);
PageResult<TjOrgCountDto> TjOrgCountDetailPage(TjOrgCountReq req);
List<TjCountDto> TjOrgCountDetailList(TjCountReq req);
List<TjOrgCountDto> TjOrgCountDetailList(TjOrgCountReq req);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderCommonServiceImpl.java
......@@ -18,7 +18,9 @@ import com.junmp.jyzb.service.ReassignmentService;
import com.junmp.jyzb.utils.BusinessUtil;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.sys.user.service.SysUserService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
......@@ -52,16 +54,23 @@ public class OrderCommonServiceImpl implements OrderCommonService {
@Resource
private InventorySummaryMapper inventorySummaryMapper;
@Resource
private RuntimeService runtimeService;
@Override
public boolean changeOrderExamineState(HandleDataDTO handleDataDTO) {
String taskId = handleDataDTO.getTaskId();
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().includeProcessVariables().processInstanceId(task.getProcessInstanceId()).singleResult();
//更新单子的状态（改为已驳回，如果单子是报废，那么该单子的审核中的报废数量应该进行减少）
Map<String, Object> processVariables = task.getProcessVariables();
// Map<String, Object> processVariables = task.getProcessVariables();
//单据类型（出入库单、调岗单、业务单、盘库单）
String orderType = MapUtil.getStr(processVariables, ORDER_TYPE);
// String orderType = MapUtil.getStr(processVariables, ORDER_TYPE);
String orderType= MapUtil.getStr(processInstance.getProcessVariables(),ORDER_TYPE);
//单据业务类型（采购啥的......）
String bussinessType = MapUtil.getStr(processVariables, BUSSINESS_TYPE);
String bussinessType= MapUtil.getStr(processInstance.getProcessVariables(),BUSSINESS_TYPE);
// String bussinessType = MapUtil.getStr(processVariables, BUSSINESS_TYPE);
String processInstanceId = task.getProcessInstanceId();
boolean result=true;
switch (orderType){
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
......@@ -18,6 +18,7 @@ import com.junmp.jyzb.api.bean.query.PolicemanReq;
import com.junmp.jyzb.api.bean.query.QueryReassignmentReq;
import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
import com.junmp.jyzb.api.bean.req.UpdateReassignmentReq;
import com.junmp.jyzb.api.bean.req.UploadPolicePhotoReq;
import com.junmp.jyzb.api.exception.enums.*;
import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.*;
......@@ -34,7 +35,11 @@ import com.junmp.v2.dict.entity.SysDict;
import com.junmp.v2.dict.entity.SysDictItem;
import com.junmp.v2.dict.service.SysDictItemService;
import com.junmp.v2.dict.service.SysDictService;
import com.junmp.v2.file.api.bean.req.SysFileInfoReq;
import com.junmp.v2.file.api.bean.res.SysFileInfoResp;
import com.junmp.v2.file.api.constant.FileConstant;
import com.junmp.v2.file.biz.entity.SysFileInfo;
import com.junmp.v2.file.biz.service.SysFileInfoService;
import com.junmp.v2.sys.api.bean.user.SysUserDto;
import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
import com.junmp.v2.sys.api.bean.user.req.UserOrgReq;
......@@ -127,6 +132,9 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
@Resource
private CabinetMapper cabinetMapper;
@Resource
private SysFileInfoService sysFileInfoService;
private static final String REDIS_POLICE = "Policeman_";
private static final String REDIS_ORG = "Organization_";
......@@ -1016,6 +1024,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
.eq(Reassignment::getPoliceId, req.getPoliceId())
.eq(Reassignment::getReassignmentType,req.getReassignmentType())
.eq(Reassignment::getOrgId, req.getOrgId())
.eq(Reassignment::getExamineState,"working")
.isNotNull(Reassignment::getProcessId)
.orderByDesc(Reassignment::getCreateTime));
if (list.size()>0){
......@@ -1065,7 +1074,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
StartProcessInstanceDTO startProcessInstanceDTO=new StartProcessInstanceDTO();
startProcessInstanceDTO.setProcessDefinitionId(req.getProcessDefinitionId());
startProcessInstanceDTO.setOrderId(reassignment.getId());
startProcessInstanceDTO.setOrderType("reassigment");
startProcessInstanceDTO.setOrderType("reassignment");
startProcessInstanceDTO.setUserId(req.getUserId());
startProcessInstanceDTO.setBussinessType(req.getBussinessType());
startProcessInstanceDTO.setReassignmentType(req.getReassignmentType());
......@@ -1256,6 +1265,40 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
return collect;
}
@Override
@Transactional(rollbackFor = Exception.class)
public UploadPolicePhotoDto uploadPolicePhoto(UploadPolicePhotoReq req) {
//查询警员表，判断该警员是否已经存在警员照片
// 如果存在，则查询file表将该数据进行删除，再调用上传文件接口，将返回的文件信息以及地址更新存储到警员表最终返回警员id和照片地址
// 如果不存在照片，那么直接调用上传文件接口，将照片存储到警员表并且返回警员id和照片地址
SysFileInfoReq sysFileInfoReq = new SysFileInfoReq();
Policeman policeman = policemanService.getById(req.getPoliceId());
PubOrg pubOrg = pubOrgService.PubOrgExist(policeman.getOrgId());
if (ObjectUtil.isNotNull(policeman.getFileId())){
//删除照片
sysFileInfoReq.setFileId(policeman.getFileId());
try {
this.sysFileInfoService.deleteReally(sysFileInfoReq);
} catch (Exception var3) {
throw new ServiceException(PublicExceptionEnum.FILE_DEL_FAILTURE);
}
}
//上传照片
sysFileInfoReq.setFileBucket("jyzb");
sysFileInfoReq.setFileLocation(3);
sysFileInfoReq.setFileObjectName("policePhoto/"+pubOrg.getOrgCode()+"/");
SysFileInfoResp sysFileInfoResp = sysFileInfoService.uploadFile(req.getPicture(), sysFileInfoReq);
policeman.setFileId(sysFileInfoResp.getFileId());
policeman.setPhoto(sysFileInfoResp.getAccessUrl());
//更新警员
updateById(policeman);
UploadPolicePhotoDto uploadPolicePhotoDto = new UploadPolicePhotoDto();
uploadPolicePhotoDto.setPoliceId(policeman.getId());
uploadPolicePhotoDto.setPhoto(policeman.getPhoto());
return uploadPolicePhotoDto;
}
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java
......@@ -4,13 +4,11 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.junmp.jyzb.api.bean.dto.EqsSumDto;
import com.junmp.jyzb.api.bean.dto.InventorySumDto;
import com.junmp.jyzb.api.bean.dto.OrgDto;
import com.junmp.jyzb.api.bean.dto.TjDto.*;
import com.junmp.jyzb.api.bean.query.InventoryReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjCountReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgCountReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgEqsReq;
import com.junmp.jyzb.api.bean.query.TjReq.TjOrgPriceReq;
import com.junmp.jyzb.entity.PubOrg;
import com.junmp.jyzb.mapper.*;
import com.junmp.jyzb.service.EquipmentSizeService;
import com.junmp.jyzb.service.PubOrgService;
......@@ -21,9 +19,6 @@ import com.junmp.v2.db.api.page.PageResult;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
......@@ -351,45 +346,45 @@ public class TjServiceImpl implements TjService {
}
@Override
public PageResult<TjCountDto> TjOrgCount(TjCountReq req) {
List<TjCountDto> tjCountDtoList=equipmentCountSummaryMapper.TjOrgCount(req.getOrgId(),
public PageResult<TjOrgCountDto> TjOrgCount(TjOrgCountReq req) {
List<TjOrgCountDto> tjOrgCountDtoList =equipmentCountSummaryMapper.TjOrgCount(req.getOrgId(),
req.getTypeIdsList(),req.getSizeNameList(),req.getYear());
//对组织机构进行排序
Comparator<TjCountDto> orgComparator = createOrgComparator();
Collections.sort(tjCountDtoList, orgComparator);
Page<TjCountDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
Comparator<TjOrgCountDto> orgComparator = createOrgComparator();
Collections.sort(tjOrgCountDtoList, orgComparator);
Page<TjOrgCountDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
req.setPageNo(1L);
req.setPageSize(10L);
}
long startIndex = (req.getPageNo() - 1) * req.getPageSize();
long endIndex = Math.min(startIndex + req.getPageSize(), tjCountDtoList.size());
List<TjCountDto> subList = tjCountDtoList.subList((int) startIndex, (int)endIndex);
page.setTotal(tjCountDtoList.size());
long endIndex = Math.min(startIndex + req.getPageSize(), tjOrgCountDtoList.size());
List<TjOrgCountDto> subList = tjOrgCountDtoList.subList((int) startIndex, (int)endIndex);
page.setTotal(tjOrgCountDtoList.size());
page.setRecords(subList);
return PageResultFactory.createPageResult(page);
}
@Override
public FinalTjCountDto TjOrgCountSum(TjCountReq req) {
FinalTjCountDto finalTjCountDto=equipmentCountSummaryMapper.TjOrgCountSum(req.getOrgId(),req.getSizeNameList(),
public FinalTjOrgCountDto TjOrgCountSum(TjOrgCountReq req) {
FinalTjOrgCountDto finalTjOrgCountDto =equipmentCountSummaryMapper.TjOrgCountSum(req.getOrgId(),req.getSizeNameList(),
req.getTypeIdsList(), req.getYear());
if (ObjectUtil.isNotNull(finalTjCountDto)) {
return finalTjCountDto;
if (ObjectUtil.isNotNull(finalTjOrgCountDto)) {
return finalTjOrgCountDto;
}else {
return new FinalTjCountDto();
return new FinalTjOrgCountDto();
}
}
@Override
public PageResult<TjCountDto> TjOrgCountDetailPage(TjCountReq req) {
public PageResult<TjOrgCountDto> TjOrgCountDetailPage(TjOrgCountReq req) {
int size = equipmentCountSummaryMapper.TjOrgCountDetailSum(req.getOrgId(),req.getYear(),req.getTypeIdsList(),req.getSizeNameList());
if (ObjectUtil.isNull(req.getPageNo()) && ObjectUtil.isNull(req.getPageSize())) {
req.setPageNo(1L);
req.setPageSize(10L);
}
Page<TjCountDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
List<TjCountDto> returnList=equipmentCountSummaryMapper.TjOrgCountDetail(req.getOrgId(),req.getYear(),
Page<TjOrgCountDto> page = PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize());
List<TjOrgCountDto> returnList=equipmentCountSummaryMapper.TjOrgCountDetail(req.getOrgId(),req.getYear(),
req.getTypeIdsList(),req.getSizeNameList(),(req.getPageNo()-1)* req.getPageSize(),req.getPageSize());
page.setTotal(size);
page.setRecords(returnList);
......@@ -397,8 +392,8 @@ public class TjServiceImpl implements TjService {
}
@Override
public List<TjCountDto> TjOrgCountDetailList(TjCountReq req) {
List<TjCountDto> returnList=equipmentCountSummaryMapper.TjOrgCountDetail(req.getOrgId(),req.getYear(),
public List<TjOrgCountDto> TjOrgCountDetailList(TjOrgCountReq req) {
List<TjOrgCountDto> returnList=equipmentCountSummaryMapper.TjOrgCountDetail(req.getOrgId(),req.getYear(),
req.getTypeIdsList(),req.getSizeNameList(),null,null);
return returnList;
}
......
jyzb-biz/src/main/resources/mapper/EquipmentCountSummaryMapper.xml
......@@ -38,7 +38,7 @@
<select id="addInfo" statementType="CALLABLE" >
{call AddEquipmentCountSummary()}
</select>
<select id="TjOrgCount" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjCountDto">
<select id="TjOrgCount" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto">
SELECT
t.org_id,
t.org_code,
......@@ -69,7 +69,7 @@
#{item}
</foreach>
</if>
<if test="sizeNameList!=null and !sizeNameList.size() > 0">
<if test="sizeNameList!=null and sizeNameList.size() > 0">
AND
<foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
size_name like CONCAT('%', #{item}, '%')
......@@ -81,49 +81,49 @@
GROUP BY
t.org_id,t.org_code, t.org_name,t.parent_id,t.d_name
</select>
<select id="TjOrgCountSum" resultType="com.junmp.jyzb.api.bean.dto.TjDto.FinalTjCountDto">
select sum(use_count),sum(fix_count),sum(number) FROM (
SELECT
t.org_id,
t.org_code,
t.org_name,
t.parent_id,
t.d_name,
MAX(t.`year`) AS `year`,
SUM(t.use_count) AS use_count,
SUM(t.fix_count) AS fix_count,
sum(CASE WHEN t.month = MONTH(CURRENT_DATE()) THEN t.number ELSE 0 END) AS number
FROM (
SELECT
org_id_int AS org_id,
org_code,
org_name,
parent_id,
org_name_short AS d_name,
`year`,
`month`,
SUM(use_count) AS use_count,
SUM(fix_count) AS fix_count,
sum(number) as number
FROM vie_equipment_count_summary
where `year`= #{year} and (org_id_int=#{orgId} or parent_id=#{orgId})
<if test="typeIdsList!=null and typeIdsList.size() > 0">
and type_id in
<foreach collection="typeIdsList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="sizeNameList!=null and !sizeNameList.size() > 0">
AND
<foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
size_name like CONCAT('%', #{item}, '%')
</foreach>
</if>
<select id="TjOrgCountSum" resultType="com.junmp.jyzb.api.bean.dto.TjDto.FinalTjOrgCountDto">
select sum(use_count) as use_count,sum(fix_count) as fix_count,sum(number) as number FROM (
SELECT
t.org_id,
t.org_code,
t.org_name,
t.parent_id,
t.d_name,
MAX(t.`year`) AS `year`,
SUM(t.use_count) AS use_count,
SUM(t.fix_count) AS fix_count,
sum(CASE WHEN t.month = MONTH(CURRENT_DATE()) THEN t.number ELSE 0 END) AS number
FROM (
SELECT
org_id_int AS org_id,
org_code,
org_name,
parent_id,
org_name_short AS d_name,
`year`,
`month`,
SUM(use_count) AS use_count,
SUM(fix_count) AS fix_count,
sum(number) as number
FROM vie_equipment_count_summary
where `year`= #{year} and (org_id_int=#{orgId} or parent_id=#{orgId})
<if test="typeIdsList!=null and typeIdsList.size() > 0">
and type_id in
<foreach collection="typeIdsList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="sizeNameList!=null and sizeNameList.size() > 0">
AND
<foreach collection="sizeNameList " item="item" open="(" separator="or" close=")">
size_name like CONCAT('%', #{item}, '%')
</foreach>
</if>
GROUP BY org_id,org_code,org_name,parent_id, d_name,`year`,month
) AS t
GROUP BY
t.org_id,t.org_code, t.org_name,t.parent_id,t.d_name
GROUP BY org_id,org_code,org_name,parent_id, d_name,`year`,month
) AS t
GROUP BY
t.org_id,t.org_code, t.org_name,t.parent_id,t.d_name
) as a
</select>
<select id="TjOrgCountDetailSum" resultType="java.lang.Integer">
......@@ -159,8 +159,7 @@
type_name,
sum(number) as number
FROM vie_equipment_count_summary
WHERE year = #{year}
org_id_int = #{orgId}
WHERE year = #{year} and org_id_int = #{orgId}
<if test="typeIdsList!=null and typeIdsList.size() > 0">
AND type_id IN
<foreach collection="typeIdsList " item="item" open="(" separator="," close=")">
......@@ -181,7 +180,7 @@
ORDER BY t.type_id,size_id
) as a
</select>
<select id="TjOrgCountDetail" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjCountDto">
<select id="TjOrgCountDetail" resultType="com.junmp.jyzb.api.bean.dto.TjDto.TjOrgCountDto">
SELECT
t.org_id,
t.org_code,
......@@ -213,8 +212,7 @@
type_name,
sum(number) as number
FROM vie_equipment_count_summary
WHERE year = #{year}
org_id_int = #{orgId}
WHERE year = #{year} and org_id_int = #{orgId}
<if test="typeIdsList!=null and typeIdsList.size() > 0">
AND type_id IN
<foreach collection="typeIdsList " item="item" open="(" separator="," close=")">
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/WorkProcessServiceImpl.java
......@@ -34,11 +34,13 @@ import com.junmp.junmpProcess.vo.*;
import com.junmp.jyzb.api.bean.query.ProcessReq.FormReq;
import com.junmp.jyzb.api.bean.query.ProcessReq.SuspendOrActivateDefinitionReq;
import com.junmp.jyzb.api.exception.enums.ProcessExceptionEnum;
import com.junmp.v2.auth.api.LoginUserApi;
import com.junmp.v2.auth.api.bean.login.LoginUser;
import com.junmp.v2.auth.api.context.LoginContext;
import com.junmp.v2.common.bean.request.BaseRequest;
import com.junmp.v2.common.bean.response.ApiRes;
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;
......@@ -274,7 +276,7 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
processTemplates.setTemplateId(templateId);
processTemplates.setFormName(req.getFormName());
processTemplates.setRemark(req.getRemark());
processTemplates.setIsStop(true);
processTemplates.setIsStop(false);
Date date= new Date();
processTemplates.setUpdated(date);
......@@ -285,6 +287,9 @@ public class WorkProcessServiceImpl extends ServiceImpl<ProcessTemplatesMapper,
@Override
public Boolean suspendOrActivateProcessDefinitionById(SuspendOrActivateDefinitionReq req) {
if (StringUtils.isBlank(req.getProcessDefinitionId()) || ObjectUtil.isNull(req.getProcessDefinitionId())){
throw new ServiceException(ProcessExceptionEnum.PROCESS_ISNOT_EXIST);
}
ProcessTemplates processTemplates = processTemplateService.getById(req.getFormId());
if (req.getIsStop() == true){
repositoryService.suspendProcessDefinitionById(req.getProcessDefinitionId(), true, null);
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/SysFormServiceImpl.java
......@@ -59,7 +59,7 @@ public class SysFormServiceImpl extends ServiceImpl<ProcessTemplatesMapper, Proc
processTemplates.setTemplateId(templateId);
processTemplates.setFormName(req.getFormName());
processTemplates.setRemark(req.getRemark());
processTemplates.setIsStop(false);
processTemplates.setIsStop(true);
Date date= new Date();
processTemplates.setUpdated(date);
processTemplateService.save(processTemplates);
......
pom.xml
......@@ -320,6 +320,12 @@
<artifactId>dict-biz</artifactId>
<version>${junmp.v2.version}</version>
</dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>file-biz</artifactId>
<version>${junmp.v2.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论