小范围修改

src/main/java/cn/timer/api/bean/qyzx/QyzxFeebackAccessory.java

 package cn.timer.api.bean.qyzx;
 package cn.timer.api.bean.qyzx;
 
 
+
+
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 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 cn.timer.api.bean.qyzx.QyzxEmpLogin.QyzxEmpLoginBuilder;
 import cn.timer.api.dto.login.QysDto;
 import cn.timer.api.dto.login.QysDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,10 +25,12 @@ 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_feeback_accessory")
 @ApiModel("反馈附件表")
 @ApiModel("反馈附件表")
 public class QyzxFeebackAccessory extends Model<QyzxFeebackAccessory> {
 public class QyzxFeebackAccessory extends Model<QyzxFeebackAccessory> {
 
 

src/main/java/cn/timer/api/bean/qyzx/QyzxSuggestionFeeback.java

 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 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;
@@ -16,10 +19,12 @@ 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")
 @ApiModel("意见反馈表")
 @ApiModel("意见反馈表")
 public class QyzxSuggestionFeeback extends Model<QyzxSuggestionFeeback> {
 public class QyzxSuggestionFeeback extends Model<QyzxSuggestionFeeback> {
 
 

src/main/java/cn/timer/api/config/enums/Regular.java

@@ -40,7 +40,9 @@ public enum Regular {
 	 * 强密码
 	 * 强密码
 	 */
 	 */
 	SHPW("SHPW","^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,10}$"),
 	SHPW("SHPW","^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z])[a-zA-Z0-9]{8,10}$"),
-	//纯汉字输入
+	/**
+	 * 纯汉字输入
+	 */
 	CHINESE("CHINESE","[\\u4E00-\\u9FA5]*"),
 	CHINESE("CHINESE","[\\u4E00-\\u9FA5]*"),
 	/**
 	/**
 	 * 邮箱
 	 * 邮箱

src/main/java/cn/timer/api/controller/LoginController.java

@@ -28,6 +28,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEmpLogin;
 import cn.timer.api.bean.qyzx.QyzxEmpLogin;
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
+
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.zzgl.ZzglAuth;
 import cn.timer.api.bean.zzgl.ZzglAuth;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;
 import cn.timer.api.bean.zzgl.ZzglBmgwM;

src/main/java/cn/timer/api/controller/dzht/DzhtController.java

@@ -36,6 +36,7 @@ import cn.timer.api.bean.dzht.DzhtAssoHtwj;
 import cn.timer.api.bean.dzht.DzhtAssoQyrz;
 import cn.timer.api.bean.dzht.DzhtAssoQyrz;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
+
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.UserBean;
 import cn.timer.api.config.annotation.UserBean;

src/main/java/cn/timer/api/controller/qyzx/QyzxController.java

@@ -447,11 +447,14 @@ public class QyzxController {
 	 * 意见反馈
 	 * 意见反馈
 	 */
 	 */
 	@PostMapping(value = "/feedback")
 	@PostMapping(value = "/feedback")
-	@ApiOperation(value = "意见反馈)", httpMethod = "POST", notes = "接口发布说明")
-	public Result<QyzxLogBuy> feedback(@CurrentUser UserBean userBean, @RequestParam(required = false) String moudle,
-			@RequestParam(required = false) String opinionText,@Param("files") List<MultipartFile> files) {
+	@ApiOperation(value = "意见反馈", httpMethod = "POST", notes = "接口发布说明")
+	public Result<QyzxSuggestionFeeback> feedback(@CurrentUser UserBean userBean, 
+			@RequestParam(required = false) String opinionText,
+			@RequestParam(required = false) String moudle,
+			@Param("files") List<MultipartFile> files) {
 		String url = null;
 		String url = null;
 		List<String> list = new ArrayList<String>();
 		List<String> list = new ArrayList<String>();
+		if (files!=null) {
 			for (MultipartFile file : files) {
 			for (MultipartFile file : files) {
 				String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" + file.getOriginalFilename();
 				String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" + file.getOriginalFilename();
 				if (file == null || file.getSize() <= 0) {
 				if (file == null || file.getSize() <= 0) {
@@ -465,6 +468,7 @@ public class QyzxController {
 					}
 					}
 				}
 				}
 			}
 			}
+		}
 		QyzxSuggestionFeeback feeback = new QyzxSuggestionFeeback();
 		QyzxSuggestionFeeback feeback = new QyzxSuggestionFeeback();
 		feeback.setEmpNum(userBean.getEmpNum());
 		feeback.setEmpNum(userBean.getEmpNum());
 		feeback.setOpinionText(opinionText);
 		feeback.setOpinionText(opinionText);
@@ -589,13 +593,13 @@ public class QyzxController {
 	}
 	}
 
 
 	/**
 	/**
-	 * 添加/修改企业
+	 * 添加/修改企业信息
 	 * 
 	 * 
 	 * @param
 	 * @param
 	 * @return
 	 * @return
 	 */
 	 */
 	@PostMapping(value = "/ent")
 	@PostMapping(value = "/ent")
-	@ApiOperation(value = "添加/修改企业", httpMethod = "POST", notes = "接口发布说明")
+	@ApiOperation(value = "添加/修改企业信息", httpMethod = "POST", notes = "接口发布说明")
 	public Result<QyzxEntInfoM> addent(@CurrentUser UserBean userBean, @RequestBody QyzxEntInfoM qyzxEntInfoM) {
 	public Result<QyzxEntInfoM> addent(@CurrentUser UserBean userBean, @RequestBody QyzxEntInfoM qyzxEntInfoM) {
 		qyzxEntInfoM.insertOrUpdate();
 		qyzxEntInfoM.insertOrUpdate();
 		Integer count = qyzxEmpEntAssoMapper.selectCount(new QueryWrapper<QyzxEmpEntAsso>()
 		Integer count = qyzxEmpEntAssoMapper.selectCount(new QueryWrapper<QyzxEmpEntAsso>()

src/main/java/cn/timer/api/dao/qyzx/QyzxEntInfoMMapper.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
 
 
+
+
+
 /**
 /**
 *  企业信息
 *  企业信息
 * @author Tang 2019-11-11
 * @author Tang 2019-11-11

src/main/java/cn/timer/api/dao/qyzx/QyzxFeebackAccessoryMapper.java

@@ -5,12 +5,14 @@ import org.springframework.stereotype.Repository;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
+import cn.timer.api.bean.qyzx.QyzxFeebackAccessory;
+
 /**
 /**
 *  员工企业关联表
 *  员工企业关联表
 * @author Tang 2019-11-11
 * @author Tang 2019-11-11
 */
 */
 @Repository
 @Repository
-public interface QyzxFeebackAccessoryMapper extends BaseMapper<QyzxFeebackAccessoryMapper> {
+public interface QyzxFeebackAccessoryMapper extends BaseMapper<QyzxFeebackAccessory> {
 
 
     
     
 }
 }

src/main/java/cn/timer/api/dao/qyzx/QyzxSuggestionFeebackMapper.java

@@ -5,12 +5,14 @@ import org.springframework.stereotype.Repository;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 
+import cn.timer.api.bean.qyzx.QyzxSuggestionFeeback;
+
 /**
 /**
 *  员工企业关联表
 *  员工企业关联表
 * @author Tang 2019-11-11
 * @author Tang 2019-11-11
 */
 */
 @Repository
 @Repository
-public interface QyzxSuggestionFeebackMapper extends BaseMapper<QyzxSuggestionFeebackMapper> {
+public interface QyzxSuggestionFeebackMapper extends BaseMapper<QyzxSuggestionFeeback> {
 
 
     
     
 }
 }