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

88e4f489 · lal · b46988e1 · 297d8629 · b46988e1 · 88e4f489
Commit 88e4f489 authored May 18, 2020 by lal
13 changed files
--- a/src/main/java/cn/timer/api/bean/qyzx/QyzxFeebackAccessory.java
+++ b/src/main/java/cn/timer/api/bean/qyzx/QyzxFeebackAccessory.java
-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
--- a/src/main/java/cn/timer/api/bean/qyzx/QyzxSuggestionFeeback.java
+++ b/src/main/java/cn/timer/api/bean/qyzx/QyzxSuggestionFeeback.java
 package cn.timer.api.bean.qyzx;
 import java.util.Date;
-import javax.persistence.Entity;
 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;
@@ -17,41 +16,47 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 /**
-* @author Tang 2019-11-11
+ * @author Tang 2019-11-11
-*/
+ */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@Builder(toBuilder=true)
+@Builder(toBuilder = true)
-@Table(name="qyzx_suggestion_feeback")
+@Table(name = "qyzx_suggestion_feeback")
 @ApiModel("意见反馈表")
 public class QyzxSuggestionFeeback extends Model<QyzxSuggestionFeeback> {
 	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 String opinionText;
+	private Integer orgCode;
-	@ApiModelProperty(value="bug类型",example="1")
+	@ApiModelProperty(value = "意见内容", example = "不好用")
-    private Integer bugType;
+	private String opinionText;
-	@ApiModelProperty(value="创建时间",example="2020-4-20 08:00:00")
+	@ApiModelProperty(value = "附件", example = "www.4399.com")
-    private Date createTime;
+	private String url;
-	@ApiModelProperty(value="组织机构代码",example="117")
+	@ApiModelProperty(value = "bug类型", example = "1")
-    private Integer orgCode;
+	private Integer bugType;
-	@ApiModelProperty(value="回复",example="那别用了")
+	@ApiModelProperty(value = "创建时间", example = "2020-4-20 08:00:00")
-    private String reply;
+	private Date createTime;
-	@ApiModelProperty(value="回复时间",example="2020-4-21 08:00:00")
+	@ApiModelProperty(value = "回复", example = "那别用了")
-    private Date replyTime;
+	private String reply;
+	@ApiModelProperty(value = "回复时间", example = "2020-4-21 08:00:00")
+	private Date replyTime;
+	@ApiModelProperty(value = "联系方式", example = "5481264596")
+	private String personalContact;
 }
\ No newline at end of file
--- a/src/main/java/cn/timer/api/bean/qyzx/businessService/QyzxInvoiceData.java
+++ b/src/main/java/cn/timer/api/bean/qyzx/businessService/QyzxInvoiceData.java
@@ -4,7 +4,7 @@
 * @author dsc  
 * @date 2020年4月21日  
 * @version 1.0  
-*/  
+*/
 package cn.timer.api.bean.qyzx.businessService;
 import java.util.Date;
@@ -27,90 +27,93 @@ import lombok.Builder;
 import lombok.Data;
 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
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@Table(name="qyzx_invoice_data")
+@Table(name = "qyzx_invoice_data")
 @ApiModel("发票资料表")
