Skip to content

M
map-parent
Commit ab072abc by Guojunfeng
Options

网合平台代码更新

parent 00b88e73
Showing with 2803 additions and 15 deletions
common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/SysDictitem.java
......@@ -126,7 +126,6 @@ public class SysDictitem extends Model<SysDictitem> {
@ApiModelProperty(value = "应用场景9")
private String yycj9;
/**
* 获取主键值
*
......
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Column.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author Godffy
* @create 2023-07-27 15:28
*/
@Data
@TableName("tb_wh_column")
@ApiModel(value = "下发任务模板_列表(tb_wh_column)实体类",description = "")
public class Column extends Model<Column> {
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "列表主键")
private String id;
@ApiModelProperty(value = "对应的数据库表")
private String tableName;
@ApiModelProperty(value = "对应的excel列名")
private String fieldName;
@ApiModelProperty(value = "对应的数据库列名")
private String databaseName;
@ApiModelProperty(value = "对应的实体类字段名")
private String entityName;
@ApiModelProperty(value = "excel列名顺序")
private Integer fieldOrder;
@ApiModelProperty(value = "是否启用")
private String fieldOpen;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date gxsj;
@ApiModelProperty(value = "信息删除判断标志")
private String xxscPdbz;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ColumnDto.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.founder.commonutils.model.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author Godffy
* @create 2023-07-27 15:28
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class ColumnDto extends BaseDto {
@ApiModelProperty(value = "列表主键")
private String id;
@ApiModelProperty(value = "对应的数据库表")
private String tableName;
@ApiModelProperty(value = "对应的excel列名")
private String fieldName;
@ApiModelProperty(value = "对应的数据库列名")
private String databaseName;
@ApiModelProperty(value = "对应的实体类字段名")
private String entityName;
@ApiModelProperty(value = "excel列名顺序")
private String fieldOrder;
@ApiModelProperty(value = "是否启用")
private String fieldOpen;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date gxsj;
@ApiModelProperty(value = "信息删除判断标志")
private String xxscPdbz;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ColumnTemplate.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author Godffy
* @create 2023-07-28 9:55
*/
@Data
@TableName("tb_wh_column_template")
@ApiModel(value = "下发任务_模板列(tb_wh_column_template)实体类",description = "")
public class ColumnTemplate extends Model<ColumnTemplate> {
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "主键")
private String id;
@ApiModelProperty(value = "用户拥有的模板id")
private String templateId;
@ApiModelProperty(value = "主任务拥有的模板id")
private String maintaskId;
@ApiModelProperty(value = "列名")
private String columnId;
@ApiModelProperty(value = "是否开启")
private String fieldOpen;
@ApiModelProperty(value = "对应的excel列名")
private String fieldName;
@ApiModelProperty(value = "对应的实体类字段名")
private String entityName;
@ApiModelProperty(value = "excel列名顺序")
private Integer fieldOrder;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date gxsj;
@ApiModelProperty(value = "信息删除判断标志")
private String xxscPdbz;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/ColumnTemplateDto.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.founder.commonutils.model.BaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author Godffy
* @create 2023-07-28 9:55
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class ColumnTemplateDto extends BaseDto {
@ApiModelProperty(value = "主键")
private String id;
@ApiModelProperty(value = "用户拥有的模板id")
private String templateId;
@ApiModelProperty(value = "用户拥有的模板名字")
private String templateName;
@ApiModelProperty(value = "用户ID")
private String userId;
@ApiModelProperty(value = "列名")
private String columnId;
@ApiModelProperty(value = "是否开启")
private String fieldOpen;
@ApiModelProperty(value = "对应的excel列名")
private String fieldName;
@ApiModelProperty(value = "对应的实体类字段名")
private String entityName;
@ApiModelProperty(value = "excel列名顺序")
private Integer fieldOrder;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date gxsj;
@ApiModelProperty(value = "信息删除判断标志")
private String xxscPdbz;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/MainTask.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
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 com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author Godffy
* @create 2023-08-01 10:07
*/
@Data
@TableName("tb_wh_maintask")
@ApiModel(value = "主任务表(tb_wh_maintask)实体类",description = "")
public class MainTask extends Model<MainTask> {
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "主键")
private String id;
@ApiModelProperty(value = "主任务名称")
private String taskName;
@ApiModelProperty(value = "主任务类型")
private String taskType;
@ApiModelProperty(value = "任务完成期限")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date deadLine;
@ApiModelProperty(value = "主任务内容")
private String taskContent;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date gxsj;
@ApiModelProperty(value = "信息删除判断标志")
private String xxscPdbz;
@ApiModelProperty(value = "子任务条数")
@TableField(exist = false)
private String taskCount;
@ApiModelProperty(value = "未反馈数量")
@TableField(exist = false)
private String wfkCount;
@ApiModelProperty(value = "已反馈数量")
@TableField(exist = false)
private String yfkCount;
@ApiModelProperty(value = "未超时数量")
@TableField(exist = false)
private String wcsCount;
@ApiModelProperty(value = "已超时数量")
@TableField(exist = false)
private String ycsCount;
@ApiModelProperty(value = "未流转数量")
@TableField(exist = false)
private String wlzCount;
@ApiModelProperty(value = "已流转数量")
@TableField(exist = false)
private String ylzCount;
@ApiModelProperty(value = "未移交数量")
@TableField(exist = false)
private String wyjCount;
@ApiModelProperty(value = "已移交数量")
@TableField(exist = false)
private String yyjCount;
@ApiModelProperty(value = "未退回数量")
@TableField(exist = false)
private String wthCount;
@ApiModelProperty(value = "未退回数量")
@TableField(exist = false)
private String ythCount;
@ApiModelProperty(value = "未评价数量")
@TableField(exist = false)
private String wpjCount;
@ApiModelProperty(value = "已评价数量")
@TableField(exist = false)
private String ypjCount;
@ApiModelProperty(value = "反馈状态")
@TableField(exist = false)
private String fkzt;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/MainTaskDto.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.founder.commonutils.model.BaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
/**
* @author Godffy
* @create 2023-08-01 10:07
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class MainTaskDto extends BaseDto {
@ApiModelProperty(value = "主键")
private String id;
@ApiModelProperty(value = "子任务文件")
private MultipartFile file;
@ApiModelProperty(value = "主任务名称")
private String taskName;
@ApiModelProperty(value = "主任务类型")
private String taskType;
@ApiModelProperty(value = "任务完成期限")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date deadLine;
@ApiModelProperty(value = "主任务内容")
private String taskContent;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date gxsj;
@ApiModelProperty(value = "信息删除判断标志")
private String xxscPdbz;
/**
* 0：全部未反馈
* 1：部分已反馈
* 2：全部已反馈
*/
@ApiModelProperty(value = "任务反馈状态")
private String rwfkzt;
/**
* 0：全部未超时
* 1：部分已超时
* 2：全部已超时
*/
@ApiModelProperty(value = "任务超时状态")
private String rwcszt;
/**
* 0：全部未流转
* 1：部分已流转
* 2：全部已流转
*/
@ApiModelProperty(value = "任务流转状态")
private String rwlzzt;
/**
* 0：全部未移交
* 1：部分已移交
* 2：全部已移交
*/
@ApiModelProperty(value = "任务移交状态")
private String rwyjzt;
/**
* 0：全部未退回
* 1：部分已退回
* 2：全部已退回
*/
@ApiModelProperty(value = "任务退回状态")
private String rwthzt;
/**
* 0：全部未评价
* 1：部分已评价
* 2：全部已评价
*/
@ApiModelProperty(value = "任务评价状态")
private String rwpjzt;
//子任务才有接收人
@ApiModelProperty(value = "任务接收人账号")
private String jsrzh;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/SubTaskDto.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.founder.commonutils.model.BaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
/**
* @author Godffy
* @create 2023-08-01 10:19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class SubTaskDto extends BaseDto {
@ApiModelProperty(value = "主键")
private String id;
@ApiModelProperty(value = "反馈文件")
private MultipartFile file;
@ApiModelProperty(value = "主任务编号")
private String mainId;
@ApiModelProperty(value = "序号（用于数据排序）")
private String sortflag;
@ApiModelProperty(value = "任务接收人账号")
private String jsrzh;
@ApiModelProperty(value = "任务接收人警号")
private String jsrjh;
@ApiModelProperty(value = "任务接收人姓名")
private String jsrxm;
@ApiModelProperty(value = "任务接收人身份证号")
private String jsrsfzh;
@ApiModelProperty(value = "任务接收人联系电话")
private String jsrlxdh;
@ApiModelProperty(value = "任务接收人单位代码")
private String jsrdwdm;
@ApiModelProperty(value = "任务接收人单位名称")
private String jsrdwmc;
@ApiModelProperty(value = "任务反馈人警号")
private String fkrjh;
@ApiModelProperty(value = "任务反馈人姓名")
private String fkrxm;
@ApiModelProperty(value = "任务反馈人身份证号")
private String fkrsfzh;
@ApiModelProperty(value = "任务反馈人联系电话")
private String fkrlxdh;
@ApiModelProperty(value = "任务反馈人单位代码")
private String fkrdwdm;
@ApiModelProperty(value = "任务反馈人单位名称")
private String fkrdwmc;
@ApiModelProperty(value = "批次（示例：2023年6月）")
private String batch;
@ApiModelProperty(value = "模板内容：姓名")
private String name;
@ApiModelProperty(value = "证件类型")
private String zjlx;
@ApiModelProperty(value = "电话")
private String telephone;
@ApiModelProperty(value = "IMEI（国际移动设备标识码）")
private String imei;
@ApiModelProperty(value = "IMSI（国际移动用户标识码）")
private String imsi;
@ApiModelProperty(value = "微信号")
private String wechat;
@ApiModelProperty(value = "微信ID")
private String wechatId;
@ApiModelProperty(value = "QQ号")
private String qq;
@ApiModelProperty(value = "登记地址")
private String djdz;
@ApiModelProperty(value = "收件地址")
private String sjdz;
@ApiModelProperty(value = "所属分局代码")
private String ssdwdm;
@ApiModelProperty(value = "所属分局名称")
private String ssdwmc;
@ApiModelProperty(value = "处置情况")
private String czqk;
@ApiModelProperty(value = "常驻活动地")
private String czhdd;
@ApiModelProperty(value = "常上网地址")
private String cswdz;
@ApiModelProperty(value = "车牌号")
private String cph;
@ApiModelProperty(value = "人像位置")
private String rxwz;
@ApiModelProperty(value = "车辆卡口位置")
private String clkkwz;
@ApiModelProperty(value = "最新时间")
private String zxsj;
@ApiModelProperty(value = "群聊ID")
private String qlId;
@ApiModelProperty(value = "案件名称")
private String ajmc;
@ApiModelProperty(value = "案件状态")
private String ajzt;
@ApiModelProperty(value = "案件编号")
private String ajbh;
@ApiModelProperty(value = "目前活动地区")
private String mqhddq;
@ApiModelProperty(value = "目前活动区县（镇街）")
private String mqhdqx;
@ApiModelProperty(value = "最新位置")
private String zxwz;
@ApiModelProperty(value = "户籍地址")
private String hjdz;
@ApiModelProperty(value = "案件类别")
private String ajlb;
@ApiModelProperty(value = "前科信息")
private String qkxx;
@ApiModelProperty(value = "立案单位")
private String ladw;
@ApiModelProperty(value = "立案日期")
private String larq;
@ApiModelProperty(value = "工作单位")
private String gzdw;
@ApiModelProperty(value = "最新铁路车次")
private String zxtlcc;
@ApiModelProperty(value = "最新航班")
private String zxhb;
@ApiModelProperty(value = "入住酒店")
private String rzjd;
@ApiModelProperty(value = "入住时间")
private String rzsj;
@ApiModelProperty(value = "出入境")
private String crj;
@ApiModelProperty(value = "出入境时间")
private String crjsj;
@ApiModelProperty(value = "婚姻情况")
private String hyqk;
@ApiModelProperty(value = "同户人员姓名")
private String thryxm;
@ApiModelProperty(value = "同户人员身份证")
private String thrysfz;
@ApiModelProperty(value = "同户人员联系电话")
private String thrylxdh;
@ApiModelProperty(value = "联系民警姓名")
private String lxmjxm;
@ApiModelProperty(value = "联系民警警号")
private String lxmjjh;
@ApiModelProperty(value = "联系民警联系电话")
private String lxmjlxdh;
@ApiModelProperty(value = "备注1")
private String bz1;
@ApiModelProperty(value = "备注2")
private String bz2;
@ApiModelProperty(value = "备注3")
private String bz3;
@ApiModelProperty(value = "备注4")
private String bz4;
@ApiModelProperty(value = "备注5")
private String bz5;
@ApiModelProperty(value = "备注6")
private String bz6;
@ApiModelProperty(value = "备注7")
private String bz7;
@ApiModelProperty(value = "备注8")
private String bz8;
@ApiModelProperty(value = "备注9")
private String bz9;
@ApiModelProperty(value = "备注10")
private String bz10;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date gxsj;
@ApiModelProperty(value = "信息删除判断标志")
private String xxscPdbz;
@ApiModelProperty(value = "证件号码")
private String zjhm;
/**
* 反馈标志
* 0：未反馈
* 1：已反馈
*/
@ApiModelProperty(value = "反馈标志")
private String fkbz;
/**
* 超时标志
* 0：未超时
* 1：已超时
*/
@ApiModelProperty(value = "超时标志")
private String csbz;
/**
* 流转标志
* 0：未流转
* 1：已流转
*/
@ApiModelProperty(value = "流转标志")
private String lzbz;
/**
* 移交标志
* 0：未移交
* 1：已移交
*/
@ApiModelProperty(value = "移交标志")
private String yjbz;
@ApiModelProperty(value = "移交人警号")
private String yjrjh;
@ApiModelProperty(value = "移交人姓名")
private String yjrxm;
@ApiModelProperty(value = "移交人身份证号")
private String yjrsfzh;
@ApiModelProperty(value = "移交人联系电话")
private String yjrlxdh;
@ApiModelProperty(value = "移交人单位代码")
private String yjrdwdm;
@ApiModelProperty(value = "移交人单位名称")
private String yjrdwmc;
/**
* 退回标志
* 0：未退回
* 1：已退回
*/
@ApiModelProperty(value = "退回标志")
private String thbz;
/**
* 评价标志
* 0：未评价
* 1：已评价
*/
@ApiModelProperty(value = "评价标志")
private String pjbz;
@ApiModelProperty(value = "用户评价")
private String evaluation;
@ApiModelProperty(value = "主任务类型")
private String mainTaskType;
@ApiModelProperty(value = "主任务名称")
private String mainTaskName;
/**
* 子任务反馈开始时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date zrwfkkssj;
/**
* 子任务反馈结束时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date zrwfkjssj;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/TemplateUser.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author Godffy
* @create 2023-07-28 16:19
*/
@Data
@TableName("tb_wh_template_user")
@ApiModel(value = "下发任务_用户模板(tb_wh_template_user)实体类",description = "")
public class TemplateUser extends Model<TemplateUser> {
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "主键")
private String id;
@ApiModelProperty(value = "用户拥有的模板名字")
private String templateName;
@ApiModelProperty(value = "用户ID")
private String userId;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date gxsj;
@ApiModelProperty(value = "信息删除判断标志")
private String xxscPdbz;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/TemplateUserDto.java 0 → 100644
package com.founder.commonutils.model.zczxEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.founder.commonutils.model.BaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author Godffy
* @create 2023-07-28 16:19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
public class TemplateUserDto extends BaseDto {
@ApiModelProperty(value = "主键")
private String id;
@ApiModelProperty(value = "主键集合")
private String[] ids;
@ApiModelProperty(value = "用户拥有的模板id")
private String templateId;
@ApiModelProperty(value = "用户拥有的模板名字")
private String templateName;
@ApiModelProperty(value = "用户ID")
private String userId;
@ApiModelProperty(value = "列名")
private String columnId;
@ApiModelProperty(value = "是否开启")
private String fieldOpen;
@ApiModelProperty(value = "对应的excel列名")
private String fieldName;
@ApiModelProperty(value = "对应的实体类字段名")
private String entityName;
@ApiModelProperty(value = "excel列名顺序")
private Integer fieldOrder;
@ApiModelProperty(value = "录入人")
private String lrr;
@ApiModelProperty(value = "录入人警号")
private String lrrjh;
@ApiModelProperty(value = "录入人单位代码")
private String lrrdwdm;
@ApiModelProperty(value = "录入人单位名称")
private String lrrdwmc;
@ApiModelProperty(value = "入库时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date rksj;
@ApiModelProperty(value = "更新人")
private String gxr;
@ApiModelProperty(value = "更新人警号")
private String gxrjh;
@ApiModelProperty(value = "更新人单位代码")
private String gxrdwdm;
@ApiModelProperty(value = "更新人单位名称")
private String gxrdwmc;
@ApiModelProperty(value = "更新时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date gxsj;
@ApiModelProperty(value = "信息删除判断标志")
private String xxscPdbz;
}
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/Xcrw.java
......@@ -183,6 +183,7 @@ public class Xcrw extends Model<Xcrw> {
private String xcrwThzt;
@ApiModelProperty(value = "协查任务退回状态")
@TableField(exist = false)
private String xcrwThztStr;
@ApiModelProperty(value = "协查任务_退回信息")
......
common/common_utils/src/main/java/com/founder/commonutils/model/zczxEntity/XcrwDto.java
......@@ -221,9 +221,15 @@ public class XcrwDto extends BaseDto {
@ApiModelProperty(value = "审批类型")
private String auditType;
@ApiModelProperty(value = "申请单名称")
private String auditName;
@ApiModelProperty(value = "审批人id（表示当前审批节点应该让谁来审批）")
private String auditUserId;
@ApiModelProperty(value = "审批人姓名（表示当前审批节点应该让谁来审批）")
private String auditUserName;
/**
* 审核人类型（表示当前节点审核时审核人的类型）
* 1：特指某人
......
common/common_utils/src/main/java/com/founder/commonutils/util/Base64Util.java
......@@ -70,6 +70,9 @@ public class Base64Util {
System.out.println(Base64Util.encode("123456"));
System.out.println(Base64Util.decode("YmoxNTAxNDc="));
System.out.println(Base64Util.encode("123456"));
System.out.println(Base64Util.decode("YmoxNTAxNDc="));
}
/**
......
common/common_utils/src/main/java/com/founder/commonutils/util/WhExcelUtil.java 0 → 100644
package com.founder.commonutils.util;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.ss.usermodel.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.web.multipart.MultipartFile;
import java.beans.PropertyDescriptor;
import java.io.*;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* @author Godffy
* @create 2023-08-01 16:57
*/
public class WhExcelUtil {
/**
* 导入Excel转为实体类
* @param fileName
* @param file
* @param t
* @return
* @throws Exception
*/
public static <T> List handelExcel(String fileName, MultipartFile file, Class<T> t)throws Exception{
if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
throw new Exception();
}
boolean isExcel2003 = true;
if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
isExcel2003 = false;
}
InputStream is = file.getInputStream();
Workbook wb = null;
if (isExcel2003) {
wb = new HSSFWorkbook(is);
} else {
wb = new XSSFWorkbook(is);
}
Sheet sheet = wb.getSheetAt(0);
//获取表头列
Row row = sheet.getRow(0);
//表头字段放入titleList中
List<String> titleList = new ArrayList<String>();
for (int i = 0; i < row.getLastCellNum(); i++){
titleList.add(row.getCell(i).getStringCellValue());
}
//获得该类的所有属性
Field[] fields = t.getDeclaredFields();
List<T> list = new ArrayList<T>();
for (int r = 1; r <= sheet.getLastRowNum(); r++){
T tIns = t.newInstance();
boolean nullrow=false;
for(Field field:fields){
PropertyDescriptor pd = new PropertyDescriptor(field.getName(),t);
if (!"id".equals(field.getName())) {
int num = titleList.indexOf(field.getName());
if(num != -1) {
//获得set方法
Method method = pd.getWriteMethod();
System.out.println(num);
System.out.println(r);
Row nowrow = sheet.getRow(r);
if (nowrow !=null){
Cell cell = nowrow.getCell(num);
if (cell != null) {
cell.setCellType(CellType.STRING);
method.invoke(tIns, cell.getStringCellValue());
} else {
method.invoke(tIns, "");
}
} else {
nullrow=true;
break;
}
}
}
}
if (nullrow == true){
break;
}
list.add(tIns);
}
return list;
}
/**
* 读取Excel的内容，第一维数组存储的是一行中格列的值，二维数组存储的是多少个行
*
* @param file
* 读取数据的源Excel
* @param ignoreRows
* 读取数据忽略的行数，比喻行头不需要读入 忽略的行数为1
* @return 读出的Excel中数据的内容
* @throws FileNotFoundException
* @throws IOException
*/
public static String[][] getData(File file, int ignoreRows)
throws FileNotFoundException, IOException {
List<String[]> result = new ArrayList<String[]>();
int rowSize = 0;
BufferedInputStream in = new BufferedInputStream(new FileInputStream(
file));
// 打开HSSFWorkbook
POIFSFileSystem fs = new POIFSFileSystem(in);
HSSFWorkbook wb = new HSSFWorkbook(fs);
HSSFCell cell = null;
for (int sheetIndex = 0; sheetIndex < wb.getNumberOfSheets(); sheetIndex++) {
HSSFSheet st = wb.getSheetAt(sheetIndex);
// 第一行为标题，不取
for (int rowIndex = ignoreRows; rowIndex <= st.getLastRowNum(); rowIndex++) {
HSSFRow row = st.getRow(rowIndex);
if (row == null) {
continue;
}
int tempRowSize = row.getLastCellNum() + 1;
if (tempRowSize > rowSize) {
rowSize = tempRowSize;
}
String[] values = new String[rowSize];
Arrays.fill(values, "");
boolean hasValue = false;
for (short columnIndex = 0; columnIndex <= row.getLastCellNum(); columnIndex++) {
String value = "";
cell = row.getCell(columnIndex);
if (cell != null) {
// 注意：一定要设成这个，否则可能会出现乱码
// cell.setEncoding(HSSFCell.ENCODING_UTF_16);
switch (cell.getCellTypeEnum()) {
case STRING:
value = cell.getStringCellValue();
break;
case NUMERIC:
if (HSSFDateUtil.isCellDateFormatted(cell)) {
Date date = cell.getDateCellValue();
if (date != null) {
value = new SimpleDateFormat("yyyy-MM-dd")
.format(date);
} else {
value = "";
}
} else {
value = new DecimalFormat("0").format(cell
.getNumericCellValue());
}
break;
case FORMULA:
// 导入时如果为公式生成的数据则无值
if (!cell.getStringCellValue().equals("")) {
value = cell.getStringCellValue();
} else {
value = cell.getNumericCellValue() + "";
}
break;
case BLANK:
break;
case ERROR:
value = "";
break;
case BOOLEAN:
value = (cell.getBooleanCellValue() == true ? "Y"
: "N");
break;
default:
value = "";
}
}
if (columnIndex == 0 && value.trim().equals("")) {
break;
}
values[columnIndex] = rightTrim(value);
hasValue = true;
}
if (hasValue) {
result.add(values);
}
}
}
in.close();
String[][] returnArray = new String[result.size()][rowSize];
for (int i = 0; i < returnArray.length; i++) {
returnArray[i] = (String[]) result.get(i);
}
return returnArray;
}
/**
* 去掉字符串右边的空格
*
* @param str
* 要处理的字符串
* @return 处理后的字符串
*/
public static String rightTrim(String str) {
if (str == null) {
return "";
}
int length = str.length();
for (int i = length - 1; i >= 0; i--) {
if (str.charAt(i) != 0x20) {
break;
}
length--;
}
return str.substring(0, length);
}
}
common/pom.xml
......@@ -119,12 +119,12 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.14</version>
<version>3.17</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.14</version>
<version>3.17</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
......
common/service_base/src/main/java/com/founder/servicebase/controller/SysDictitemController.java 0 → 100644
package com.founder.servicebase.controller;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.founder.servicebase.service.SysDictitemService;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* @author Godffy
* @create 2023-08-03 9:49
*/
@CrossOrigin
@RestController
@RequestMapping("/sysDic")
@Api(tags = "字典表控制器")
public class SysDictitemController extends ApiController {
@Resource
private SysDictitemService sysDictitemService;
}
common/service_base/src/main/java/com/founder/servicebase/controller/SysUserController.java
......@@ -71,10 +71,6 @@ public class SysUserController extends ApiController {
String username = desEncrypt(user.getUsername(), KEY, IV).trim();
String password = desEncrypt(user.getPassword(), KEY, IV).trim();
// 解密失败
if ("123456".equals(password) || "123456".equals(password)) {
return MapRestResult.build(201, "密码过于简单,请重制!", "密码过于简单,请重制!");
}
// 解密失败
if ("解密失败".equals(username) || "解密失败".equals(password)) {
return MapRestResult.build(201, "解密失败", "解密失败");
}
......@@ -93,13 +89,15 @@ public class SysUserController extends ApiController {
if (one == null) {
return MapRestResult.build(201, "用户名或密码错误", null);
}
// if (!DigestUtil.encrypt(password).equals(one.getPassword())) {
// return MapRestResult.build(500, "账号、密码不正确", null);
// }
if (!Base64Util.encode(password).equals(one.getPassword())) {
return MapRestResult.build(201, "账号、密码不正确", null);
}
if ("123456".equals(Base64Util.decode(one.getPassword()))) {
return MapRestResult.build(201, "密码过于简单,请重置!", "密码过于简单,请重置!");
}
// 拿到真实ip
one.setIp(NetworkUtil.getIpAddr(request));
JwtUser util = new JwtUser();
......
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/SysDictitemMapper.java 0 → 100644
package com.founder.servicebase.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.newPublicEntity.SysDictitem;
/**
* @author Godffy
* @create 2023-08-03 9:54
*/
public interface SysDictitemMapper extends BaseMapper<SysDictitem> {
}
common/service_base/src/main/java/com/founder/servicebase/mapper/mysqlMapper/xml/SysDictitemMapper.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.founder.servicebase.mapper.mysqlMapper.SysDictitemMapper">
</mapper>
common/service_base/src/main/java/com/founder/servicebase/service/SysDictitemService.java 0 → 100644
package com.founder.servicebase.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.newPublicEntity.SysDictitem;
/**
* @author Godffy
* @create 2023-08-03 9:51
*/
public interface SysDictitemService extends IService<SysDictitem> {
}
common/service_base/src/main/java/com/founder/servicebase/service/serviceimpl/SysDictitemServiceImpl.java 0 → 100644
package com.founder.servicebase.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.newPublicEntity.SysDictitem;
import com.founder.servicebase.mapper.mysqlMapper.SysDictitemMapper;
import com.founder.servicebase.service.SysDictitemService;
import org.springframework.stereotype.Service;
/**
* @author Godffy
* @create 2023-08-03 9:53
*/
@Service("SysDictitemService")
public class SysDictitemServiceImpl extends ServiceImpl<SysDictitemMapper, SysDictitem> implements SysDictitemService {
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ColumnController.java 0 → 100644
package com.founder.publicapi.controller.ZczxService;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.SysUser;
import com.founder.commonutils.model.zczxEntity.Column;
import com.founder.commonutils.model.zczxEntity.ColumnDto;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.service.ColumnService;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
/**
* @author Godffy
* @create 2023-07-27 15:37
*/
@CrossOrigin
@RestController
@RequestMapping("/column")
@Api(tags = "下发任务模板_列表")
public class ColumnController extends ApiController {
@Resource
private ColumnService columnService;
@PostMapping("save")
@ApiOperation(value = "新增模板列")
@OperLog(message = "新增模板列", operation = OperationType.ADD)
@Transactional
public MapRestResult save(@RequestBody ColumnDto columnDto) {
Column column = new Column();
BeanUtil.copyProperties(columnDto, column);
//主键
String id = KeyUtil.getUUIDKey("C");
column.setId(id);
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = requestAttributes.getRequest();
SysUser user = (SysUser) request.getAttribute("user");
String trueName = user.getTrueName();
String policemanid = user.getPolicemanid();
String unitcode = user.getUnitcode();
String unitname = user.getUnitname();
column.setLrr(trueName);//姓名
column.setLrrjh(policemanid);//警号
column.setLrrdwdm(unitcode);//创建人单位代码
column.setLrrdwmc(unitname);//专项创建单位名称
column.setRksj(new Date());//创建时间
columnService.save(column);
return new MapRestResult();
}
//查询全部列表头
@GetMapping("selectAllColumn")
@ApiOperation(value = "查询全部列表头")
@OperLog(message = "查询全部列表头", operation = OperationType.QUERY)
public MapRestResult selectAllColumn() {
QueryWrapper<Column> qw = new QueryWrapper<>();
qw.eq("xxsc_pdbz", "0");//只查询有效的
qw.orderByAsc("field_order");
List<Column> list = this.columnService.list(qw);
return new MapRestResult(200, "查询成功!", list.size(), list);
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ColumnTemplateController.java 0 → 100644
package com.founder.publicapi.controller.ZczxService;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.SysUser;
import com.founder.commonutils.model.zczxEntity.ColumnTemplate;
import com.founder.commonutils.model.zczxEntity.ColumnTemplateDto;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.service.ColumnTemplateService;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
/**
* @author Godffy
* @create 2023-07-28 9:37
*/
@CrossOrigin
@RestController
@RequestMapping("/columnTemplate")
@Api(tags = "下发任务_模板列")
public class ColumnTemplateController extends ApiController {
@Resource
private ColumnTemplateService columnTemplateService;
@PostMapping("save")
@ApiOperation(value = "保存模板拥有的列")
@OperLog(message = "保存模板拥有的列", operation = OperationType.ADD)
@Transactional
public MapRestResult save(@RequestBody List<ColumnTemplateDto> list) {
//用户新建的模板id
String templateId = KeyUtil.getUUIDKey("T");
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = requestAttributes.getRequest();
SysUser user = (SysUser) request.getAttribute("user");
String trueName = user.getTrueName();
String policemanid = user.getPolicemanid();
String unitcode = user.getUnitcode();
String unitname = user.getUnitname();
for (ColumnTemplateDto columnTemplateDto : list) {
ColumnTemplate columnTemplate = new ColumnTemplate();
BeanUtil.copyProperties(columnTemplateDto, columnTemplate);
columnTemplate.setId(KeyUtil.getUUIDKey("CU"));
columnTemplate.setTemplateId(templateId);//模板id
// columnTemplate.setUserId(policemanid);//用户id(警号)拥有的模板号
columnTemplate.setLrr(trueName);//姓名
columnTemplate.setLrrjh(policemanid);//警号
columnTemplate.setLrrdwdm(unitcode);//创建人单位代码
columnTemplate.setLrrdwmc(unitname);//专项创建单位名称
columnTemplate.setRksj(new Date());//创建时间
columnTemplateService.save(columnTemplate);
}
return new MapRestResult();
}
//根据模板id查询模板拥有的列
@GetMapping("selectAllColumnByTemplateId")
@ApiOperation(value = "根据模板id查询模板拥有的列")
@OperLog(message = "根据模板id查询模板拥有的列", operation = OperationType.QUERY)
public MapRestResult selectAllColumnByTemplateId(@RequestParam("templateId") String templateId) {
QueryWrapper<ColumnTemplate> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("TEMPLATE_ID", templateId);//只查有效的
queryWrapper.eq("XXSC_PDBZ", "0");//只查有效的
List<ColumnTemplate> list = this.columnTemplateService.list(queryWrapper);
return new MapRestResult(200, "查询成功!", list.size(), list);
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/TemplateUserController.java 0 → 100644
package com.founder.publicapi.controller.ZczxService;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.api.ApiController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.founder.commonutils.model.newPublicEntity.MapRestResult;
import com.founder.commonutils.model.newPublicEntity.SysUser;
import com.founder.commonutils.model.zczxEntity.ColumnTemplate;
import com.founder.commonutils.model.zczxEntity.TemplateUser;
import com.founder.commonutils.model.zczxEntity.TemplateUserDto;
import com.founder.commonutils.util.KeyUtil;
import com.founder.publicapi.service.ColumnTemplateService;
import com.founder.publicapi.service.TemplateUserService;
import com.founder.servicebase.logs.OperLog;
import com.founder.servicebase.logs.OperationType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* @author Godffy
* @create 2023-07-28 16:14
*/
@CrossOrigin
@RestController
@RequestMapping("/templateUser")
@Api(tags = "下发任务_用户模板")
public class TemplateUserController extends ApiController {
@Resource
private TemplateUserService templateUserService;
@Resource
private ColumnTemplateService columnTemplateService;
//用户保存该用户拥有的模板字段列表
//保存的时候要校验表头顺序field_order不能有重复的,不然前端读取时无法排序
//前端选表头，传个List过来存
@PostMapping("save")
@ApiOperation(value = "保存用户拥有的模板")
@OperLog(message = "保存用户拥有的模板", operation = OperationType.ADD)
@Transactional
public MapRestResult save(@RequestBody List<TemplateUserDto> list) {
if (list.isEmpty()) {
return MapRestResult.build(201, "模板列表为空", null);
}
//用户新建的模板id
String templateId = KeyUtil.getUUIDKey("TU");
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = requestAttributes.getRequest();
SysUser user = (SysUser) request.getAttribute("user");
String trueName = user.getTrueName();
String policemanid = user.getPolicemanid();
String unitcode = user.getUnitcode();
String unitname = user.getUnitname();
//用户拥有的模板
TemplateUser templateUser = new TemplateUser();
BeanUtil.copyProperties(list.get(0), templateUser);
templateUser.setId(templateId);//用户拥有的模板id
templateUser.setUserId(policemanid);//用户id(警号)拥有的模板号
templateUser.setLrr(trueName);//姓名
templateUser.setLrrjh(policemanid);//警号
templateUser.setLrrdwdm(unitcode);//创建人单位代码
templateUser.setLrrdwmc(unitname);//专项创建单位名称
templateUser.setRksj(new Date());//创建时间
templateUserService.save(templateUser);//保存用户拥有的模板
for (TemplateUserDto templateUserDto : list) {
//模板对应的列
ColumnTemplate columnTemplate = new ColumnTemplate();
BeanUtil.copyProperties(templateUserDto, columnTemplate);
columnTemplate.setId(KeyUtil.getUUIDKey("CT"));
columnTemplate.setTemplateId(templateId);//模板id
columnTemplate.setLrr(trueName);//姓名
columnTemplate.setLrrjh(policemanid);//警号
columnTemplate.setLrrdwdm(unitcode);//创建人单位代码
columnTemplate.setLrrdwmc(unitname);//专项创建单位名称
columnTemplate.setRksj(new Date());//创建时间
columnTemplateService.save(columnTemplate);//保存模板对应的列
}
return new MapRestResult();
}
//分页查询用户拥有的模板
@PostMapping("listTemplateUserForPage")
@ApiOperation(value = "分页查询用户拥有的模板")
@OperLog(message = "分页查询用户拥有的模板", operation = OperationType.QUERY)
public MapRestResult listTemplateUserForPage(@RequestBody TemplateUserDto templateUserDto) {
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = requestAttributes.getRequest();
SysUser user = (SysUser) request.getAttribute("user");
String policemanid = user.getPolicemanid();
QueryWrapper<TemplateUser> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("USER_ID", policemanid);//用户ID
queryWrapper.eq("XXSC_PDBZ", "0");//只查有效的
queryWrapper.orderByDesc("RKSJ");//入库时间倒叙
IPage page = new Page(templateUserDto.getPageNum(), templateUserDto.getPageSize());
IPage result = this.templateUserService.page(page, queryWrapper);
return new MapRestResult(200, "查询成功!", result.getTotal(), result);
}
//删除当前用户拥有的模板及其对应的模板列
@PostMapping("deleteTemplate")
@ApiOperation(value = "删除当前用户拥有的模板及其对应的模板列")
@OperLog(message = "删除当前用户拥有的模板及其对应的模板列", operation = OperationType.DELETE)
@Transactional
public MapRestResult deleteTemplate(@RequestBody TemplateUserDto templateUserDto) {
List<String> ids = Arrays.asList(templateUserDto.getIds());
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = requestAttributes.getRequest();
SysUser user = (SysUser) request.getAttribute("user");
String trueName = user.getTrueName();
String policemanid = user.getPolicemanid();
String unitcode = user.getUnitcode();
String unitname = user.getUnitname();
for (String id : ids) {
TemplateUser templateUser = new TemplateUser();
templateUser.setGxr(trueName);
templateUser.setGxrjh(policemanid);
templateUser.setGxrdwdm(unitcode);
templateUser.setGxrdwmc(unitname);
templateUser.setGxsj(new Date());
templateUser.setXxscPdbz("1");//删除
//只能删登录人自己的模板
QueryWrapper<TemplateUser> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("USER_ID", policemanid);//用户ID
queryWrapper.eq("ID", id);//模板表主键
queryWrapper.eq("XXSC_PDBZ", "0");//有效的
this.templateUserService.update(templateUser, queryWrapper);
ColumnTemplate columnTemplate = new ColumnTemplate();
columnTemplate.setGxr(trueName);
columnTemplate.setGxrjh(policemanid);
columnTemplate.setGxrdwdm(unitcode);
columnTemplate.setGxrdwmc(unitname);
columnTemplate.setGxsj(new Date());
columnTemplate.setXxscPdbz("1");//删除
//删模板id对应的模板列表数据
QueryWrapper<ColumnTemplate> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("TEMPLATE_ID", id);//模板ID
queryWrapper2.eq("XXSC_PDBZ", "0");//有效的
this.columnTemplateService.update(columnTemplate, queryWrapper2);
}
return new MapRestResult();
}
}
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/XcrwController.java
......@@ -148,6 +148,7 @@ public class XcrwController extends ApiController {
Approve approve = new Approve();
String approveId = KeyUtil.getUUIDKey("A");
approve.setId(approveId);
approve.setAuditName(xcrwDto.getAuditName());//审批申请单名字
approve.setFlowNo(xcrwbh);//关联协查任务编号
approve.setZxbh(xcrwDto.getZxbh());//协查任务关联的侦查专项编号
approve.setZxmc(xcrwDto.getZxmc());//协查任务的专项名称
......@@ -170,7 +171,7 @@ public class XcrwController extends ApiController {
approveDetail.setId(KeyUtil.getUUIDKey("AD"));//明细表主键
approveDetail.setAuditId(approveId);//关联审批主表
approveDetail.setAuditUserId(xcrwDto.getAuditUserId());//审批人id（表示当前审批节点应该让谁来审批）
approveDetail.setAuditUserName(trueName);//审批人姓名
approveDetail.setAuditUserName(xcrwDto.getAuditUserName());//审批人姓名
approveDetail.setAuditUserType(xcrwDto.getAuditUserType());//审批人类型,传1：特指某人
approveDetail.setAuditStatus("1");//审批人的审核结果，待审状态
approveDetail.setRksj(new Date());//入库时间
......
service/publicapi/src/main/java/com/founder/publicapi/controller/ZczxService/ZczxController.java
......@@ -95,7 +95,7 @@ public class ZczxController extends ApiController {
zczxRole.setLrrdwdm(unitcode);//创建人单位代码
zczxRole.setLrrdwmc(unitname);//创建单位名称
zczxRoleService.save(zczxRole);
return new MapRestResult();
return new MapRestResult(zxbh);
}
......@@ -279,6 +279,8 @@ public class ZczxController extends ApiController {
if (StringUtils.isBlank(zxbh)) {
return new MapRestResult(201, "专项编号不能为空", null);
}
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
......@@ -289,9 +291,22 @@ public class ZczxController extends ApiController {
String unitcode = user.getUnitcode();
String unitname = user.getUnitname();
//这里要补充查一下数据库，这个用户是否已经收藏这个侦查专项了（还没写！！！！！！！）
//收藏状态
QueryWrapper<ZczxRole> qw = new QueryWrapper<>();
qw.eq(StringUtils.isNotBlank(zxbh), "zxbh", zxbh);
qw.eq(StringUtils.isNotBlank(policemanid), "policemanid", policemanid);
qw.eq("zczx_sczt", "1");
qw.eq("xxsc_pdbz", "0");
ZczxRole sczt = zczxRoleService.getOne(qw);
if (sczt != null) {
return new MapRestResult(201, "该用户已收藏此侦查专项！", null);
}
ZczxRole zczxRole = new ZczxRole();
zczxRole.setId(KeyUtil.getUUIDKey("ZXR"));
zczxRole.setZxbh(zxbh);
zczxRole.setPolicemanid(policemanid);//所属警号
//基本信息
zczxRole.setLrr(trueName);
zczxRole.setLrrjh(policemanid);
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/ColumnMapper.java 0 → 100644
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.zczxEntity.Column;
/**
* @author Godffy
* @create 2023-07-27 15:40
*/
public interface ColumnMapper extends BaseMapper<Column> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/ColumnTemplateMapper.java 0 → 100644
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.zczxEntity.ColumnTemplate;
/**
* @author Godffy
* @create 2023-07-28 10:03
*/
public interface ColumnTemplateMapper extends BaseMapper<ColumnTemplate> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/MainTaskMapper.java 0 → 100644
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.founder.commonutils.model.zczxEntity.MainTask;
import com.founder.commonutils.model.zczxEntity.MainTaskDto;
/**
* @author Godffy
* @create 2023-08-01 10:11
*/
public interface MainTaskMapper extends BaseMapper<MainTask> {
IPage<MainTask> listMainTaskForPage(IPage page, MainTaskDto mainTaskDto);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/SubTaskMapper.java 0 → 100644
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.founder.commonutils.model.zczxEntity.SubTask;
import com.founder.commonutils.model.zczxEntity.SubTaskDto;
/**
* @author Godffy
* @create 2023-08-01 15:37
*/
public interface SubTaskMapper extends BaseMapper<SubTask> {
IPage<SubTask> listSubTaskForPage(IPage page, SubTaskDto subTaskDto);
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/TemplateUserMapper.java 0 → 100644
package com.founder.publicapi.mapper.mysqlMapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.founder.commonutils.model.zczxEntity.TemplateUser;
/**
* @author Godffy
* @create 2023-07-28 16:29
*/
public interface TemplateUserMapper extends BaseMapper<TemplateUser> {
}
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ColumnMapper.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.founder.publicapi.mapper.mysqlMapper.ColumnMapper">
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ColumnTemplateMapper.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.founder.publicapi.mapper.mysqlMapper.ColumnTemplateMapper">
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/MainTaskMapper.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.founder.publicapi.mapper.mysqlMapper.MainTaskMapper">
<select id="listMainTaskForPage" parameterType="com.founder.commonutils.model.zczxEntity.MainTaskDto"
resultType="com.founder.commonutils.model.zczxEntity.MainTask">
select
id,
taskName,
taskContent,
taskType,
deadLine,
lrr,
lrrjh,
lrrdwdm,
lrrdwmc,
rksj,
taskCount,
wfkCount,
yfkCount,
case when taskCount = wfkCount then '全部未反馈'
when yfkCount != 0 then '部分已反馈'
when taskCount = yfkCount then '全部已反馈'
end as fkzt,
wcsCount,
ycsCount
from(
select
id,
taskName,
taskContent,
taskType,
deadLine,
lrr,
lrrjh,
lrrdwdm,
lrrdwmc,
rksj,
COUNT(taskCount) taskCount,
sum(case when fkbz = '0' THEN 1 else 0 end ) as wfkCount,
sum(case when fkbz = '1' THEN 1 else 0 end ) as yfkCount,
sum(case when csbz = '0' THEN 1 else 0 end ) as wcsCount,
sum(case when csbz = '1' THEN 1 else 0 end ) as ycsCount,
sum(case when lzbz = '0' THEN 1 else 0 end ) as wlzCount,
sum(case when lzbz = '1' THEN 1 else 0 end ) as ylzCount,
sum(case when yjbz = '0' THEN 1 else 0 end ) as wyjCount,
sum(case when yjbz = '1' THEN 1 else 0 end ) as yyjCount,
sum(case when thbz = '0' THEN 1 else 0 end ) as wthCount,
sum(case when thbz = '1' THEN 1 else 0 end ) as ythCount,
sum(case when pjbz = '0' THEN 1 else 0 end ) as wpjCount,
sum(case when pjbz = '1' THEN 1 else 0 end ) as ypjCount
from
(
select
m.id id,
m.task_name taskName,
m.task_content taskContent,
m.task_type taskType,
m.dead_line deadLine,
m.lrr lrr,
m.lrrjh lrrjh,
m.lrrdwdm lrrdwdm,
m.lrrdwmc lrrdwmc,
m.rksj rksj,
s.id taskCount,
s.fkbz fkbz,
s.csbz csbz,
s.lzbz lzbz,
s.yjbz yjbz,
s.thbz thbz,
s.pjbz pjbz
from tb_wh_maintask m
left join tb_wh_subtask s on m.id = s.main_id
where
1=1
and m.xxsc_pdbz = '0'
and s.xxsc_pdbz = '0'
<if test="mainTaskDto.taskName != '' and mainTaskDto.taskName != null">
and m.task_name = #{mainTaskDto.taskName, jdbcType=VARCHAR}
</if>
<if test="mainTaskDto.id != '' and mainTaskDto.id != null">
and m.id = #{mainTaskDto.id, jdbcType=VARCHAR}
</if>
<if test="mainTaskDto.lrrjh != '' and mainTaskDto.lrrjh != null">
and m.lrrjh = #{mainTaskDto.lrrjh, jdbcType=VARCHAR}
</if>
<if test="mainTaskDto.taskType != '' and mainTaskDto.taskType != null">
and m.task_type = #{mainTaskDto.taskType, jdbcType=VARCHAR}
</if>
<if test="mainTaskDto.lrrdwdm != '' and mainTaskDto.lrrdwdm != null">
and m.lrrdwdm = #{mainTaskDto.lrrdwdm, jdbcType=VARCHAR}
</if>
<if test="mainTaskDto.jsrzh != '' and mainTaskDto.jsrzh != null">
and s.jsrzh = #{mainTaskDto.jsrzh, jdbcType=VARCHAR}
</if>
<choose>
<when test="mainTaskDto.beginTime != null and mainTaskDto.endTime !=null">
AND m.rksj between #{mainTaskDto.beginTime} and #{mainTaskDto.endTime}
</when>
<when test="mainTaskDto.beginTime != null and mainTaskDto.endTime ==null">
AND m.rksj &gt;= #{mainTaskDto.beginTime}
</when>
<when test="mainTaskDto.beginTime == null and mainTaskDto.endTime !=null">
AND m.rksj &lt;= #{mainTaskDto.endTime}
</when>
</choose>
)
group by id,taskName,taskContent,taskType,deadLine,lrr,lrrjh,lrrdwdm,lrrdwmc,rksj
order by rksj desc)
where 1=1
<if test="mainTaskDto.rwfkzt == '0'.toString()">
and taskCount = wfkCount
</if>
<if test="mainTaskDto.rwfkzt == '1'.toString()">
and yfkCount != 0
</if>
<if test="mainTaskDto.rwfkzt == '2'.toString()">
and taskCount = yfkCount
</if>
<if test="mainTaskDto.rwcszt == '0'.toString()">
and taskCount = wcsCount
</if>
<if test="mainTaskDto.rwcszt == '1'.toString()">
and ycsCount != 0
</if>
<if test="mainTaskDto.rwcszt == '2'.toString()">
and taskCount = ycsCount
</if>
<if test="mainTaskDto.rwlzzt == '0'.toString()">
and taskCount = wlzCount
</if>
<if test="mainTaskDto.rwlzzt == '1'.toString()">
and ylzCount != 0
</if>
<if test="mainTaskDto.rwlzzt == '2'.toString()">
and taskCount = ylzCount
</if>
<if test="mainTaskDto.rwyjzt == '0'.toString()">
and taskCount = wyjCount
</if>
<if test="mainTaskDto.rwyjzt == '1'.toString()">
and yyjCount != 0
</if>
<if test="mainTaskDto.rwyjzt == '2'.toString()">
and taskCount = yyjCount
</if>
<if test="mainTaskDto.rwthzt == '0'.toString()">
and taskCount = wthCount
</if>
<if test="mainTaskDto.rwthzt == '1'.toString()">
and ythCount != 0
</if>
<if test="mainTaskDto.rwthzt == '2'.toString()">
and taskCount = ythCount
</if>
<if test="mainTaskDto.rwpjzt == '0'.toString()">
and taskCount = wpjCount
</if>
<if test="mainTaskDto.rwpjzt == '1'.toString()">
and ypjCount != 0
</if>
<if test="mainTaskDto.rwpjzt == '2'.toString()">
and taskCount = ypjCount
</if>
</select>
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SubTaskMapper.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.founder.publicapi.mapper.mysqlMapper.SubTaskMapper">
<select id="listSubTaskForPage" resultType="com.founder.commonutils.model.zczxEntity.SubTask">
select s.id,
s.sortflag,
s.jsrzh,
s.jsrjh,
s.jsrxm,
s.jsrsfzh,
s.jsrlxdh,
s.jsrdwdm,
s.jsrdwmc,
s.fkrjh,
s.fkrxm,
s.fkrsfzh,
s.fkrlxdh,
s.fkrdwdm,
s.fkrdwmc,
s.yjrjh,
s.yjrxm,
s.yjrsfzh,
s.yjrlxdh,
s.yjrdwdm,
s.yjrdwmc,
s.batch,
s.name,
s.zjlx,
s.zjhm,
s.telephone,
s.imei,
s.imsi,
s.wechat,
s.wechat_id,
s.qq,
s.djdz,
s.sjdz,
s.ssdwdm,
s.ssdwmc,
s.czqk,
s.czhdd,
s.cswdz,
s.cph,
s.rxwz,
s.clkkwz,
s.zxsj,
s.ql_id,
s.ajmc,
s.ajzt,
s.ajbh,
s.mqhddq,
s.mqhdqx,
s.zxwz,
s.hjdz,
s.ajlb,
s.qkxx,
s.ladw,
s.larq,
s.gzdw,
s.zxtlcc,
s.zxhb,
s.rzjd,
s.rzsj,
s.crj,
s.crjsj,
s.hyqk,
s.thryxm,
s.thrysfz,
s.thrylxdh,
s.lxmjxm,
s.lxmjjh,
s.lxmjlxdh,
s.bz1,
s.bz2,
s.bz3,
s.bz4,
s.bz5,
s.bz6,
s.bz7,
s.bz8,
s.bz9,
s.bz10,
s.lrr,
s.lrrdwdm,
s.lrrdwmc,
s.lrrjh,
s.rksj,
s.gxr,
s.gxrjh,
s.gxrdwdm,
s.gxrdwmc,
s.gxsj,
s.fkbz,
s.csbz,
s.lzbz,
s.yjbz,
s.thbz,
s.evaluation,
s.main_id,
m.task_name,
m.task_type,
m.task_content
from tb_wh_subtask s
left join tb_wh_maintask m on s.main_id = m.id
where
1=1
and s.xxsc_pdbz = '0'
and m.xxsc_pdbz = '0'
<if test="subTaskDto.mainTaskName != '' and subTaskDto.mainTaskName != null">
and m.task_name = #{subTaskDto.mainTaskName, jdbcType=VARCHAR}
</if>
<if test="subTaskDto.id != '' and subTaskDto.id != null">
and s.id = #{subTaskDto.id, jdbcType=VARCHAR}
</if>
<if test="subTaskDto.mainId != '' and subTaskDto.mainId != null">
and s.main_id = #{subTaskDto.mainId, jdbcType=VARCHAR}
</if>
<if test="subTaskDto.jsrzh != '' and subTaskDto.jsrzh != null">
and s.jsrzh = #{subTaskDto.jsrzh, jdbcType=VARCHAR}
</if>
<if test="subTaskDto.lrrjh != '' and subTaskDto.lrrjh != null">
and s.lrrjh = #{subTaskDto.lrrjh, jdbcType=VARCHAR}
</if>
<if test="subTaskDto.lrrdwdm != '' and subTaskDto.lrrdwdm != null">
and s.lrrdwdm = #{subTaskDto.lrrdwdm, jdbcType=VARCHAR}
</if>
<if test="subTaskDto.mainTaskType != '' and subTaskDto.mainTaskType != null">
and m.task_type = #{subTaskDto.mainTaskType, jdbcType=VARCHAR}
</if>
<if test="subTaskDto.fkbz != '' and subTaskDto.fkbz != null">
and s.fkbz = #{subTaskDto.fkbz, jdbcType=VARCHAR}
</if>
<if test="subTaskDto.csbz != '' and subTaskDto.csbz != null">
and s.csbz = #{subTaskDto.csbz, jdbcType=VARCHAR}
</if>
<if test="subTaskDto.lzbz != '' and subTaskDto.lzbz != null">
and s.lzbz = #{subTaskDto.lzbz, jdbcType=VARCHAR}
</if>
<if test="subTaskDto.yjbz != '' and subTaskDto.yjbz != null">
and s.yjbz = #{subTaskDto.yjbz, jdbcType=VARCHAR}
</if>
<if test="subTaskDto.thbz != '' and subTaskDto.thbz != null">
and s.thbz = #{subTaskDto.thbz, jdbcType=VARCHAR}
</if>
<if test="subTaskDto.pjbz != '' and subTaskDto.pjbz != null">
and s.pjbz = #{subTaskDto.pjbz, jdbcType=VARCHAR}
</if>
<choose>
<when test="subTaskDto.beginTime != null and subTaskDto.endTime !=null">
AND s.rksj between #{subTaskDto.beginTime} and #{subTaskDto.endTime}
</when>
<when test="subTaskDto.beginTime != null and subTaskDto.endTime ==null">
AND s.rksj &gt;= #{subTaskDto.beginTime}
</when>
<when test="subTaskDto.beginTime == null and subTaskDto.endTime !=null">
AND s.rksj &lt;= #{subTaskDto.endTime}
</when>
</choose>
<choose>
<when test="subTaskDto.zrwfkkssj != null and subTaskDto.zrwfkjssj !=null">
AND s.fksj between #{subTaskDto.zrwfkkssj} and #{subTaskDto.zrwfkjssj}
</when>
<when test="subTaskDto.zrwfkkssj != null and subTaskDto.zrwfkjssj ==null">
AND s.fksj &gt;= #{subTaskDto.zrwfkkssj}
</when>
<when test="subTaskDto.zrwfkkssj == null and subTaskDto.zrwfkjssj !=null">
AND s.fksj &lt;= #{subTaskDto.zrwfkjssj}
</when>
</choose>
</select>
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/TemplateUserMapper.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.founder.publicapi.mapper.mysqlMapper.TemplateUserMapper">
</mapper>
\ No newline at end of file
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/ZczxMapper.xml
......@@ -64,7 +64,7 @@
<if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
AND z.zxcjdwdm = #{zczxDto.zxcjdwdm , jdbcType=VARCHAR }
</if>
<if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
<if test="zczxDto.zxcjrjh!=null and zczxDto.zxcjrjh!=''">
AND z.zxcjrjh = #{zczxDto.zxcjrjh , jdbcType=VARCHAR }
</if>
<if test="zczxDto.sftzPdbz!=null and zczxDto.sftzPdbz!=''">
......@@ -348,7 +348,7 @@
<if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
AND z.zxcjdwdm = #{zczxDto.zxcjdwdm , jdbcType=VARCHAR }
</if>
<if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
<if test="zczxDto.zxcjrjh!=null and zczxDto.zxcjrjh!=''">
AND z.zxcjrjh = #{zczxDto.zxcjrjh , jdbcType=VARCHAR }
</if>
<if test="zczxDto.sftzPdbz!=null and zczxDto.sftzPdbz!=''">
......@@ -500,7 +500,7 @@
<if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
AND z.zxcjdwdm = #{zczxDto.zxcjdwdm , jdbcType=VARCHAR }
</if>
<if test="zczxDto.zxcjdwdm!=null and zczxDto.zxcjdwdm!=''">
<if test="zczxDto.zxcjrjh!=null and zczxDto.zxcjrjh!=''">
AND z.zxcjrjh = #{zczxDto.zxcjrjh , jdbcType=VARCHAR }
</if>
<if test="zczxDto.sftzPdbz!=null and zczxDto.sftzPdbz!=''">
......
service/publicapi/src/main/java/com/founder/publicapi/service/ColumnService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.zczxEntity.Column;
/**
* @author Godffy
* @create 2023-07-27 15:38
*/
public interface ColumnService extends IService<Column> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/ColumnTemplateService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.zczxEntity.ColumnTemplate;
/**
* @author Godffy
* @create 2023-07-28 9:54
*/
public interface ColumnTemplateService extends IService<ColumnTemplate> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/MainTaskService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.zczxEntity.MainTask;
import com.founder.commonutils.model.zczxEntity.MainTaskDto;
/**
* @author Godffy
* @create 2023-08-01 10:07
*/
public interface MainTaskService extends IService<MainTask> {
IPage<MainTask> listMainTaskForPage(IPage page, MainTaskDto mainTaskDto);
}
service/publicapi/src/main/java/com/founder/publicapi/service/SubTaskService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.zczxEntity.SubTask;
import com.founder.commonutils.model.zczxEntity.SubTaskDto;
/**
* @author Godffy
* @create 2023-08-01 10:19
*/
public interface SubTaskService extends IService<SubTask> {
IPage<SubTask> listSubTaskForPage(IPage page, SubTaskDto subTaskDto);
}
service/publicapi/src/main/java/com/founder/publicapi/service/TemplateUserService.java 0 → 100644
package com.founder.publicapi.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.founder.commonutils.model.zczxEntity.TemplateUser;
/**
* @author Godffy
* @create 2023-07-28 16:19
*/
public interface TemplateUserService extends IService<TemplateUser> {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ColumnServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.zczxEntity.Column;
import com.founder.publicapi.mapper.mysqlMapper.ColumnMapper;
import com.founder.publicapi.service.ColumnService;
import org.springframework.stereotype.Service;
/**
* @author Godffy
* @create 2023-07-27 15:39
*/
@Service
public class ColumnServiceImpl extends ServiceImpl<ColumnMapper, Column> implements ColumnService {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/ColumnTemplateServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.zczxEntity.ColumnTemplate;
import com.founder.publicapi.mapper.mysqlMapper.ColumnTemplateMapper;
import com.founder.publicapi.service.ColumnTemplateService;
import org.springframework.stereotype.Service;
/**
* @author Godffy
* @create 2023-07-28 10:02
*/
@Service
public class ColumnTemplateServiceImpl extends ServiceImpl<ColumnTemplateMapper, ColumnTemplate> implements ColumnTemplateService {
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/MainTaskServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.newPublicEntity.SysUser;
import com.founder.commonutils.model.zczxEntity.MainTask;
import com.founder.commonutils.model.zczxEntity.MainTaskDto;
import com.founder.publicapi.mapper.mysqlMapper.MainTaskMapper;
import com.founder.publicapi.service.MainTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/**
* @author Godffy
* @create 2023-08-01 10:11
*/
@Service
public class MainTaskServiceImpl extends ServiceImpl<MainTaskMapper, MainTask> implements MainTaskService {
@Autowired
private MainTaskMapper mainTaskMapper;
@Override
public IPage<MainTask> listMainTaskForPage(IPage page, MainTaskDto mainTaskDto) {
//当前登陆人的信息
ServletRequestAttributes requestAttributes =
(ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = requestAttributes.getRequest();
SysUser user = (SysUser) request.getAttribute("user");
String trueName = user.getTrueName();
String policemanid = user.getPolicemanid();
String unitcode = user.getUnitcode();
String unitname = user.getUnitname();
// QueryWrapper<MainTask> qw = new QueryWrapper<>();
// qw.eq(StringUtils.isNotBlank(mainTaskDto.getLrrjh()),"lrrjh",mainTaskDto.getLrrjh());//我下发的
// qw.eq(StringUtils.isNotBlank(mainTaskDto.getLrrdwdm()),"lrrdwdm",mainTaskDto.getLrrdwdm());//下发人所属单位
// qw.eq(StringUtils.isNotBlank(mainTaskDto.getId()),"id",mainTaskDto.getId());//任务编号
// qw.eq(StringUtils.isNotBlank(mainTaskDto.getTaskName()),"task_name",mainTaskDto.getTaskName());//任务名称
// qw.eq(StringUtils.isNotBlank(mainTaskDto.getTaskType()),"task_type",mainTaskDto.getTaskType());//任务类型
// this.mainTaskMapper.selectPage(page,qw);
IPage<MainTask> result = this.mainTaskMapper.listMainTaskForPage(page,mainTaskDto);
return result;
}
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/SubTaskServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.zczxEntity.SubTask;
import com.founder.commonutils.model.zczxEntity.SubTaskDto;
import com.founder.publicapi.mapper.mysqlMapper.SubTaskMapper;
import com.founder.publicapi.service.SubTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @author Godffy
* @create 2023-08-01 15:11
*/
@Service
public class SubTaskServiceImpl extends ServiceImpl<SubTaskMapper, SubTask> implements SubTaskService {
@Autowired
private SubTaskMapper subTaskMapper;
@Override
public IPage<SubTask> listSubTaskForPage(IPage page, SubTaskDto subTaskDto) {
IPage<SubTask> result = this.subTaskMapper.listSubTaskForPage(page,subTaskDto);
return result;
}
}
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/TemplateUserServiceImpl.java 0 → 100644
package com.founder.publicapi.service.serviceimpl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.founder.commonutils.model.zczxEntity.TemplateUser;
import com.founder.publicapi.mapper.mysqlMapper.TemplateUserMapper;
import com.founder.publicapi.service.TemplateUserService;
import org.springframework.stereotype.Service;
/**
* @author Godffy
* @create 2023-07-28 16:32
*/
@Service
public class TemplateUserServiceImpl extends ServiceImpl<TemplateUserMapper, TemplateUser> implements TemplateUserService {
}
service/publicapi/src/main/resources/bootstrap-prod.properties
......@@ -124,4 +124,5 @@ powerjob.worker.max-appended-wf-context-length=4096
# \u540C\u65F6\u8FD0\u884C\u7684\u8F7B\u91CF\u7EA7\u4EFB\u52A1\u6570\u91CF\u4E0A\u9650
powerjob.worker.max-lightweight-task-num=1024
# \u540C\u65F6\u8FD0\u884C\u7684\u91CD\u91CF\u7EA7\u4EFB\u52A1\u6570\u91CF\u4E0A\u9650
powerjob.worker.max-heavy-task-num=64
\ No newline at end of file
powerjob.worker.max-heavy-task-num=64
service/publicapi/src/main/resources/bootstrap.properties
......@@ -17,3 +17,10 @@ ko-time.pointcut=execution(public * com.founder..*.*(..)) && !execution(public *
ko-time.exception-enable=true
#\u5F00\u542F\u63A7\u5236\u53F0\u65E5\u5FD7
ko-time.log-enable=true
spring.servlet.multipart.max-file-size=2000MB
spring.servlet.multipart.max-request-size=2500MB
#\u6587\u4EF6\u4E0A\u4F20\u4E34\u65F6\u8DEF\u5F84
server.tomcat.basedir=/home/temp_resource
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment