Skip to content

J
jyzb_platformV2
Commit 14cd869f by 李小惠
Options

将domain包中的实体类全部删除，全部放入entity包中

parent d8aa6021
正在显示 包含 666 行增加 和 927 行删除
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java
package com.junmp.jyzb.controller;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.domain.PoliceFinger;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.service.PoliceFingerService;
import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.jyzb.utils.ReturnData;
import com.junmp.jyzb.utils.ReturnMsg;
import com.junmp.v2.common.bean.response.ApiRes;
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.*;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@RestController
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PolicemanFingerController.java
......@@ -2,7 +2,7 @@ package com.junmp.jyzb.controller;
import com.junmp.jyzb.beanReq.PolicemanFingerReq;
import com.junmp.jyzb.doc.PolicemanFingerDoc;
import com.junmp.jyzb.domain.PoliceFinger;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.service.PoliceFingerService;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/doc/PolicemanFingerDoc.java
......@@ -2,7 +2,7 @@ package com.junmp.jyzb.doc;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.beanReq.PolicemanFingerReq;
import com.junmp.jyzb.domain.PoliceFinger;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api;
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/OrderMain.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@ApiModel(value="com-junmp-jyzb-domain-BussinessOrderMain")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class OrderMain implements Serializable {
@ApiModelProperty(value="")
private Long id;
/**
* 单据类型：入库单/出库单
*/
@ApiModelProperty(value="单据类型：入库单/出库单")
private String orderType;
/**
* 工作流ID
*/
@ApiModelProperty(value="工作流ID")
private String processId;
/**
* 单据业务类型：purchase采购/gift赠予/other其他类型
*/
@ApiModelProperty(value="单据业务类型：purchase采购/gift赠予/other其他类型")
private String bussinessType;
/**
* 订单号
*/
@ApiModelProperty(value="订单号")
private String orderCode;
/**
* 目标单位
*/
@ApiModelProperty(value="目标单位")
private String orgId;
/**
* 审批状态：0未审批/1已审批/
*/
@ApiModelProperty(value="审批状态：0未审批/1已审批/")
private String approveType;
/**
* 发物单位
*/
@ApiModelProperty(value="发物单位")
private String sendOrgId;
/**
* 发物单位名称
*/
@ApiModelProperty(value="发物单位名称")
private String sendOrgName;
/**
* 应入库数量
*/
@ApiModelProperty(value="应入库数量")
private Integer inventoryQuantity;
/**
* 实际数量
*/
@ApiModelProperty(value="实际数量")
private Integer actualQuantity;
/**
* 是否已记账 0未记账/1已记账
*/
@ApiModelProperty(value="是否已记账 0未记账/1已记账")
private Integer manualState;
/**
* 单据状态 0待入库/1已入库/2入库中
*/
@ApiModelProperty(value="单据状态 0待入库/1已入库/2入库中")
private Integer orderState;
/**
* 附件地址
*/
@ApiModelProperty(value="附件地址")
private String attachmentLocation;
/**
* 单据包含的物资集合，内容以逗号进行分割
*/
@ApiModelProperty(value="单据包含的物资集合，内容以逗号进行分割")
private String invList;
/**
* 创建时间
*/
@ApiModelProperty(value="创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value="更新时间")
private Date updateTime;
/**
* 创建人员
*/
@ApiModelProperty(value="创建人员")
private String createUser;
/**
* 更新人员
*/
@ApiModelProperty(value="更新人员")
private String updateUser;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Package.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-Package")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Package implements Serializable {
/**
* 装备包ID
*/
@ApiModelProperty(value = "装备包ID")
private String id;
/**
* 包内物资总数
*/
@ApiModelProperty(value = "包内物资总数")
private Integer count;
/**
* 组织机构ID
*/
@ApiModelProperty(value = "组织机构ID")
private String orgId;
/**
* 具体位置ID(仓库/单警柜)
*/
@ApiModelProperty(value = "具体位置ID(仓库/单警柜)")
private String location;
/**
* 货架ID
*/
@ApiModelProperty(value = "货架ID")
private String shelfId;
/**
* 货架名称
*/
@ApiModelProperty(value = "货架名称")
private String shelfName;
/**
* 货架编号
*/
@ApiModelProperty(value = "货架编号")
private String shelfCode;
/**
* 解包状态:0未解包/1已解包
*/
@ApiModelProperty(value = "解包状态:0未解包/1已解包")
private Integer state;
/**
* 是否销毁:0否/1是
*/
@ApiModelProperty(value = "是否销毁:0否/1是")
private Integer isDestroy;
/**
* EPC信息
*/
@ApiModelProperty(value = "EPC信息")
private String epc;
/**
* 标签打印状态:0否/1是
*/
@ApiModelProperty(value = "标签打印状态:0否/1是")
private Integer printState;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
private String note;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Policeman.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import com.junmp.jyzb.entity.Cabinet;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value="com-junmp-jyzb-domain-Policeman")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Policeman implements Serializable {
/**
* 警员id
*/
@ApiModelProperty(value="警员id")
private String id;
/**
* 警员名称
*/
@ApiModelProperty(value="警员名称")
private String name;
/**
* 单警柜关联id
*/
@ApiModelProperty(value="单警柜关联id")
private String cabinetId;
/**
* 组织机构名称
*/
@ApiModelProperty(value="组织机构名称")
private Cabinet cabinetName;
/**
* 机构代码，一个警员只属于一个机构
*/
@ApiModelProperty(value="机构代码，一个警员只属于一个机构")
private String orgId;
/**
* 机构名称
*/
@ApiModelProperty(value="机构名称")
private PubOrg orgName;
/**
* 警员编号
*/
@ApiModelProperty(value="警员编号")
private String policeCode;
/**
* 警员性别
*/
@ApiModelProperty(value="警员性别")
private String sex;
/**
* 人脸信息
*/
@ApiModelProperty(value="人脸信息")
private String faceInfo;
/**
* 是否已生成对应账号，1表生成，0表未生成
*/
@ApiModelProperty(value="是否已生成对应账号，1表生成，0表未生成")
private Integer isCreatedAccount;
/**
* 门禁编码
*/
@ApiModelProperty(value="门禁编码")
private String doorCode;
/**
* 密码
*/
@ApiModelProperty(value="密码")
private String password;
/**
* 警员照片
*/
@ApiModelProperty(value="警员照片")
private String photo;
/**
* 联系方式
*/
@ApiModelProperty(value="联系方式")
private String phone;
/**
* 创建时间
*/
@ApiModelProperty(value="创建时间")
private Date createTime;
/**
* 最后更新时间
*/
@ApiModelProperty(value="最后更新时间")
private Date updateTime;
/**
* 身份证信息
*/
@ApiModelProperty(value="身份证信息")
private String idCard;
/**
* 更新人员
*/
@ApiModelProperty(value="更新人员")
private String updateUser;
/**
* 警员状态
*/
@ApiModelProperty(value="警员状态")
private Integer state;
/**
* 指纹信息
* */
private List<Map<String, Object>> fingerMsg;
/**
* 警员状态
*/
@ApiModelProperty(value="指纹id")
private Integer fingerId;
/**
* 指纹名称
*/
@ApiModelProperty(value="指纹名称")
private String fingerName;
/**
* 指纹信息
*/
@ApiModelProperty(value="指纹信息")
private String fingerInfo;
/**
* 单警柜关联箱号id
* */
private String cabinetBoxId;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/ProcessTemplates.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
* process_templates
*/
@ApiModel(value="com-junmp-jyzb-domain-ProcessTemplates")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ProcessTemplates implements Serializable {
/**
* 审批摸板ID
*/
@ApiModelProperty(value="审批摸板ID")
private String templateId;
/**
* 摸板名称
*/
@ApiModelProperty(value="摸板名称")
private String templateName;
/**
* 基础设置
*/
@ApiModelProperty(value="基础设置")
private String settings;
/**
* 摸板表单
*/
@ApiModelProperty(value="摸板表单")
private String formJson;
/**
* process
*/
@ApiModelProperty(value="process")
private String processJson;
/**
* 图标
*/
@ApiModelProperty(value="图标")
private String icon;
/**
* 图标背景色
*/
@ApiModelProperty(value="图标背景色")
private String background;
/**
* notify
*/
@ApiModelProperty(value="notify")
private String notify;
/**
* 谁能提交
*/
@ApiModelProperty(value="谁能提交")
private String whoCommit;
/**
* 谁能编辑
*/
@ApiModelProperty(value="谁能编辑")
private String whoEdit;
/**
* 谁能导出数据
*/
@ApiModelProperty(value="谁能导出数据")
private String whoExport;
/**
* remark
*/
@ApiModelProperty(value="remark")
private String remark;
/**
* 冗余分组id
*/
@ApiModelProperty(value="冗余分组id")
private Integer groupId;
/**
* 是否已停用
*/
@ApiModelProperty(value="是否已停用")
private Byte isStop;
/**
* 创建时间
*/
@ApiModelProperty(value="创建时间")
private Date created;
/**
* 更新时间
*/
@ApiModelProperty(value="更新时间")
private Date updated;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Warehouse.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-Warehouse")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class Warehouse implements Serializable {
/**
* 仓库信息表
*/
@ApiModelProperty(value = "仓库信息表")
private String id;
/**
* 仓库名称
*/
@ApiModelProperty(value = "仓库名称")
private String name;
/**
* 仓库地点
*/
@ApiModelProperty(value = "仓库地点")
private String location;
/**
* 联系方式
*/
@ApiModelProperty(value = "联系方式")
private String phone;
/**
* 视屏地址
*/
@ApiModelProperty(value = "视屏地址")
private String video;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
private Date createTime;
/**
* 修改时间
*/
@ApiModelProperty(value = "修改时间")
private Date updateTime;
/**
* 更新人员
*/
@ApiModelProperty(value = "更新人员")
private String updateUser;
/**
* 新版本组织机构外键
*/
@ApiModelProperty(value = "新版本组织机构外键")
private Integer orgIdInt;
/**
* 是否锁库，1锁库，0未锁库
*/
@ApiModelProperty(value = "是否锁库")
private Integer isLocked;
/**
* 组织机构表id
*/
@ApiModelProperty(value = "组织机构表id")
private String orgId;
/**
* 当前仓库下装备总数
*/
@ApiModelProperty(value = "当前仓库下装备总数")
private Integer sum;
/**
* 出库装备总数
*/
@ApiModelProperty(value = "当前仓库下装备总数")
private Integer outSum;
/**
* 出库装备总数
*/
@ApiModelProperty(value = "当前仓库下装备总数")
private Integer inSum;
/**
* 1表启用，0表禁用
*/
@ApiModelProperty(value = "状态")
private Integer state;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/YearReport.java deleted 100644 → 0
package com.junmp.jyzb.domain;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-YearReport")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class YearReport implements Serializable {
/**
* 年度报表id
*/
@ApiModelProperty(value = "年度报表id")
private String id;
/**
* 组织机构id
*/
@ApiModelProperty(value = "组织机构id")
private String organizationId;
/**
* 年初数量
*/
@ApiModelProperty(value = "年初数量")
private Integer startNum;
/**
* 年末数量
*/
@ApiModelProperty(value = "年末数量")
private Integer endNum;
/**
* 年初金额
*/
@ApiModelProperty(value = "年初金额")
private Integer startMoney;
/**
* 年末金额
*/
@ApiModelProperty(value = "年末金额")
private Integer endMoney;
/**
* 年度销毁数量
*/
@ApiModelProperty(value = "年度销毁数量")
private Integer destructionNum;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderMain.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@ApiModel(value="com-junmp-jyzb-domain-BussinessOrderMain")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("bussiness_order_main")
public class OrderMain implements Serializable {
@TableField("id")
private Long id;
@TableField("order_type")
private String orderType;
@TableField("process_id")
private String processId;
@TableField("bussiness_type")
private String bussinessType;
@TableField("order_code")
private String orderCode;
@TableField("start_org_id")
private Long startOrgId;
@TableField("start_org_name")
private String startOrgName;
@TableField("end_org_id")
private Long endOrgId;
@TableField("end_org_name")
private String endOrgName;
@TableField("start_org_user_id")
private String startOrgUserId;
@TableField("start_org_user_name")
private String startOrgUserName;
@TableField("end_org_user_id")
private String endOrgUserId;
@TableField("end_org_user_name")
private String endOrgUserName;
@TableField("price")
private BigDecimal price;
@TableField("inventory_quantity")
private Integer inventoryQuantity;
@TableField("actual_quantity")
private Integer actualQuantity;
@TableField("manual_state")
private Integer manualState;
@TableField("order_state")
private Integer orderState;
@TableField("attachment_location")
private String attachmentLocation;
@TableField("inv_list")
private String invList;
@TableField("create_time")
private Date createTime;
@TableField("update_time")
private Date updateTime;
@TableField("create_user")
private String createUser;
@TableField("update_user")
private String updateUser;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Package.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-Package")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_package")
public class Package implements Serializable {
@TableField(value = "id")
private String id;
@TableField(value = "count")
private Integer count;
@TableField(value = "org_id_int")
private Integer orgId;
@TableField(value = "location")
private String location;
@TableField(value = "shelf_id")
private String shelfId;
@TableField(value = "shelf_name")
private String shelfName;
@TableField(value = "shelf_code")
private String shelfCode;
@TableField(value = "state")
private Integer state;
@TableField(value = "is_destroy")
private Integer isDestroy;
@TableField(value = "epc")
private String epc;
@TableField(value = "print_state")
private Integer printState;
@TableField(value = "create_time")
private Date createTime;
@TableField(value = "update_time")
private Date updateTime;
@TableField(value = "note")
private String note;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/PackageInformation.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/PackageInformation.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -11,47 +13,27 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_package_information")
public class PackageInformation implements Serializable {
/**
* 装备包详细信息id
*/
@ApiModelProperty(value = "装备包详细信息id")
@TableField(value = "id")
private String id;
/**
* 装备包id
*/
@ApiModelProperty(value = "装备包id")
@TableField(value = "package_id")
private String packageId;
/**
* 装备类型id
*/
@ApiModelProperty(value = "装备类型id")
@TableField(value = "type_id")
private String typeId;
/**
* 装备类型名称
*/
@ApiModelProperty(value = "装备类型名称")
@TableField(value = "type_name")
private String typeName;
/**
* 装备号型id
*/
@ApiModelProperty(value = "装备号型id")
@TableField(value = "size_id")
private String sizeId;
/**
* 装备号型名称
*/
@ApiModelProperty(value = "装备号型名称")
@TableField(value = "size_name")
private String sizeName;
/**
* 装备数量
*/
@ApiModelProperty(value = "装备数量")
@TableField(value = "number")
private Integer number;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/PoliceFinger.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/PoliceFinger.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.junmp.v2.common.bean.request.BaseRequest;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -18,41 +18,24 @@ import javax.validation.constraints.NotNull;
@TableName("base_police_finger")
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_police_finger")
public class PoliceFinger implements Serializable {
/**
* 指纹id
*/
@ApiModelProperty(value = "指纹id")
@TableField(value = "id")
private Integer id;
/**
* 警员id
*/
@ApiModelProperty(value = "警员id")
@TableField(value = "police_id")
private String policeId;
/**
* 指纹名称
*/
@ApiModelProperty(value = "指纹名称")
@TableField(value = "name")
private String name;
/**
* 指纹信息
*/
@ApiModelProperty(value = "指纹信息")
@TableField(value = "finger_info")
private String fingerInfo;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
@TableField(value = "create_time")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty(value = "更新时间")
@TableField(value = "update_time")
private Date updateTime;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Policeman.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.junmp.jyzb.entity.Cabinet;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import java.util.Map;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value="com-junmp-jyzb-domain-Policeman")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_policeman")
public class Policeman implements Serializable {
@TableField(value = "id")
private String id;
@TableField(value = "name")
private String name;
@TableField(value = "cabinet_box_id")
private String cabinetBoxId;
@TableField(value = "org_id_int")
private Long orgIdInt;
@TableField(value = "org_id")
private String orgId;
@TableField(value = "department_id")
private Long departmentId;
@TableField(value = "police_code")
private String policeCode;
@TableField(value = "sex")
private String sex;
@TableField(value = "face_info")
private String faceInfo;
@TableField(value = "isCreatedAccount")
private Boolean isCreatedAccount;
@TableField(value = "door_code")
private String doorCode;
@TableField(value = "password")
private String password;
@TableField(value = "photo")
private String photo;
@TableField(value = "phone")
private String phone;
@TableField(value = "create_time")
private Date createTime;
@TableField(value = "update_time")
private Date updateTime;
@TableField(value = "id_card")
private String idCard;
@TableField(value = "update_user")
private String updateUser;
@TableField(value = "state")
private Integer state;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/entity/ProcessTemplates.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
* process_templates
*/
@ApiModel(value="com-junmp-jyzb-domain-ProcessTemplates")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("process_templates")
public class ProcessTemplates implements Serializable {
@TableField(value = "template_id")
private String templateId;
@TableField(value = "form_name")
private String formName;
@TableField(value = "settings")
private String settings;
@TableField(value = "form_json")
private String formJson;
@TableField(value = "process_json")
private String processJson;
@TableField(value = "icon")
private String icon;
@TableField(value = "background")
private String background;
@TableField(value = "notify")
private String notify;
@TableField(value = "who_commit")
private String whoCommit;
@TableField(value = "who_edit")
private String whoEdit;
@TableField(value = "who_export")
private String whoExport;
@TableField(value = "remark")
private String remark;
@TableField(value = "org_id")
private Integer orgId;
@TableField(value = "is_stop")
private Boolean isStop;
@TableField(value = "created")
private Date created;
@TableField(value = "updated")
private Date updated;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/PubOrg.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/PubOrg.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -15,132 +17,181 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("pub_org")
public class PubOrg implements Serializable {
/**
* 主键
*/
@ApiModelProperty(value="主键")
@TableField(value = "org_id")
private Long orgId;
/**
* 父id，一级节点父id是0
*/
@ApiModelProperty(value="父id，一级节点父id是0")
@TableField(value = "parent_id")
private String parentId;
/**
* 父ids
*/
@TableField(value = "org_parent_id")
private Long orgParentId;
/**
* 父ids
*/
@ApiModelProperty(value="父ids")
@TableField(value = "org_parent_ids")
private String orgParentIds;
/**
* 组织编码
*/
@ApiModelProperty(value="组织编码")
@TableField(value = "org_code")
private String orgCode;
/**
* 组织名称
*/
@ApiModelProperty(value="组织名称")
private String orgName;
/**
*
*/
@ApiModelProperty(value="")
private String areaName;
/**
*
*/
@ApiModelProperty(value="")
private String dName;
/**
* 机构类型100企业，101：机构
*/
@ApiModelProperty(value="机构类型100企业，101：机构")
private Short orgType;
@TableField(value = "org_type")
private Integer orgType;
/**
* 排序
*/
@ApiModelProperty(value="排序")
private Byte sortVal;
@TableField(value = "sort_val")
private Integer sortVal;
/**
* 状态：1-启用，0-禁用
*/
@ApiModelProperty(value="状态：1-启用，0-禁用")
@TableField(value = "status_flag")
private Integer statusFlag;
/**
* 描述
*/
@ApiModelProperty(value="描述")
@TableField(value = "remark")
private String remark;
/**
* 删除标记：0-已删除，1-未删除
*/
@ApiModelProperty(value="删除标记：0-已删除，1-未删除")
private Short delFlag;
@TableField(value = "del_flag")
private Integer delFlag;
/**
* 机构全称
*/
@ApiModelProperty(value="机构全称")
@TableField(value = "org_full_name")
private String orgFullName;
/**
* 经度
*/
@TableField(value = "longitude")
private String longitude;
/**
* 维度
*/
@TableField(value = "latitude")
private String latitude;
/**
* 大屏地图使用
*/
@TableField(value = "is_map")
private String isMap;
/**
* 采购
*/
@TableField(value = "show_state")
private String showState;
/**
* 单据计数
*/
@TableField(value = "order_num")
private Integer orderNum;
/**
* levelFlag
*/
@TableField(value = "level_flag")
private Integer levelFlag;
/**
* 区域码短写
*/
@TableField(value = "find_code")
private String findCode;
/**
* 地址
*/
@ApiModelProperty(value="地址")
@TableField(value = "address")
private String address;
/**
* 区域名称
*/
@TableField(value = "area_name")
private String areaName;
/**
* dName
*/
@TableField(value = "d_name")
private String dName;
/**
* 联系人
*/
@ApiModelProperty(value="联系人")
@TableField(value = "contact")
private String contact;
/**
* 电话
*/
@ApiModelProperty(value="电话")
@TableField(value = "phone")
private String phone;
/**
* 创建时间
*/
@ApiModelProperty(value="创建时间")
@TableField(value = "create_time")
private Date createTime;
/**
* 创建人
*/
@ApiModelProperty(value="创建人")
@TableField(value = "create_user")
private Long createUser;
/**
* 更新时间
*/
@ApiModelProperty(value="更新时间")
@TableField(value = "update_time")
private Date updateTime;
/**
* 更新人
*/
@ApiModelProperty(value="更新人")
@TableField(value = "update_user")
private Long updateUser;
@ApiModelProperty(value="")
/**
* guid
*/
@TableField(value = "guid")
private String guid;
@ApiModelProperty(value="")
private String findCode;
/**
* 组织机构名
*/
@TableField(value = "org_name")
private String orgName;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Shelf.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/Shelf.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -12,6 +13,7 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_shelf")
public class Shelf implements Serializable {
/**
* 货架id
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/Supplier.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/Supplier.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -12,77 +14,72 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_supplier")
public class Supplier implements Serializable {
/**
* 供应商ID
*/
@ApiModelProperty(value = "供应商ID")
@TableField(value = "id")
private String id;
/**
* 装备类型ID
*/
@ApiModelProperty(value = "装备类型ID")
private String equipmentId;
/**
* 供应商名称
*/
@ApiModelProperty(value = "供应商名称")
@TableField(value = "name")
private String name;
/**
* 供应商短码
*/
@ApiModelProperty(value = "供应商短码")
@TableField(value = "code")
private String code;
/**
* 简称
*/
@ApiModelProperty(value = "简称")
@TableField(value = "short_name")
private String shortName;
/**
* 联系方式
* 联系人
*/
@ApiModelProperty(value = "联系方式")
@TableField(value = "contacts")
private String contacts;
/**
* 联系电话
*/
@TableField(value = "phone")
private String phone;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
@TableField(value = "create_time")
private Date createTime;
/**
* 创建人员
*/
@ApiModelProperty(value = "创建人员")
@TableField(value = "create_user")
private String createUser;
/**
* 最后更新时间
*/
@ApiModelProperty(value = "最后更新时间")
@TableField(value = "update_time")
private Date updateTime;
/**
* 更新人ID
*/
@ApiModelProperty(value = "更新人ID")
@TableField(value = "update_user")
private String updateUser;
/**
* 联系方式
*/
@ApiModelProperty(value = "联系方式")
private String phone;
/**
* 状态码
* 1为启用，0为禁用
*/
@ApiModelProperty(value = "状态码")
@TableField(value = "state")
private Integer state;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/SupplierEquipment.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/SupplierEquipment.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -12,47 +14,48 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_supplier_type")
public class SupplierEquipment implements Serializable {
/**
* 供应商产品ID
*/
@ApiModelProperty(value = "供应商产品ID")
@TableField(value = "id")
private String id;
/**
* 供应商代码
*/
@ApiModelProperty(value = "供应商代码")
@TableField(value = "supplier_id")
private String supplierId;
/**
* 产品代码
*/
@ApiModelProperty(value = "产品代码")
@TableField(value = "type_id")
private String typeId;
/**
* 状态，0:启用，1:停用
*/
@ApiModelProperty(value = "状态，0:启用，1:停用")
@TableField(value = "state")
private Integer state;
/**
* 创建时间
*/
@ApiModelProperty(value = "创建时间")
@TableField(value = "create_time")
private Date createTime;
/**
* 最后更新时间
*/
@ApiModelProperty(value = "最后更新时间")
@TableField(value = "update_time")
private Date updateTime;
/**
* 更新人ID
*/
@ApiModelProperty(value = "更新人ID")
@TableField(value = "update_user")
private String updateUser;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/domain/SupplierType.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/SupplierType.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -12,47 +14,48 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_supplier_type")
public class SupplierType implements Serializable {
/**
* 供应商产品ID
*/
@ApiModelProperty(value="供应商产品ID")
* 供应商产品ID
*/
@TableField(value = "id")
private String id;
/**
* 供应商代码
*/
@ApiModelProperty(value="供应商代码")
* 供应商代码
*/
@TableField(value = "supplier_id")
private String supplierId;
/**
* 产品代码
*/
@ApiModelProperty(value="产品代码")
* 产品代码
*/
@TableField(value = "type_id")
private String typeId;
/**
* 状态，0:停用，1:启用
*/
@ApiModelProperty(value="状态，0:停用，1:启用")
* 状态，0:启用，1:停用
*/
@TableField(value = "state")
private Integer state;
/**
* 创建时间
*/
@ApiModelProperty(value="创建时间")
* 创建时间
*/
@TableField(value = "create_time")
private Date createTime;
/**
* 最后更新时间
*/
@ApiModelProperty(value="最后更新时间")
* 最后更新时间
*/
@TableField(value = "update_time")
private Date updateTime;
/**
* 更新人ID
*/
@ApiModelProperty(value="更新人ID")
* 更新人ID
*/
@TableField(value = "update_user")
private String updateUser;
private static final long serialVersionUID = 1L;
......
jyzb-biz/src/main/java/com/junmp/jyzb/entity/Warehouse.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-Warehouse")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_warehouse")
public class Warehouse implements Serializable {
@TableField("id")
private String id;
@TableField("department_id")
private Long departmentId;
@TableField("name")
private String name;
@TableField("location")
private String location;
@TableField("phone")
private String phone;
@TableField("video")
private String video;
@TableField("create_time")
private Date createTime;
@TableField("update_time")
private Date updateTime;
@TableField("update_user")
private String updateUser;
@TableField("org_id_int")
private Long orgIdInt;
@TableField("is_locked")
private Boolean isLocked;
@TableField("org_id")
private String orgId;
@TableField("sum")
private Integer sum;
@TableField("out_sum")
private Integer outSum;
@TableField("in_sum")
private Integer inSum;
@TableField("price_total")
private BigDecimal priceTotal;
@TableField("state")
private Integer state;
@TableField("order_id")
private Long orderId;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/domain/WarehouseArea.java → jyzb-biz/src/main/java/com/junmp/jyzb/entity/WarehouseArea.java
package com.junmp.jyzb.domain;
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
......@@ -12,48 +14,34 @@ import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_warehouse_area")
public class WarehouseArea implements Serializable {
/**
* 区域主键
*/
@ApiModelProperty(value="区域主键")
@TableField("area_id")
private String areaId;
/**
* 区域名称
*/
@ApiModelProperty(value="区域名称")
@TableField("area_name")
private String areaName;
/**
* 所属组织机构
*/
@ApiModelProperty(value="所属组织机构")
@TableField("org_id_int")
private Long orgIdInt;
/**
* 所属仓库id
*/
@ApiModelProperty(value="所属仓库id")
@TableField("warehouse_id")
private String warehouseId;
/**
* 区域照片
*/
@ApiModelProperty(value="区域照片")
@TableField("photo")
private String photo;
@ApiModelProperty(value="")
@TableField("create_time")
private Date createTime;
@ApiModelProperty(value="")
@TableField("update_time")
private Date updateTime;
@ApiModelProperty(value="")
@TableField("create_user")
private String createUser;
@ApiModelProperty(value="")
private String updateUser;
@TableField("update_user")
private Date updateUser;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/entity/YearReport.java 0 → 100644
package com.junmp.jyzb.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ApiModel(value = "com-junmp-jyzb-domain-YearReport")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("base_warehouse")
public class YearReport implements Serializable {
@TableField("id")
private String id;
@TableField("org_id_int")
private Integer orgIdInt;
@TableField("start_num")
private Integer startNum;
@TableField("end_num")
private Integer endNum;
@TableField("start_money")
private Integer startMoney;
@TableField("end_money")
private Integer endMoney;
@TableField("destruction_num")
private Integer destructionNum;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/OrderMainMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.OrderMain;
import com.junmp.jyzb.entity.OrderMain;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PoliceFingerMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.domain.PoliceFinger;
import com.junmp.jyzb.entity.PoliceFinger;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PolicemanMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.entity.Policeman;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PubOrgMapper.java
package com.junmp.jyzb.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.domain.PubOrg;
import com.junmp.jyzb.entity.PubOrg;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/ShelfMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.Shelf;
import com.junmp.jyzb.entity.Shelf;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/SupplierMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.Supplier;
import com.junmp.jyzb.domain.Warehouse;
import com.junmp.jyzb.entity.Supplier;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/WarehouseAreaMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.Shelf;
import com.junmp.jyzb.domain.WarehouseArea;
import com.junmp.jyzb.entity.Shelf;
import com.junmp.jyzb.entity.WarehouseArea;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......
jyzb-biz/src/main/java/com/junmp/jyzb/mapper/WarehouseMapper.java
package com.junmp.jyzb.mapper;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.domain.Warehouse;
import com.junmp.jyzb.entity.Warehouse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/PoliceFingerService.java
......@@ -3,7 +3,7 @@ package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.beanReq.PolicemanFingerReq;
import com.junmp.jyzb.domain.PoliceFinger;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.v2.db.api.page.PageResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java
package com.junmp.jyzb.service;
import com.junmp.jyzb.domain.PoliceFinger;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.utils.ResponseResult;
import javax.naming.spi.ResolveResult;
import java.util.List;
import java.util.Map;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/PubOrgService.java
......@@ -6,7 +6,7 @@ import com.junmp.jyzb.utils.ResponseResult;
import java.util.List;
import java.util.Map;
import com.junmp.jyzb.domain.PubOrg;
import com.junmp.jyzb.entity.PubOrg;
public interface PubOrgService extends IService<PubOrg> {
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.junmp.jyzb.domain.OrderMain;
import com.junmp.jyzb.entity.OrderMain;
import com.junmp.jyzb.mapper.OrderMainMapper;
import com.junmp.jyzb.service.OrderService;
import com.junmp.jyzb.utils.DateTimeUtil;
......@@ -50,7 +50,6 @@ public class OrderServiceImpl implements OrderService {
order.setProcessId((String) msg.get("processId"));
order.setBussinessType((String) msg.get("bussinessType"));
order.setOrderCode((String) msg.get("orderCode"));
order.setOrgId((String) msg.get("orgId"));
order.setInventoryQuantity((Integer) msg.get("inventoryQuantity"));
order.setManualState((Integer) msg.get("manualState"));
order.setOrderState((Integer) msg.get("orderState"));
......@@ -105,7 +104,6 @@ public class OrderServiceImpl implements OrderService {
order.setProcessId((String) msg.get("processId"));
order.setBussinessType((String) msg.get("bussinessType"));
order.setOrderCode((String) msg.get("orderCode"));
order.setOrgId((String) msg.get("orgId"));
order.setInventoryQuantity((Integer) msg.get("inventoryQuantity"));
order.setManualState((Integer) msg.get("manualState"));
order.setOrderState((Integer) msg.get("orderState"));
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PoliceFingerServiceImpl.java
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.req.ProductReq;
import com.junmp.jyzb.api.exception.enums.ProductExceptionEnum;
import com.junmp.jyzb.beanReq.PolicemanFingerReq;
import com.junmp.jyzb.domain.PoliceFinger;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.entity.Product;
import com.junmp.jyzb.exception.enums.PolicemanFingerExceptionEnum;
import com.junmp.jyzb.mapper.ProductMapper;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
......@@ -4,7 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.entity.Cabinet;
import com.junmp.jyzb.domain.PoliceFinger;
import com.junmp.jyzb.entity.PoliceFinger;
import com.junmp.jyzb.mapper.*;
import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.service.PubOrgService;
......@@ -12,7 +12,7 @@ import com.junmp.jyzb.utils.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.entity.Policeman;
import javax.annotation.Resource;
import java.util.*;
......@@ -751,7 +751,7 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
if (ObjectUtil.isNull(cabinet)){
return new ResponseResult(HttpStatus.ERROR,ReturnMsg.NO_DATA,ReturnData.NO_DATA);
}
String orgId=cabinet.getOrgId();
long orgId = cabinet.getOrgId();
//通过机构id获取机构下所有的警员信息
List<Policeman> policemenList = policemanMapper.selectList(new LambdaQueryWrapper<Policeman>()
.eq(Policeman::getOrgId, orgId));
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.domain.PubOrg;
import com.junmp.jyzb.entity.PubOrg;
import com.junmp.jyzb.utils.HttpStatus;
import com.junmp.jyzb.utils.RedisUtils;
import com.junmp.jyzb.utils.ResponseResult;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.junmp.jyzb.domain.Policeman;
import com.junmp.jyzb.domain.Supplier;
import com.junmp.jyzb.entity.Supplier;
import com.junmp.jyzb.service.SupplierService;
import com.junmp.jyzb.utils.*;
import org.springframework.stereotype.Service;
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/WarehouseServiceImpl.java
package com.junmp.jyzb.service.impl;
import com.junmp.jyzb.domain.*;
import com.junmp.jyzb.entity.*;
import com.junmp.jyzb.mapper.*;
import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.service.PubOrgService;
......
jyzb-biz/src/main/java/com/junmp/jyzb/utils/ObjectToMap.java
package com.junmp.jyzb.utils;
import com.junmp.jyzb.domain.Policeman;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.Map;
......
jyzb-biz/src/main/resources/mapper/CabinetMapper.xml
......@@ -28,7 +28,7 @@
create_user, update_user
</sql>
<insert id="addCabinet" parameterType="com.junmp.jyzb.domain.Warehouse">
<insert id="addCabinet" parameterType="com.junmp.jyzb.entity.Warehouse">
insert into base_cabinet
(id,cabinet_num,name,org_id,location,state,num,create_time,update_time)
values
......
jyzb-biz/src/main/resources/mapper/OrderMainMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.OrderMainMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.OrderMain">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.OrderMain">
<!--@mbg.generated-->
<!--@Table bussiness_order_main-->
<id column="id" jdbcType="BIGINT" property="id" />
......@@ -29,7 +29,7 @@
inv_list, create_time, update_time, create_user, update_user
</sql>
<insert id="addOrder" parameterType="com.junmp.jyzb.domain.OrderMain" useGeneratedKeys="true" keyProperty="id">
<insert id="addOrder" parameterType="com.junmp.jyzb.entity.OrderMain" useGeneratedKeys="true" keyProperty="id">
insert into business_order_main
(order_type,process_id,bussiness_type,order_code,org_id,inventory_quantity,manual_state,order_state,attachment_location,inv_list,create_time,update_time)
values
......
jyzb-biz/src/main/resources/mapper/PackageInformationMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.PackageInformationMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.PackageInformation">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.PackageInformation">
<!--@mbg.generated-->
<!--@Table base_package_information-->
<id column="id" jdbcType="VARCHAR" property="id" />
......
jyzb-biz/src/main/resources/mapper/PackageMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.PackageMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.Package">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Package">
<!--@mbg.generated-->
<!--@Table base_package-->
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="count" jdbcType="INTEGER" property="count" />
<result column="org_id" jdbcType="VARCHAR" property="orgId" />
<result column="org_id_int" jdbcType="VARCHAR" property="orgId" />
<result column="location" jdbcType="VARCHAR" property="location" />
<result column="shelf_id" jdbcType="VARCHAR" property="shelfId" />
<result column="shelf_name" jdbcType="VARCHAR" property="shelfName" />
......
jyzb-biz/src/main/resources/mapper/PolicemanMapper.xml
......@@ -21,7 +21,7 @@
<!-- </collection>-->
<!--</resultMap>-->
<insert id="addPoliceman" parameterType="com.junmp.jyzb.domain.Policeman">
<insert id="addPoliceman" parameterType="com.junmp.jyzb.entity.Policeman">
insert into base_policeman
(id,org_id_int,name,police_code,sex,
cabinet_box_id,phone,id_card,photo,create_time,update_time)
......@@ -141,7 +141,7 @@
where cabinet_box_id=#{boxId}
</select>
<update id="addFaceInfo" parameterType="com.junmp.jyzb.domain.Policeman">
<update id="addFaceInfo" parameterType="com.junmp.jyzb.entity.Policeman">
update base_policeman p
set face_info=#{faceInfo},update_time=#{updateTime}
where p.id=#{id}
......
jyzb-biz/src/main/resources/mapper/PubOrgMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.PubOrgMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.PubOrg">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.PubOrg">
<!--@mbg.generated-->
<!--@Table pub_org-->
<id column="org_id" jdbcType="BIGINT" property="orgId" />
......@@ -31,7 +31,7 @@
update_time, update_user, guid
</sql>
<select id="selectAllOrg" resultType="com.junmp.jyzb.domain.PubOrg">
<select id="selectAllOrg" resultType="com.junmp.jyzb.entity.PubOrg">
SELECT
IFNULL(org_id, 'null') as orgId,
IFNULL(org_parent_id, 'null') as orgParentId,
......@@ -45,7 +45,7 @@ WHERE
del_flag = 1;
</select>
<select id="showAllPubOrgList" resultType="com.junmp.jyzb.domain.PubOrg">
<select id="showAllPubOrgList" resultType="com.junmp.jyzb.entity.PubOrg">
SELECT org_id,
IFNULL(org_id, 'null') as orgId,
IFNULL(org_parent_id, 'null') as orgParentId,
......
jyzb-biz/src/main/resources/mapper/ShelfMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.ShelfMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.Shelf">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Shelf">
<!--@mbg.generated-->
<!--@Table base_shelf-->
<id column="shelf_id" jdbcType="VARCHAR" property="shelfId" />
......@@ -25,7 +25,7 @@
url, size_info, create_time, update_time, create_user, update_user
</sql>
<insert id="addShelf" parameterType="com.junmp.jyzb.domain.Shelf">
<insert id="addShelf" parameterType="com.junmp.jyzb.entity.Shelf">
insert into base_shelf
(shelf_id,shelf_name,code,type,warehouse_id,shelf_rows,shelf_columns,shelf_ranges,url,size_info,create_time,update_time)
values
......
jyzb-biz/src/main/resources/mapper/SupplierEquipmentMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.SupplierEquipmentMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.SupplierEquipment">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.SupplierEquipment">
<!--@mbg.generated-->
<!--@Table base_supplier_equipment-->
<id column="id" jdbcType="VARCHAR" property="id" />
......
jyzb-biz/src/main/resources/mapper/SupplierMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.SupplierMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.Supplier">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Supplier">
<!--@mbg.generated-->
<!--@Table base_supplier-->
<id column="id" jdbcType="VARCHAR" property="id" />
......@@ -21,7 +21,7 @@
update_time, update_user
</sql>
<insert id="addSupplier" parameterType="com.junmp.jyzb.domain.Supplier">
<insert id="addSupplier" parameterType="com.junmp.jyzb.entity.Supplier">
insert into base_supplier
(id,name,code,short_name,contacts,phone,create_time,update_time,create_user,state)
values
......
jyzb-biz/src/main/resources/mapper/SupplierTypeMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.SupplierTypeMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.SupplierType">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.SupplierType">
<!--@mbg.generated-->
<!--@Table base_supplier_type-->
<id column="id" jdbcType="VARCHAR" property="id" />
......
jyzb-biz/src/main/resources/mapper/WarehouseAreaMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.WarehouseAreaMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.WarehouseArea">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.WarehouseArea">
<!--@mbg.generated-->
<!--@Table base_warehouse_area-->
<id column="area_id" jdbcType="BIGINT" property="areaId" />
......@@ -20,7 +20,7 @@
update_user
</sql>
<insert id="addArea" parameterType="com.junmp.jyzb.domain.WarehouseArea">
<insert id="addArea" parameterType="com.junmp.jyzb.entity.WarehouseArea">
insert into base_warehouse_area
(area_id,area_name,photo,create_time,update_time)
values
......
jyzb-biz/src/main/resources/mapper/WarehouseMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.WarehouseMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.Warehouse">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.Warehouse">
<!--@mbg.generated-->
<!--@Table base_warehouse-->
<id column="id" jdbcType="VARCHAR" property="id" />
......@@ -19,7 +19,7 @@
id, `name`, `location`, phone, create_time, update_time, update_user, org_id, `sum`
</sql>
<insert id="addWarehouse" parameterType="com.junmp.jyzb.domain.Warehouse">
<insert id="addWarehouse" parameterType="com.junmp.jyzb.entity.Warehouse">
insert into base_warehouse
(id,name,location,phone,create_time,update_time,update_user,org_id_int,video,state)
values
......
jyzb-biz/src/main/resources/mapper/YearReportMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.jyzb.mapper.YearReportMapper">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.domain.YearReport">
<resultMap id="BaseResultMap" type="com.junmp.jyzb.entity.YearReport">
<!--@mbg.generated-->
<!--@Table base_year_report-->
<id column="id" jdbcType="VARCHAR" property="id" />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论