-public class QyzxInvoiceData extends Model<QyzxInvoiceData>{
+public class QyzxInvoiceData extends Model<QyzxInvoiceData> {
 	private static final long serialVersionUID = 2890357568571822258L;
 	@Id
 	@GeneratedValue
-	@TableId (type = IdType.AUTO)
+	@TableId(type = IdType.AUTO)
-	@ApiModelProperty(value="主键",example="1")
+	@ApiModelProperty(value = "主键", example = "1")
 	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;
-	@ApiModelProperty(value="公司地址",example="广东省")
+	@ApiModelProperty(value = "公司地址", example = "广东省")
 	private String companyAddress;
-	@ApiModelProperty(value="电话号码",example="18152456464")
+	@ApiModelProperty(value = "电话号码", example = "18152456464")
 	private String companyPhone;
-	@ApiModelProperty(value="开户行",example="中信银行广州白云支行")
+	@ApiModelProperty(value = "开户行", example = "中信银行广州白云支行")
 	private String bankName;
-	@ApiModelProperty(value="银行账号",example="8110901011900785029")
+	@ApiModelProperty(value = "银行账号", example = "8110901011900785029")
 	private String bankAccount;
-	@ApiModelProperty(value="发票类型",example="0-普通 1-专用")
+	@ApiModelProperty(value = "发票类型", example = "0-普通 1-专用")
 	private Integer invoiceType;
-	@ApiModelProperty(value="开票项目",example="")
+	@ApiModelProperty(value = "开票项目", example = "")
 	private String invoiceProject;
-	@ApiModelProperty(value="发票金额",example="")
+	@ApiModelProperty(value = "发票金额", example = "")
 	private Double invoiceValue;
-	@ApiModelProperty(value="收货人",example="翁🐻")
+	@ApiModelProperty(value = "收货人", example = "翁🐻")
 	private String consignee;
-	@ApiModelProperty(value="收货人电话",example="13144400255")
+	@ApiModelProperty(value = "收货人电话", example = "13144400255")
 	private String consigneePhone;
-	@ApiModelProperty(value="邮箱",example="13144400255@163.com")
+	@ApiModelProperty(value = "邮箱", example = "13144400255@163.com")
 	private String email;
-	@ApiModelProperty(value="收货地址省市区",example="广东省/广州市/白云区")
+	@ApiModelProperty(value = "收货地址省市区", example = "广东省/广州市/白云区")
 	private String shippingArea;
-	@ApiModelProperty(value="收货详细地址",example="白云东平伯曼酒店")
+	@ApiModelProperty(value = "收货详细地址", example = "白云东平伯曼酒店")
 	private String shippingAddress;
-	@ApiModelProperty(value="邮编",example="510080")
+	@ApiModelProperty(value = "邮编", example = "510080")
 	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)
-	@ApiModelProperty(value="创建时间 ",example="")
+	@ApiModelProperty(value = "创建时间 ", example = "")
 	private Date createTime;
-	@ApiModelProperty(value="创建人 ",example="")
+	@ApiModelProperty(value = "创建人 ", example = "")
 	private Integer createUser;
 	@TableField(fill = FieldFill.INSERT_UPDATE)
-	@ApiModelProperty(value="修改时间 ",example="")
+	@ApiModelProperty(value = "修改时间 ", example = "")
 	private Date modifyTime;
-	@ApiModelProperty(value="修改人 ",example="")
+	@ApiModelProperty(value = "修改人 ", example = "")
 	private Integer modifyUser;
 }
--- a/src/main/java/cn/timer/api/config/enums/CommonEnum.java
+++ b/src/main/java/cn/timer/api/config/enums/CommonEnum.java
@@ -12,19 +12,19 @@ import lombok.Getter;
 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 关闭

