Commit 88e4f489 by lal

Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal

parents b46988e1 297d8629
package cn.timer.api.bean.qyzx;
import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author Tang 2019-11-11
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder(toBuilder=true)
@Table(name="qyzx_feeback_accessory")
@ApiModel("反馈附件表")
public class QyzxFeebackAccessory extends Model<QyzxFeebackAccessory> {
private static final long serialVersionUID = 3545665863196016627L;
@TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号",example="1")
private Integer id;
@ApiModelProperty(value="意见id",example="1")
private Integer feebackId;
@ApiModelProperty(value = "附件url地址", example = "url")
private String opinionUrl;
}
\ No newline at end of file
package cn.timer.api.bean.qyzx; package cn.timer.api.bean.qyzx;
import java.util.Date; import java.util.Date;
import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
...@@ -17,41 +16,47 @@ import lombok.Data; ...@@ -17,41 +16,47 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* @author Tang 2019-11-11 * @author Tang 2019-11-11
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@Builder(toBuilder=true) @Builder(toBuilder = true)
@Table(name="qyzx_suggestion_feeback") @Table(name = "qyzx_suggestion_feeback")
@ApiModel("意见反馈表") @ApiModel("意见反馈表")
public class QyzxSuggestionFeeback extends Model<QyzxSuggestionFeeback> { public class QyzxSuggestionFeeback extends Model<QyzxSuggestionFeeback> {
private static final long serialVersionUID = 3545665863196016627L; private static final long serialVersionUID = 3545665863196016627L;
@TableId (type = IdType.AUTO) @TableId(type = IdType.AUTO)
@ApiModelProperty(value="编号",example="1") @ApiModelProperty(value = "编号", example = "1")
private Integer id; private Integer id;
@ApiModelProperty(value="员工编号",example="9688") @ApiModelProperty(value = "员工编号", example = "9688")
private Integer empNum; private Integer empNum;
@ApiModelProperty(value="意见文本",example="不好用") @ApiModelProperty(value = "组织机构代码", example = "117")
private Integer orgCode;
@ApiModelProperty(value = "意见内容", example = "不好用")
private String opinionText; private String opinionText;
@ApiModelProperty(value="bug类型",example="1") @ApiModelProperty(value = "附件", example = "www.4399.com")
private String url;
@ApiModelProperty(value = "bug类型", example = "1")
private Integer bugType; private Integer bugType;
@ApiModelProperty(value="创建时间",example="2020-4-20 08:00:00") @ApiModelProperty(value = "创建时间", example = "2020-4-20 08:00:00")
private Date createTime; private Date createTime;
@ApiModelProperty(value="组织机构代码",example="117") @ApiModelProperty(value = "回复", example = "那别用了")
private Integer orgCode;
@ApiModelProperty(value="回复",example="那别用了")
private String reply; private String reply;
@ApiModelProperty(value="回复时间",example="2020-4-21 08:00:00") @ApiModelProperty(value = "回复时间", example = "2020-4-21 08:00:00")
private Date replyTime; private Date replyTime;
@ApiModelProperty(value = "联系方式", example = "5481264596")
private String personalContact;
} }
\ No newline at end of file
...@@ -28,89 +28,92 @@ import lombok.Data; ...@@ -28,89 +28,92 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* <p>Title: QyzxInvoiceData.java</p> * <p>
* <p>Description: 发票资料实体类</p> * Title: QyzxInvoiceData.java
* @author dsc * </p>
* @date 2020年4月21日 * <p>
* @version 1.0 * Description: 发票资料实体类
*/ * </p>
*
* @author dsc
* @date 2020年4月21日
* @version 1.0
*/
@Entity @Entity
@Data @Data
@Builder @Builder
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@Table(name="qyzx_invoice_data") @Table(name = "qyzx_invoice_data")
@ApiModel("发票资料表") @ApiModel("发票资料表")
public class QyzxInvoiceData extends Model<QyzxInvoiceData>{ public class QyzxInvoiceData extends Model<QyzxInvoiceData> {
private static final long serialVersionUID = 2890357568571822258L; private static final long serialVersionUID = 2890357568571822258L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId(type = IdType.AUTO)
@ApiModelProperty(value="主键",example="1") @ApiModelProperty(value = "主键", example = "1")
private Integer id; private Integer id;
@ApiModelProperty(value="订单号",example="1") @ApiModelProperty(value = "订单号", example = "1")
private String orderNo; private String orderNo;
@ApiModelProperty(value = "发票抬头", example = "广东优领")
@ApiModelProperty(value="发票抬头",example="广东优领")
private String invoiceTitle; private String invoiceTitle;
@ApiModelProperty(value="税号",example="915345164") @ApiModelProperty(value = "税号", example = "915345164")
private String dutyParagraph; private String dutyParagraph;
@ApiModelProperty(value="公司地址",example="广东省") @ApiModelProperty(value = "公司地址", example = "广东省")
private String companyAddress; private String companyAddress;
@ApiModelProperty(value="电话号码",example="18152456464") @ApiModelProperty(value = "电话号码", example = "18152456464")
private String companyPhone; private String companyPhone;
@ApiModelProperty(value="开户行",example="中信银行广州白云支行") @ApiModelProperty(value = "开户行", example = "中信银行广州白云支行")
private String bankName; private String bankName;
@ApiModelProperty(value="银行账号",example="8110901011900785029") @ApiModelProperty(value = "银行账号", example = "8110901011900785029")
private String bankAccount; private String bankAccount;
@ApiModelProperty(value="发票类型",example="0-普通 1-专用") @ApiModelProperty(value = "发票类型", example = "0-普通 1-专用")
private Integer invoiceType; private Integer invoiceType;
@ApiModelProperty(value="开票项目",example="") @ApiModelProperty(value = "开票项目", example = "")
private String invoiceProject; private String invoiceProject;
@ApiModelProperty(value="发票金额",example="") @ApiModelProperty(value = "发票金额", example = "")
private Double invoiceValue; private Double invoiceValue;
@ApiModelProperty(value="收货人",example="翁🐻") @ApiModelProperty(value = "收货人", example = "翁🐻")
private String consignee; private String consignee;
@ApiModelProperty(value="收货人电话",example="13144400255") @ApiModelProperty(value = "收货人电话", example = "13144400255")
private String consigneePhone; private String consigneePhone;
@ApiModelProperty(value="邮箱",example="13144400255@163.com") @ApiModelProperty(value = "邮箱", example = "13144400255@163.com")
private String email; private String email;
@ApiModelProperty(value="收货地址省市区",example="广东省/广州市/白云区") @ApiModelProperty(value = "收货地址省市区", example = "广东省/广州市/白云区")
private String shippingArea; private String shippingArea;
@ApiModelProperty(value="收货详细地址",example="白云东平伯曼酒店") @ApiModelProperty(value = "收货详细地址", example = "白云东平伯曼酒店")
private String shippingAddress; private String shippingAddress;
@ApiModelProperty(value="邮编",example="510080") @ApiModelProperty(value = "邮编", example = "510080")
private String zipCode; private String zipCode;
@ApiModelProperty(value = "企业", example = "117")
@ApiModelProperty(value="企业",example="117")
private Integer orgCode; private Integer orgCode;
@ApiModelProperty(value="模块状态",example="默认0-开启,1-关闭") @ApiModelProperty(value = "模块状态", example = "默认0-开启,1-关闭")
private Integer status; private Integer status;
@ApiModelProperty(value="排序",example="") @ApiModelProperty(value = "排序", example = "")
private String sort; private String sort;
@ApiModelProperty(value="是否删除",example="默认0-未删除,1-删除") @ApiModelProperty(value = "是否删除", example = "默认0-未删除,1-删除")
private Integer isDelete; private Integer isDelete;
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value="创建时间 ",example="") @ApiModelProperty(value = "创建时间 ", example = "")
private Date createTime; private Date createTime;
@ApiModelProperty(value="创建人 ",example="") @ApiModelProperty(value = "创建人 ", example = "")
private Integer createUser; private Integer createUser;
@TableField(fill = FieldFill.INSERT_UPDATE) @TableField(fill = FieldFill.INSERT_UPDATE)
@ApiModelProperty(value="修改时间 ",example="") @ApiModelProperty(value = "修改时间 ", example = "")
private Date modifyTime; private Date modifyTime;
@ApiModelProperty(value="修改人 ",example="") @ApiModelProperty(value = "修改人 ", example = "")
private Integer modifyUser; private Integer modifyUser;
} }
...@@ -12,19 +12,19 @@ import lombok.Getter; ...@@ -12,19 +12,19 @@ import lombok.Getter;
public enum CommonEnum { public enum CommonEnum {
/** /**
* 0 超管理员 * 1 超管理员
*/ */
U_TYPE_ADMIN(0, "超管理员"), U_TYPE_ADMIN(1, "超管理员"),
/** /**
* 1 子管理 * 2 子管理
*/ */
U_TYPE_C_ADMIN(1, "子管理"), U_TYPE_C_ADMIN(2, "子管理"),
/** /**
* 2 普通员工 * 3 普通员工
*/ */
U_TYPE_EMP(2, "普通员工"), U_TYPE_EMP(3, "普通员工"),
/** /**
* 0 关闭 * 0 关闭
......
...@@ -223,29 +223,21 @@ public class QyzxBusinessController { ...@@ -223,29 +223,21 @@ public class QyzxBusinessController {
return ResultUtil.pageData(list, page.getTotal(), "查询成功"); return ResultUtil.pageData(list, page.getTotal(), "查询成功");
} }
public static void main(String[] args) {
QyzxInvoiceData qyzxInvoiceData = new QyzxInvoiceData();
qyzxInvoiceData.setBankAccount("123");
qyzxInvoiceData.setBankName("234");
if (!ObjectUtil.isAllNotEmpty(qyzxInvoiceData, qyzxInvoiceData.getBankAccount(),
qyzxInvoiceData.getBankName())) {
System.out.println("请完善发票信息!");
} else {
System.err.println("可以,不错");
}
}
@PostMapping(value = "/invoicing") @PostMapping(value = "/invoicing")
@ApiOperation(value = "开发票", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "开发票", httpMethod = "POST", notes = "接口发布说明")
public Result<QyzxInvoiceData> generateOrder(@CurrentUser UserBean userBean, public Result<QyzxInvoiceData> generateOrder(@CurrentUser UserBean userBean,
@RequestBody QyzxInvoiceData qyzxInvoiceData) { @RequestBody QyzxInvoiceData qyzxInvoiceData) {
Double invoiceValue = qyzxInvoiceData.getInvoiceValue();
if (invoiceValue <= 0)
return ResultUtil.error("请填写正确的发票金额!");
if (!ObjectUtil.isAllNotEmpty( if (!ObjectUtil.isAllNotEmpty(
// qyzxInvoiceData, // qyzxInvoiceData,
qyzxInvoiceData.getInvoiceTitle(), qyzxInvoiceData.getDutyParagraph(), qyzxInvoiceData.getInvoiceTitle(), qyzxInvoiceData.getDutyParagraph(),
qyzxInvoiceData.getCompanyAddress(), qyzxInvoiceData.getCompanyPhone(), qyzxInvoiceData.getBankName(), qyzxInvoiceData.getCompanyAddress(), qyzxInvoiceData.getCompanyPhone(), qyzxInvoiceData.getBankName(),
qyzxInvoiceData.getBankAccount(), qyzxInvoiceData.getInvoiceType(), qyzxInvoiceData.getInvoiceProject(), qyzxInvoiceData.getBankAccount(), qyzxInvoiceData.getInvoiceType(), qyzxInvoiceData.getInvoiceProject(),
qyzxInvoiceData.getInvoiceValue(), qyzxInvoiceData.getConsignee(), qyzxInvoiceData.getConsigneePhone(), invoiceValue, qyzxInvoiceData.getConsignee(), qyzxInvoiceData.getConsigneePhone(),
qyzxInvoiceData.getEmail(), qyzxInvoiceData.getShippingArea(), qyzxInvoiceData.getShippingAddress(), qyzxInvoiceData.getEmail(), qyzxInvoiceData.getShippingArea(), qyzxInvoiceData.getShippingAddress(),
qyzxInvoiceData.getZipCode())) { qyzxInvoiceData.getZipCode())) {
return ResultUtil.error("请完善发票信息!"); return ResultUtil.error("请完善发票信息!");
...@@ -315,6 +307,7 @@ public class QyzxBusinessController { ...@@ -315,6 +307,7 @@ public class QyzxBusinessController {
@GetMapping(value = "/queryContractUseRecord") @GetMapping(value = "/queryContractUseRecord")
@ApiOperation(value = "查询电子合同套餐使用记录", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "查询电子合同套餐使用记录", httpMethod = "GET", notes = "接口发布说明")
public Result<Object> queryContractUseRecord(@CurrentUser UserBean userBean) { public Result<Object> queryContractUseRecord(@CurrentUser UserBean userBean) {
// TODO
return null; return null;
} }
......
...@@ -51,8 +51,8 @@ import cn.hutool.core.date.DateUtil; ...@@ -51,8 +51,8 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeNodeConfig;
import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.TreeUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import cn.timer.api.bean.clazz.CommonArea; import cn.timer.api.bean.clazz.CommonArea;
import cn.timer.api.bean.clazz.SysRegion; import cn.timer.api.bean.clazz.SysRegion;
...@@ -364,12 +364,17 @@ public class YgglController { ...@@ -364,12 +364,17 @@ public class YgglController {
Integer zjType = addygdaDto.getZjType(); Integer zjType = addygdaDto.getZjType();
String zjNum = addygdaDto.getZjNum(); String zjNum = addygdaDto.getZjNum();
Integer jobType = addygdaDto.getJobType(); Integer jobType = addygdaDto.getJobType();
Date rzTime = new Date(); Date rzTime = addygdaDto.getRzTime();
Integer syq = addygdaDto.getSyq(); Integer syq = addygdaDto.getSyq();
Integer sex = addygdaDto.getSex(); Integer sex = addygdaDto.getSex();
Integer bmgwId = addygdaDto.getBmgwId();
if (StrUtil.hasBlank(phone) || StrUtil.hasBlank(name) || StrUtil.hasBlank(zjNum)) { if (StrUtil.hasBlank(phone) || StrUtil.hasBlank(name) || StrUtil.hasBlank(zjNum)) {
return ResultUtil.error("请输入员工姓名,手机号和身份证号"); return ResultUtil.error("请输入员工姓名,手机号和身份证号");
} }
if (!ObjectUtil.isAllNotEmpty(name,phone,zjType,zjNum,jobType,rzTime,syq,bmgwId,sex)) {
return ResultUtil.error("请完善员工信息!");
}
QyzxEmpLogin login = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper) QyzxEmpLogin login = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
.eq(!StrUtil.hasBlank(phone), QyzxEmpLogin::getPhone, phone).one(); .eq(!StrUtil.hasBlank(phone), QyzxEmpLogin::getPhone, phone).one();
if (login == null) { if (login == null) {
...@@ -425,7 +430,7 @@ public class YgglController { ...@@ -425,7 +430,7 @@ public class YgglController {
QyzxEmpEntAsso.builder() QyzxEmpEntAsso.builder()
.empNum(login.getId()) .empNum(login.getId())
.orgCode(orgCode) .orgCode(orgCode)
.userType(2) .userType(CommonEnum.U_TYPE_EMP.getType())
.status(1) .status(1)
.build() .build()
.insert();// usertype2普通员工 .insert();// usertype2普通员工
...@@ -611,7 +616,7 @@ public class YgglController { ...@@ -611,7 +616,7 @@ public class YgglController {
} }
// 员工权限表(未定) // 员工权限表(未定)
// 员工企业关联表和员工档案,员工成长表(未定) // 员工企业关联表和员工档案,员工成长表(未定)
QyzxEmpEntAsso.builder().empNum(qyzxEmpLogin.getId()).orgCode(userBean.getOrgCode()).userType(2) QyzxEmpEntAsso.builder().empNum(qyzxEmpLogin.getId()).orgCode(userBean.getOrgCode()).userType(CommonEnum.U_TYPE_EMP.getType())
.status(1).build().insert();// userType2普通员工,status1正常 .status(1).build().insert();// userType2普通员工,status1正常
YgglMainEmp emp = YgglMainEmp.builder().name(e.getName()).phone(e.getPhone()).zjType(0).zjNum(e.getZj()) YgglMainEmp emp = YgglMainEmp.builder().name(e.getName()).phone(e.getPhone()).zjType(0).zjNum(e.getZj())
.jobType(jobType).rzTime(rzdate).updateTime(new Date()).updateMan(userBean.getEmpNum()).syq(syq) .jobType(jobType).rzTime(rzdate).updateTime(new Date()).updateMan(userBean.getEmpNum()).syq(syq)
...@@ -630,7 +635,7 @@ public class YgglController { ...@@ -630,7 +635,7 @@ public class YgglController {
.eq("phone", e.getPhone()).eq("org_code", userBean.getOrgCode())); .eq("phone", e.getPhone()).eq("org_code", userBean.getOrgCode()));
if (ishad == null) { if (ishad == null) {
// 员工权限表(未定) // 员工权限表(未定)
QyzxEmpEntAsso.builder().empNum(login.getId()).orgCode(userBean.getOrgCode()).userType(2).status(1) QyzxEmpEntAsso.builder().empNum(login.getId()).orgCode(userBean.getOrgCode()).userType(CommonEnum.U_TYPE_EMP.getType()).status(1)
.build().insert();// userType2普通员工,status1正常 .build().insert();// userType2普通员工,status1正常
YgglMainEmp emp = YgglMainEmp.builder().name(e.getName()).phone(e.getPhone()).zjType(0) YgglMainEmp emp = YgglMainEmp.builder().name(e.getName()).phone(e.getPhone()).zjType(0)
.zjNum(e.getZj()).jobType(jobType).rzTime(rzdate).updateTime(new Date()) .zjNum(e.getZj()).jobType(jobType).rzTime(rzdate).updateTime(new Date())
......
package cn.timer.api.dao.qyzx; package cn.timer.api.dao.qyzx;
import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import cn.timer.api.bean.qyzx.QyzxEmpEntAsso; import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
import cn.timer.api.bean.yggl.YgglMainEmp;
import cn.timer.api.dto.qyzx.AdminListDto; import cn.timer.api.dto.qyzx.AdminListDto;
/** /**
......
package cn.timer.api.dao.qyzx;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.qyzx.QyzxFeebackAccessory;
/**
* 员工企业关联表
* @author Tang 2019-11-11
*/
@Repository
public interface QyzxFeebackAccessoryMapper extends BaseMapper<QyzxFeebackAccessory> {
}
...@@ -7,7 +7,6 @@ package cn.timer.api.dto.qyzx; ...@@ -7,7 +7,6 @@ package cn.timer.api.dto.qyzx;
import java.io.Serializable; import java.io.Serializable;
import cn.timer.api.config.swagger.IgnoreSwaggerParameter;
import cn.timer.api.utils.Page; import cn.timer.api.utils.Page;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
/**
* @date 2020年4月27日
* @author 翁东州
* @方法中文名称:
*/
package cn.timer.api.dto.qyzx;
import java.io.Serializable;
import java.util.List;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @date 2020年4月27日
* @author 翁东州
* @方法中文名称:
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class FeebackDto implements Serializable{
/**
* @date 2020年4月27日
* @author 翁东州
* @方法中文名称:
*/
private static final long serialVersionUID = 4457381912053961473L;
@ApiModelProperty(value = "填写内容", example = "13129310893")
private String opinionText;
@ApiModelProperty(value = "附件地址", example = "123456")
private List<String> urlList;
}
package cn.timer.api.dto.qyzx; package cn.timer.api.dto.qyzx;
import cn.timer.api.dto.spmk.MySummaryQueryDto;
import cn.timer.api.utils.Page; import cn.timer.api.utils.Page;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
...@@ -9,7 +9,6 @@ import java.io.Serializable; ...@@ -9,7 +9,6 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import cn.timer.api.config.exception.ValidationMsg; import cn.timer.api.config.exception.ValidationMsg;
......
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