--- a/src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java
+++ b/src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java
@@ -223,29 +223,21 @@ public class QyzxBusinessController {
 		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")
 	@ApiOperation(value = "开发票", httpMethod = "POST", notes = "接口发布说明")
 	public Result<QyzxInvoiceData> generateOrder(@CurrentUser UserBean userBean,
 			@RequestBody QyzxInvoiceData qyzxInvoiceData) {
+		Double invoiceValue = qyzxInvoiceData.getInvoiceValue();
+		if (invoiceValue <= 0)
+			return ResultUtil.error("请填写正确的发票金额！");
 		if (!ObjectUtil.isAllNotEmpty(
 //				qyzxInvoiceData, 
 				qyzxInvoiceData.getInvoiceTitle(), qyzxInvoiceData.getDutyParagraph(),
 				qyzxInvoiceData.getCompanyAddress(), qyzxInvoiceData.getCompanyPhone(), qyzxInvoiceData.getBankName(),
 				qyzxInvoiceData.getBankAccount(), qyzxInvoiceData.getInvoiceType(), qyzxInvoiceData.getInvoiceProject(),
-				qyzxInvoiceData.getInvoiceValue(), qyzxInvoiceData.getConsignee(), qyzxInvoiceData.getConsigneePhone(),
+				invoiceValue, qyzxInvoiceData.getConsignee(), qyzxInvoiceData.getConsigneePhone(),
 				qyzxInvoiceData.getEmail(), qyzxInvoiceData.getShippingArea(), qyzxInvoiceData.getShippingAddress(),
 				qyzxInvoiceData.getZipCode())) {
 			return ResultUtil.error("请完善发票信息！");
@@ -315,6 +307,7 @@ public class QyzxBusinessController {
 	@GetMapping(value = "/queryContractUseRecord")
 	@ApiOperation(value = "查询电子合同套餐使用记录", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> queryContractUseRecord(@CurrentUser UserBean userBean) {
+		// TODO
 		return null;
 	}

--- a/src/main/java/cn/timer/api/controller/qyzx/QyzxController.java
+++ b/src/main/java/cn/timer/api/controller/qyzx/QyzxController.java
@@ -7,7 +7,6 @@ import java.util.stream.Stream;
 import javax.servlet.http.HttpSession;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,27 +15,26 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
-import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.timer.api.bean.qyzx.QyzxAttaFwjsb;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEmpLogin;
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
-import cn.timer.api.bean.qyzx.QyzxFeebackAccessory;
 import cn.timer.api.bean.qyzx.QyzxInvoiceUsual;
 import cn.timer.api.bean.qyzx.QyzxLogBuy;
 import cn.timer.api.bean.qyzx.QyzxOperLog;
 import cn.timer.api.bean.qyzx.QyzxPayServe;
 import cn.timer.api.bean.qyzx.QyzxSuggestionFeeback;
-import cn.timer.api.bean.spmk.SpmkApproveSummary;
 import cn.timer.api.bean.zzgl.ZzglAuth;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;
 import cn.timer.api.config.annotation.CurrentUser;
@@ -44,25 +42,20 @@ import cn.timer.api.config.annotation.UserBean;
 import cn.timer.api.config.enums.CommonEnum;
 import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpLoginMapper;
-import cn.timer.api.dao.qyzx.QyzxEntAuthMapper;
 import cn.timer.api.dao.qyzx.QyzxEntInfoMMapper;
-import cn.timer.api.dao.qyzx.QyzxFeebackAccessoryMapper;
 import cn.timer.api.dao.qyzx.QyzxInvoiceUsualMapper;
 import cn.timer.api.dao.qyzx.QyzxLogBuyMapper;
 import cn.timer.api.dao.qyzx.QyzxOperLogMapper;
 import cn.timer.api.dao.qyzx.QyzxPayServeMapper;
-import cn.timer.api.dao.qyzx.QyzxSuggestionFeebackMapper;
 import cn.timer.api.dao.zzgl.ZzglBmgwMMapper;
 import cn.timer.api.dto.login.QysDto;
 import cn.timer.api.dto.qyzx.AdminListDto;
 import cn.timer.api.dto.qyzx.AttaFpglQueryDto;
 import cn.timer.api.dto.qyzx.EntauthDto;
-import cn.timer.api.dto.qyzx.FeebackDto;
 import cn.timer.api.dto.qyzx.LogBuyDto;
 import cn.timer.api.dto.qyzx.QyzxOperLogQuaryDto;
 import cn.timer.api.utils.Result;
 import cn.timer.api.utils.ResultUtil;
-import cn.timer.api.utils.aliyun.OSSUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -88,21 +81,12 @@ public class QyzxController {
 	private QyzxLogBuyMapper qyzxLogBuyMapper;
 	@Autowired
-	private QyzxEntAuthMapper qyzxEntAuthMapper;
-	@Autowired
 	private ZzglBmgwMMapper zzglBmgwMMapper;
 	@Autowired
 	private QyzxPayServeMapper qyzxPayServeMapper;
 	@Autowired
-	private QyzxSuggestionFeebackMapper qyzxSuggestionFeebackMapper;
-	@Autowired
-	private QyzxFeebackAccessoryMapper qyzxFeebackAccessoryMapper;
-	@Autowired
 	private QyzxInvoiceUsualMapper qyzxInvoiceUsualMapper;
 	/**
@@ -130,11 +114,10 @@ public class QyzxController {
 	@ApiOperation(value = "添加/修改企业信息", httpMethod = "POST", notes = "接口发布说明")
 	public Result<QyzxEntInfoM> addent(@CurrentUser UserBean userBean, @RequestBody QyzxEntInfoM qyzxEntInfoM) {
 		qyzxEntInfoM.setId(userBean.getOrgCode());
 		QyzxEntInfoM q = new LambdaQueryChainWrapper<QyzxEntInfoM>(qyzxEntInfoMMapper)
 				.eq(QyzxEntInfoM::getId, userBean.getOrgCode()).one();
 		qyzxEntInfoM.setRegisterTime(q.getRegisterTime());
 		qyzxEntInfoM.insertOrUpdate();
@@ -227,12 +210,11 @@ public class QyzxController {
 	 * @param QyzxInvoiceUsual
 	 * @return
 	 */
-	@SuppressWarnings("deprecation")
 	@GetMapping(value = "/invoiceusual")
 	@ApiOperation(value = "显示常用的企业开票资料", httpMethod = "GET", notes = "接口发布说明")
 	public Result<QyzxInvoiceUsual> invoiceusual(@CurrentUser UserBean userBean) {
-		QyzxInvoiceUsual one = qyzxInvoiceUsualMapper.selectOne(new QueryWrapper<QyzxInvoiceUsual>().lambda()
+		QyzxInvoiceUsual one = qyzxInvoiceUsualMapper.selectOne(
-				.eq(QyzxInvoiceUsual::getOrgCode, userBean.getOrgCode()));
+				new QueryWrapper<QyzxInvoiceUsual>().lambda().eq(QyzxInvoiceUsual::getOrgCode, userBean.getOrgCode()));
 		if (one != null) {
 			if (one.getShippingArea() == null) {
 				one.setShippingArea("");
@@ -283,7 +265,7 @@ public class QyzxController {
 	 * @return
 	 */
 	@GetMapping(value = "/entlist")
-	@ApiOperation(value = "企业列表", httpMethod = "GET", notes = "接口发布说明", position = 98)
+	@ApiOperation(value = "企业列表", httpMethod = "GET", notes = "接口发布说明")
 	public Result<List<QyzxEntInfoM>> entlist1(@CurrentUser UserBean userBean) {
 		Integer empNum = userBean.getEmpNum();
 		QueryWrapper<QyzxEmpEntAsso> queryWrapper = new QueryWrapper<>();
@@ -301,7 +283,7 @@ public class QyzxController {
 	 * @return
 	 */
 	@GetMapping(value = "/changeent/{orgCode}")
-	@ApiOperation(value = "切换企业", httpMethod = "GET", notes = "接口发布说明", position = 97)
+	@ApiOperation(value = "切换企业", httpMethod = "GET", notes = "接口发布说明")
 	public Result<List<String>> changeent(@CurrentUser UserBean userBean, @PathVariable Integer orgCode) {
 		// 查询该员工加入的企业id列表
 		QyzxEmpLogin emp = userBean.getQyzxEmpLogin();
@@ -309,7 +291,11 @@ public class QyzxController {
 		// 判断 切换目标企业id 是否包含在 企业id列表 内
 		if (s != null) {
 			List<String> menus = new ArrayList<>();
-			QysDto ctrl = s.findFirst().get();
+			QysDto ctrl = s.findFirst().orElse(null);
+			if (ctrl == null) {
+				return ResultUtil.data(menus, "你不是该企业的用户!");
+			}
 			if (CommonEnum.U_TYPE_ADMIN.getType().equals(ctrl.getUserType())
 					|| CommonEnum.U_TYPE_C_ADMIN.getType().equals(ctrl.getUserType())) {
 			} else {
@@ -317,9 +303,10 @@ public class QyzxController {
 				ArrayList<Integer> list = new ArrayList<Integer>();
 //				List<ZzglBmgwM> zzglBmgwMs = new LambdaQueryChainWrapper<ZzglBmgwM>(zzglBmgwMMapper)
 //						.eq(ZzglBmgwM::getOrgCode, ctrl.getId()).list();
-				List<ZzglBmgwM> zzglBmgwMs = zzglBmgwMMapper.selectList(new QueryWrapper<ZzglBmgwM>().lambda().eq(ZzglBmgwM::getOrgCode, ctrl.getId()));
+				List<ZzglBmgwM> zzglBmgwMs = zzglBmgwMMapper
+						.selectList(new QueryWrapper<ZzglBmgwM>().lambda().eq(ZzglBmgwM::getOrgCode, ctrl.getId()));
 				// 传入的部门岗位是登录者的岗位id.获取的list中只有一个元素,不必要
 				ZzglBmgwM.getupDepts(list, ctrl.getBmgwId(), zzglBmgwMs);
 				if (list != null && list.size() > 0) {
@@ -340,9 +327,6 @@ public class QyzxController {
 		}
 	}
-	@Autowired
-	private OSSUtil oss;
 	// 下载系统使用手册 直接提供（OSS公共读权限文件）url地址到前端按钮
 	/**
 	 * 意见反馈
@@ -371,25 +355,46 @@ public class QyzxController {
 	 * QyzxFeebackAccessory.builder().feebackId(feeback.getId()).opinionUrl(
 	 * opinionUrl).build().insert(); } } return ResultUtil.success("意见反馈成功！"); }
 	 */
+//	/**
+//	 * 意见反馈2
+//	 */
+//	@PostMapping(value = "/feedback")
+//	@ApiOperation(value = "意见反馈", httpMethod = "POST", notes = "接口发布说明")
+//	public Result<String> feedback(@CurrentUser UserBean userBean, @RequestBody FeebackDto feebackDto) {
+//		String opinionText = feebackDto.getOpinionText();
+//		List<String> urlList = feebackDto.getUrlList();
+//		QyzxSuggestionFeeback qs = QyzxSuggestionFeeback.builder().orgCode(userBean.getOrgCode()).empNum(userBean.getEmpNum()).opinionText(opinionText).bugType(1).createTime(new Date()).build();
+//		
+//		boolean tof = qs.insert();
+//		Integer feebackId = qs.getId();
+//		if (tof) {
+//			for (String str : urlList) {
+//				QyzxFeebackAccessory.builder().feebackId(feebackId).opinionUrl(str).build().insert();
+//			}
+//			return ResultUtil.data("意见反馈成功！");
+//		}
+//
+//		return ResultUtil.data("意见反馈失败！");
+//	}
 	/**
-	 * 意见反馈2
+	 * 意见反馈
 	 */
 	@PostMapping(value = "/feedback")
 	@ApiOperation(value = "意见反馈", httpMethod = "POST", notes = "接口发布说明")
-	public Result<String> feedback(@CurrentUser UserBean userBean, @RequestBody FeebackDto feebackDto) {
+	public Result<String> feedback(@CurrentUser UserBean userBean,
-		String opinionText = feebackDto.getOpinionText();
+			@RequestBody QyzxSuggestionFeeback qyzxSuggestionFeeback) {
-		List<String> urlList = feebackDto.getUrlList();
-		QyzxSuggestionFeeback qs = QyzxSuggestionFeeback.builder().orgCode(userBean.getOrgCode()).empNum(userBean.getEmpNum()).opinionText(opinionText).bugType(1).createTime(new Date()).build();
+		if (!ObjectUtil.isAllNotEmpty(qyzxSuggestionFeeback.getOpinionText(), qyzxSuggestionFeeback.getUrl(),
+				qyzxSuggestionFeeback.getPersonalContact()))
-		boolean tof = qs.insert();
+			return ResultUtil.error("请完善意见信息！");
-		Integer feebackId = qs.getId();
-		if (tof) {
+		qyzxSuggestionFeeback.setCreateTime(new Date());
-			for (String str : urlList) {
+		qyzxSuggestionFeeback.setEmpNum(userBean.getEmpNum());
-				QyzxFeebackAccessory.builder().feebackId(feebackId).opinionUrl(str).build().insert();
+		qyzxSuggestionFeeback.setOrgCode(userBean.getOrgCode());
-			}
+		if (qyzxSuggestionFeeback.insert()) {
 			return ResultUtil.data("意见反馈成功！");
 		}
 		return ResultUtil.data("意见反馈失败！");
 	}
@@ -513,10 +518,10 @@ public class QyzxController {
 		IPage<AdminListDto> page1 = new Page<AdminListDto>(page, limit);
 		return ResultUtil.data(page1, qyzxEmpEntAssoMapper.adminlist(page1, userBean.getOrgCode()), "获取账号");
 	}
 	@Autowired
 	private QyzxOperLogMapper qyzxOperLogMapper;
 	/**
 	 * 查询-操作日志
 	 * 
@@ -525,18 +530,19 @@ public class QyzxController {
 	 */
 	@PostMapping(value = "/select_oper_log")
 	@ApiOperation(value = "查询-操作日志", httpMethod = "POST", notes = "查询-操作日志")
-	public Result<Object> selectOperLog(@CurrentUser UserBean userBean,@RequestBody QyzxOperLogQuaryDto qyzxOperLogQuaryDto) {
+	public Result<Object> selectOperLog(@CurrentUser UserBean userBean,
+			@RequestBody QyzxOperLogQuaryDto qyzxOperLogQuaryDto) {
 		IPage<QyzxOperLog> page = new Page<QyzxOperLog>(
 				qyzxOperLogQuaryDto.getCurrentPage() == null ? 1 : qyzxOperLogQuaryDto.getCurrentPage(),
-						qyzxOperLogQuaryDto.getTotalPage() == null ? 10 : qyzxOperLogQuaryDto.getTotalPage());
+				qyzxOperLogQuaryDto.getTotalPage() == null ? 10 : qyzxOperLogQuaryDto.getTotalPage());
 		qyzxOperLogQuaryDto.setOrgCode(userBean.getOrgCode());
 		IPage<QyzxOperLog> pages = qyzxOperLogMapper.selectPageByQuery(page, qyzxOperLogQuaryDto);
 		List<QyzxOperLog> listOl = pages.getRecords();
 		return ResultUtil.data(pages, listOl, "操作成功!");
 	}
 	/**
 	 * 删除-操作日志
 	 * 
@@ -545,11 +551,11 @@ public class QyzxController {
 	 */
 	@DeleteMapping(value = "/delete_oper_log")
 	@ApiOperation(value = "删除-操作日志", httpMethod = "DELETE", notes = "查询-操作日志")
-	public Result<Object> deleteOperLog(@CurrentUser UserBean userBean,@RequestBody Integer[] ids) {
+	public Result<Object> deleteOperLog(@CurrentUser UserBean userBean, @RequestBody Integer[] ids) {
 		ArrayList<Integer> list = CollUtil.toList(ids);
 		int delCount = qyzxOperLogMapper.deleteBatchIds(list);
 		return ResultUtil.data(delCount, "操作成功!");
 	}

--- a/src/main/java/cn/timer/api/controller/yggl/YgglController.java
+++ b/src/main/java/cn/timer/api/controller/yggl/YgglController.java
@@ -51,8 +51,8 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
 import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import cn.timer.api.bean.clazz.CommonArea;
 import cn.timer.api.bean.clazz.SysRegion;
@@ -364,12 +364,17 @@ public class YgglController {
 		Integer zjType = addygdaDto.getZjType();
 		String zjNum = addygdaDto.getZjNum();
 		Integer jobType = addygdaDto.getJobType();
-		Date rzTime = new Date();
+		Date rzTime = addygdaDto.getRzTime();
 		Integer syq = addygdaDto.getSyq();
 		Integer sex = addygdaDto.getSex();
+		Integer bmgwId = addygdaDto.getBmgwId();
 		if (StrUtil.hasBlank(phone) || StrUtil.hasBlank(name) || StrUtil.hasBlank(zjNum)) {
 			return ResultUtil.error("请输入员工姓名,手机号和身份证号");
 		}
+		if (!ObjectUtil.isAllNotEmpty(name,phone,zjType,zjNum,jobType,rzTime,syq,bmgwId,sex)) {
+			return ResultUtil.error("请完善员工信息！");
+		}
 		QyzxEmpLogin login = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
 				.eq(!StrUtil.hasBlank(phone), QyzxEmpLogin::getPhone, phone).one();
 		if (login == null) {
@@ -425,7 +430,7 @@ public class YgglController {
 				QyzxEmpEntAsso.builder()
 				.empNum(login.getId())
 				.orgCode(orgCode)
-				.userType(2)
+				.userType(CommonEnum.U_TYPE_EMP.getType())
 				.status(1)
 				.build()
 				.insert();// usertype2普通员工
@@ -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正常
 				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)
@@ -630,7 +635,7 @@ public class YgglController {
 						.eq("phone", e.getPhone()).eq("org_code", userBean.getOrgCode()));
 				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正常
 					YgglMainEmp emp = YgglMainEmp.builder().name(e.getName()).phone(e.getPhone()).zjType(0)
 							.zjNum(e.getZj()).jobType(jobType).rzTime(rzdate).updateTime(new Date())

--- a/src/main/java/cn/timer/api/dao/qyzx/QyzxEmpEntAssoMapper.java
+++ b/src/main/java/cn/timer/api/dao/qyzx/QyzxEmpEntAssoMapper.java
 package cn.timer.api.dao.qyzx;
-import org.springframework.stereotype.Repository;
 import java.util.List;
+import org.springframework.stereotype.Repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
-import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.dto.qyzx.AdminListDto;
 /**

--- a/src/main/java/cn/timer/api/dao/qyzx/QyzxFeebackAccessoryMapper.java
+++ b/src/main/java/cn/timer/api/dao/qyzx/QyzxFeebackAccessoryMapper.java
-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> {
-}
--- a/src/main/java/cn/timer/api/dto/qyzx/EntauthDto.java
+++ b/src/main/java/cn/timer/api/dto/qyzx/EntauthDto.java
@@ -7,7 +7,6 @@ package cn.timer.api.dto.qyzx;
 import java.io.Serializable;
-import cn.timer.api.config.swagger.IgnoreSwaggerParameter;
 import cn.timer.api.utils.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

--- a/src/main/java/cn/timer/api/dto/qyzx/FeebackDto.java
+++ b/src/main/java/cn/timer/api/dto/qyzx/FeebackDto.java
-/**
- * @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;
-}
--- a/src/main/java/cn/timer/api/dto/qyzx/QyzxOperLogQuaryDto.java
+++ b/src/main/java/cn/timer/api/dto/qyzx/QyzxOperLogQuaryDto.java
 package cn.timer.api.dto.qyzx;
-import cn.timer.api.dto.spmk.MySummaryQueryDto;
 import cn.timer.api.utils.Page;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

--- a/src/main/java/cn/timer/api/dto/yggl/AddygdaDto.java
+++ b/src/main/java/cn/timer/api/dto/yggl/AddygdaDto.java
@@ -9,7 +9,6 @@ import java.io.Serializable;
 import java.util.Date;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import cn.timer.api.config.exception.ValidationMsg;