Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc

pom.xml

@@ -102,11 +102,11 @@
 		</dependency>
 
 		<!-- optional这个需要为 true 热部署才有效 -->
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
 			<optional>true</optional>
-		</dependency>
+		</dependency> -->
 
 		<!-- swagger2 -->
 		<dependency>
@@ -272,7 +272,7 @@
 			<version>1.1.10</version>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter -->
+		<!-- mybatis-plus -->
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>

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

@@ -37,28 +37,34 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
 	@Id
     @GeneratedValue
     @TableId (type = IdType.AUTO)
-	@ApiModelProperty(value="组织机构代码  组织机构代码",example="101")
+	@ApiModelProperty(value="组织机构代码  组织机构代码",example="4")
     private Integer id;
     
-	@ApiModelProperty(value="企业名称 ",example="企业名称")
+	@ApiModelProperty(value="企业名称 ",example="优领人才")
     private String name;
+	
+	@ApiModelProperty(value="认证名 ",example="广东优领人才科技服务有限公司")
+    private String attestName;
     
-	@ApiModelProperty(value="企业简介 企业简介",example="101")
+	@ApiModelProperty(value="简介",example="公司福利好")
     private String intro;
     
 	@ApiModelProperty(value="法人 ",example="刘德华")
     private String operName;
     
-	@ApiModelProperty(value="企业规模  10人以下、10-19人、20-99人、100-500人、500人以上",example="101")
+	@ApiModelProperty(value="企业规模  10人以下、10-19人、20-99人、100-500人、500人以上",example="3")
     private Integer size;
     
 	@ApiModelProperty(value="电话号码 ",example="18712345678")
     private String phone;
+	
+	@ApiModelProperty(value="所在地区",example="440111")
+    private Integer area;
     
-	@ApiModelProperty(value="办公地址 ",example=" 省/市/区 例：广东省/广州市/白云区")
+	@ApiModelProperty(value="办公地址 ",example="广从一路5号柏曼酒店3楼")
     private String workAddress;
     
-	@ApiModelProperty(value="企业编码 ",example=" 例：YLZYCS（YL：优领简写；ZY：版本；CS：账户公司简称）")
+	@ApiModelProperty(value="企业简写 ",example=" 例：YLZYCS（YL：优领简写；ZY：版本；CS：账户公司简称）")
     private String codes;
     
 	@ApiModelProperty(value="企业LOGO ",example="企业LOGO")
@@ -70,13 +76,13 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
 	@ApiModelProperty(value="开通渠道  1直属、2总代理、3独家代理、4一般代理商、5区域代理商",example="101")
     private Integer openChannel;
     
-	@ApiModelProperty(value="联系人 ",example="刘德华")
+	@ApiModelProperty(value="联系人",example="刘德华")
     private String linkMan;
     
 	@ApiModelProperty(value="联系人电话 ",example="18712345678")
     private String linkManPhone;
     
-	@ApiModelProperty(value="统一社会信用代码 ",example=" 统一社会信用代码")
+	@ApiModelProperty(value="统一社会信用代码 ",example="统一社会信用代码")
     private String creditCode;
     
 	@ApiModelProperty(value="是否上市  0:否 1:是",example="101")
@@ -86,7 +92,16 @@ public class QyzxEntInfoM extends Model<QyzxEntInfoM> {
 	@ApiModelProperty(value="企业注册时间 ",example="企业注册时间")
     private Date registerTime;
 	
-	@ApiModelProperty(value="到期时间 ",example="到期时间")
+	@ApiModelProperty(value="营业执照 ",example="营业执照url ")
+    private String licenseUrl;
+	
+	@ApiModelProperty(value="认证状态 ",example="0未认证，1 认证中，2认证成功，3认证失败 ")
+    private Integer attestStatus;
+	
+	@ApiModelProperty(value="认证时间 ",example="2019-12-12 08:00:00")
+    private Date attestTime;
+	
+	@ApiModelProperty(value="到期时间 ",example="2039-12-12 08:00:00")
 	private Date endTime;
 	
 	@ApiModelProperty(value="企业版本，0试用,1标准,2专业, ",example="0")

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

 package cn.timer.api.bean.qyzx;
 
+
+
 import java.util.ArrayList;
 import java.util.Date;
 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.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
+import cn.timer.api.bean.qyzx.QyzxEmpLogin.QyzxEmpLoginBuilder;
 import cn.timer.api.dto.login.QysDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,10 +25,12 @@ 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> {
 

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

+/**  
+* <p>Title: QyzxInvoiceData.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+package cn.timer.api.bean.qyzx;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+/**  
+* <p>Title: QyzxInvoiceData.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/
+
+@Entity
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Table(name="qyzx_invoice_data")
+@ApiModel("发票资料表")
+public class QyzxInvoiceUsual extends Model<QyzxInvoiceUsual>{
+
+	private static final long serialVersionUID = 2890357568571822258L;
+	
+	@Id
+	@GeneratedValue
+	@TableId (type = IdType.AUTO)
+	@ApiModelProperty(value="主键",example="1")
+	private Integer id;
+
+	@ApiModelProperty(value="发票抬头",example="广东优领")
+    private String invoiceTitle;
+	
+	@ApiModelProperty(value="税号",example="915345164")
+	private String dutyParagraph;
+	
+	@ApiModelProperty(value="公司地址",example="广东省")
+	private String companyAddress;
+	
+	@ApiModelProperty(value="电话号码",example="18152456464")
+	private String companyPhone;
+	
+	@ApiModelProperty(value="开户行",example="中信银行广州白云支行")
+	private String bankName;
+	
+	@ApiModelProperty(value="银行账号",example="8110901011900785029")
+	private String bankAccount;
+	
+	@ApiModelProperty(value="发票类型",example="0-普通 1-专用")
+	private Integer invoiceType;
+	
+	
+
+	@ApiModelProperty(value="收货人",example="翁🐻")
+	private String consignee;
+	
+	@ApiModelProperty(value="收货人电话",example="13144400255")
+	private String consigneePhone;
+	
+	@ApiModelProperty(value="邮箱",example="13144400255@163.com")
+	private String email;
+	
+	@ApiModelProperty(value="收货地址",example="白云东平伯曼酒店")
+	private String shippingAddress;
+	
+	@ApiModelProperty(value="邮编",example="510080")
+	private String zipCode;
+	
+	@ApiModelProperty(value="企业",example="117")
+    private Integer orgCode;
+	
+	@ApiModelProperty(value="模块状态",example="默认0-开启，1-关闭")
+    private Integer status;
+	
+	@ApiModelProperty(value="是否删除",example="默认0-未删除，1-删除")
+    private Integer isDelete;
+
+	@TableField(fill = FieldFill.INSERT)
+	@ApiModelProperty(value="创建时间 ",example="")
+	private Date createTime;
+
+	@ApiModelProperty(value="创建人 ",example="")
+	private Integer createUser;
+
+	@TableField(fill = FieldFill.UPDATE)
+	@ApiModelProperty(value="修改时间 ",example="")
+	private Date modifyTime;
+
+	@ApiModelProperty(value="修改人 ",example="")
+	private Integer modifyUser;
+}

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;
@@ -16,10 +19,12 @@ import lombok.NoArgsConstructor;
 /**
 * @author Tang 2019-11-11
 */
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder(toBuilder=true)
+@Table(name="qyzx_suggestion_feeback")
 @ApiModel("意见反馈表")
 public class QyzxSuggestionFeeback extends Model<QyzxSuggestionFeeback> {
 

src/main/java/cn/timer/api/bean/spmk/SpmkApproveExecuteRecord.java

 package cn.timer.api.bean.spmk;
 
 import java.util.Date;
+import java.util.List;
 
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
@@ -57,4 +58,6 @@ public class SpmkApproveExecuteRecord extends Model<SpmkApproveExecuteRecord> {
 	@ApiModelProperty(value = "创建时间 ", example = "创建时间")
 	private Date createTime;
 
+	private List<SpmkExecutor> spmkExecutors;
+	
 }
\ No newline at end of file

src/main/java/cn/timer/api/bean/spmk/SpmkApproveSummary.java

@@ -64,7 +64,7 @@ public class SpmkApproveSummary extends Model<SpmkApproveSummary> {
 	private String approveName;
 
 	@TableField(fill = FieldFill.INSERT)
-	@ApiModelProperty(value = "状态 0审批中 1审批撤销 2审批拒绝 3审批通过/审批完成", example = "101")
+	@ApiModelProperty(value = "状态 0审批中 1审批撤销  2审批通过/审批完成 3审批拒绝", example = "101")
 	private Integer sts;
 
 	@ApiModelProperty(value = "当前审批人 ", example = "当前审批人")

src/main/java/cn/timer/api/config/autofill/MyMetaObjectHandler.java

@@ -18,7 +18,11 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
 		log.info("start insert fill ....");
 		Date date = new Date();
 		this.strictInsertFill(metaObject, "createTime", Date.class, date); // 起始版本 3.3.0(推荐使用)
-		this.strictInsertFill(metaObject, "sts", Integer.class, 0); // 起始版本 3.3.0(推荐使用)
+		this.strictInsertFill(metaObject, "lrsjTime", Date.class, date);
+		this.strictInsertFill(metaObject, "regTime", Date.class, date);
+		this.strictInsertFill(metaObject, "registerTime", Date.class, date);
+		this.strictInsertFill(metaObject, "addtime", Date.class, date);
+		this.strictInsertFill(metaObject, "sts", int.class, 0); // 起始版本 3.3.0(推荐使用)
 
 	}
 
@@ -27,6 +31,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
 		log.info("start update fill ....");
 		Date date = new Date();
 		this.strictUpdateFill(metaObject, "updateTime", Date.class, date); // 起始版本 3.3.0(推荐使用)
+		this.strictUpdateFill(metaObject, "modifyTime", Date.class, date);
 	}
 	
 }

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

@@ -49,9 +49,10 @@ public enum CommonEnum {
 	/**
 	 * 企业认证状态
 	 */
-	AUTH_TYPE_UNDEREVIEW(1,"审核中"),
-	AUTH_TYPE_FAILURE(2,"审核失败"),
-	AUTH_TYPE_SUCCESS(3,"审核成功"),
+	AUTH_TYPE_NOHADREVIEW(0,"未认证"),
+	AUTH_TYPE_UNDEREVIEW(1,"认证中"),
+	AUTH_TYPE_SUCCESS(2,"认证成功"),
+	AUTH_TYPE_FAILURE(3,"认证失败"),
 	
 	
 	/**

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}$"),
-	//纯汉字输入
+	/**
+	 * 纯汉字输入
+	 */
 	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.QyzxEmpLogin;
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
+
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.bean.zzgl.ZzglAuth;
 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.qyzx.QyzxEmpEntAsso;
 import cn.timer.api.bean.qyzx.QyzxEntInfoM;
+
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.UserBean;

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

@@ -34,6 +34,7 @@ import cn.timer.api.bean.qyzx.QyzxEmpLogin;
 import cn.timer.api.bean.qyzx.QyzxEntAuth;
 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.QyzxPayServe;
 import cn.timer.api.bean.qyzx.QyzxSuggestionFeeback;
@@ -48,6 +49,7 @@ 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.QyzxPayServeMapper;
 import cn.timer.api.dao.qyzx.QyzxSuggestionFeebackMapper;
@@ -104,6 +106,9 @@ public class QyzxController {
 	
 	@Autowired
 	private QyzxFeebackAccessoryMapper qyzxFeebackAccessoryMapper;
+	
+	@Autowired
+	private QyzxInvoiceUsualMapper qyzxInvoiceUsualMapper;
 
 	/**
 	 * 获取企业信息
@@ -119,6 +124,23 @@ public class QyzxController {
 				.eq(orgCode != null, QyzxEntInfoM::getId, orgCode).one();
 		return ResultUtil.data(qyzxEntInfoM, "获取企业信息成功");
 	}
+	
+	/**
+	 * 添加/修改企业信息
+	 * 
+	 * @param
+	 * @return
+	 */
+	@PostMapping(value = "/ent")
+	@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();
+		
+		return ResultUtil.data(qyzxEntInfoM, "添加/修改企业");
+	}
 
 	/**
 	 * 企业认证-申请
@@ -128,14 +150,13 @@ public class QyzxController {
 	 */
 	@PostMapping(value = "/entauth")
 	@ApiOperation(value = "企业认证", httpMethod = "POST", notes = "接口发布说明")
-	public Result<QyzxEntAuth> entauth(@CurrentUser UserBean userBean, @RequestBody QyzxEntAuth qyzxEntAuth) {
+	public Result<QyzxEntInfoM> entauth(@CurrentUser UserBean userBean, @RequestBody QyzxEntInfoM qyzxEntInfoM) {
 		// 设置审核状态
-		qyzxEntAuth.setAuthType(CommonEnum.AUTH_TYPE_UNDEREVIEW.getType());
-		qyzxEntAuth.setId(userBean.getOrgCode());
-		// 插入数据
-		qyzxEntAuth.insert();
+		qyzxEntInfoM.setAttestStatus(CommonEnum.AUTH_TYPE_UNDEREVIEW.getType());
+		qyzxEntInfoM.setId(userBean.getOrgCode());
+		qyzxEntInfoM.updateById();
 		// }
-		return ResultUtil.data(qyzxEntAuth, "申请企业认证中");
+		return ResultUtil.data(qyzxEntInfoM, "申请企业认证中");
 	}
 
 	/**
@@ -144,44 +165,72 @@ public class QyzxController {
 	 * @param qyzxEntAuth
 	 * @return
 	 */
-	@PostMapping(value = "/entauthcheck")
-	@ApiOperation(value = "企业认证-审核-通过/未通过", httpMethod = "POST", notes = "接口发布说明")
-	public Result<QyzxEntAuth> entauthcheck1(@CurrentUser UserBean userBean, @RequestBody QyzxEntAuth qyzxEntAuth) {
-		Integer id = qyzxEntAuth.getId();
-		Integer authType = qyzxEntAuth.getAuthType();
-		if (id == null || authType == null) {
-			return ResultUtil.error("参数缺少/异常");
-		}
-		QyzxEntAuth entAuth = QyzxEntAuth.builder().id(id).authType(authType).build();
-		boolean b = entAuth.updateById();
-		if (b) {
-			return ResultUtil.data(qyzxEntAuth, "企业认证-审批成功");
-		} else {
-			return ResultUtil.error("企业认证-审批失败");
-		}
-	}
+	/*
+	 * @PostMapping(value = "/entauthcheck")
+	 * 
+	 * @ApiOperation(value = "企业认证-审核-通过/未通过", httpMethod = "POST", notes =
+	 * "接口发布说明") public Result<QyzxEntAuth> entauthcheck1(@CurrentUser UserBean
+	 * userBean, @RequestBody QyzxEntAuth qyzxEntAuth) { Integer id =
+	 * qyzxEntAuth.getId(); Integer authType = qyzxEntAuth.getAuthType(); if (id ==
+	 * null || authType == null) { return ResultUtil.error("参数缺少/异常"); } QyzxEntAuth
+	 * entAuth = QyzxEntAuth.builder().id(id).authType(authType).build(); boolean b
+	 * = entAuth.updateById(); if (b) { return ResultUtil.data(qyzxEntAuth,
+	 * "企业认证-审批成功"); } else { return ResultUtil.error("企业认证-审批失败"); } }
+	 */
 
 	/**
-	 * 运营管理 企业认证-审核-通过/不通过(weng)
-	 * 
-	 * @param qyzxEntAuth
-	 * @return
-	 */
+	* 运营管理 企业认证-审核-通过/不通过(weng)
+	* 
+	* @param qyzxEntAuth
+	* @return
+	*/
 	@PostMapping(value = "/entauthpass")
 	@ApiOperation(value = "企业认证-审核-通过", httpMethod = "POST", notes = "接口发布说明")
-	public Result<String> entauthpass(@RequestBody EntauthDto entauthDto) {// 2未通过,3通过
-		String msg = "企业认证不通过";
-		Integer type = entauthDto.getAuthType();
-		if (type != 2) {
-			type = 3;
-			msg = "企业认证成功";
+	public Result<String> entauthpass(@RequestBody EntauthDto entauthDto) {//2未通过,3通过 
+		String msg = "企业未认证"; 
+		Integer type = entauthDto.getAuthType(); 
+		if(type == CommonEnum.AUTH_TYPE_SUCCESS.getType()) {
+			msg = "企业认证成功"; 
+		}
+		if(type == CommonEnum.AUTH_TYPE_FAILURE.getType()) {
+			msg = "企业认证失败"; 
 		}
-		boolean b = new LambdaUpdateChainWrapper<QyzxEntAuth>(qyzxEntAuthMapper)
-				.eq(QyzxEntAuth::getId, entauthDto.getOrgCode()).set(QyzxEntAuth::getAuthType, type).update();
-		if (b) {
-			return ResultUtil.data(msg);
+		boolean b = new LambdaUpdateChainWrapper<QyzxEntInfoM>(qyzxEntInfoMMapper).eq(QyzxEntInfoM::getId, entauthDto.getOrgCode())
+				.set(QyzxEntInfoM::getAttestStatus, type).update();
+		if (b){
+			return ResultUtil.data(msg); 
+		} 
+		return ResultUtil.data("企业认证流程有误"); 
+	}
+	/**
+	* 新增/编辑常用企业开票资料
+	* 
+	* @param QyzxInvoiceUsual
+	* @return
+	*/
+	@PostMapping(value = "/invoiceusual")
+	@ApiOperation(value = "新增/编辑常用企业开票资料", httpMethod = "POST", notes = "接口发布说明")
+	public Result<QyzxInvoiceUsual> invoiceusual(@CurrentUser UserBean userBean,@RequestBody QyzxInvoiceUsual qyzxInvoiceUsual) {
+		qyzxInvoiceUsual.setOrgCode(userBean.getOrgCode());
+		qyzxInvoiceUsual.setModifyUser(userBean.getEmpNum());
+		boolean tof = qyzxInvoiceUsual.insertOrUpdate();
+		if (tof) {
+			return ResultUtil.data(qyzxInvoiceUsual, "常用企业开票资料已修改");
 		}
-		return ResultUtil.error("企业认证未通过");
+		return ResultUtil.error("开票资料修改无效");
+	}
+	/**
+	* 显示常用的企业开票资料
+	* 
+	* @param QyzxInvoiceUsual
+	* @return
+	*/
+	@SuppressWarnings("deprecation")
+	@GetMapping(value = "/invoiceusual")
+	@ApiOperation(value = "显示常用的企业开票资料", httpMethod = "GET", notes = "接口发布说明")
+	public Result<QyzxInvoiceUsual> invoiceusual(@CurrentUser UserBean userBean) {
+		QyzxInvoiceUsual one = new LambdaQueryChainWrapper<QyzxInvoiceUsual>(qyzxInvoiceUsualMapper).eq(QyzxInvoiceUsual::getOrgCode, userBean.getOrgCode()).one();
+		return ResultUtil.data(one, "企业超管头像和电话号码");
 	}
 
 	/**
@@ -447,21 +496,25 @@ public class QyzxController {
 	 * 意见反馈
 	 */
 	@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;
 		List<String> list = new ArrayList<String>();
-		for (MultipartFile file : files) {
-			String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" + file.getOriginalFilename();
-			if (file == null || file.getSize() <= 0) {
-				return ResultUtil.error("上传的文件为空，请重新选择！");
-			} else {
-				try {
-					url = OSSUtil.uploadFile(path, file.getInputStream());
-					list.add(url);
-				} catch (IOException e) {
-					e.printStackTrace();
+		if (files!=null) {
+			for (MultipartFile file : files) {
+				String path = "8timer2.0/" + userBean.getOrgCode() + "/" + moudle + "/" + file.getOriginalFilename();
+				if (file == null || file.getSize() <= 0) {
+					return ResultUtil.error("上传的文件为空，请重新选择！");
+				} else {
+					try {
+						url = OSSUtil.uploadFile(path, file.getInputStream());
+						list.add(url);
+					} catch (IOException e) {
+						e.printStackTrace();
+					}
 				}
 			}
 		}
@@ -588,26 +641,7 @@ public class QyzxController {
 		return ResultUtil.data(page, logBuyDto, "查询成功");
 	}
 
-	/**
-	 * 添加/修改企业
-	 * 
-	 * @param
-	 * @return
-	 */
-	@PostMapping(value = "/ent")
-	@ApiOperation(value = "添加/修改企业", httpMethod = "POST", notes = "接口发布说明")
-	public Result<QyzxEntInfoM> addent(@CurrentUser UserBean userBean, @RequestBody QyzxEntInfoM qyzxEntInfoM) {
-		qyzxEntInfoM.insertOrUpdate();
-		Integer count = qyzxEmpEntAssoMapper.selectCount(new QueryWrapper<QyzxEmpEntAsso>()
-				.eq("emp_num", userBean.getEmpNum()).eq("org_code", qyzxEntInfoM.getId()));
-		if (count == null || count <= 0)
-			QyzxEmpEntAsso.builder().empNum(userBean.getEmpNum()).orgCode(qyzxEntInfoM.getId()).userType(1).status(1)
-					.build().insert();
-		// 添加关联表
-		QyzxEmpEntAsso.builder().empNum(userBean.getEmpNum()).orgCode(qyzxEntInfoM.getId()).userType(1).build()
-				.insertOrUpdate();
-		return ResultUtil.data(qyzxEntInfoM, "添加/修改企业");
-	}
+	
 
 	/**
 	 * 账号管理 获取账号

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;
 
+
+
+
 /**
 *  企业信息
 * @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 cn.timer.api.bean.qyzx.QyzxFeebackAccessory;
+
 /**
 *  员工企业关联表
 * @author Tang 2019-11-11
 */
 @Repository
-public interface QyzxFeebackAccessoryMapper extends BaseMapper<QyzxFeebackAccessoryMapper> {
+public interface QyzxFeebackAccessoryMapper extends BaseMapper<QyzxFeebackAccessory> {
 
     
 }

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

+/**  
+* <p>Title: QyzxInvoiceDataMapper.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/  
+package cn.timer.api.dao.qyzx;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import cn.timer.api.bean.qyzx.QyzxInvoiceUsual;
+
+/**  
+* <p>Title: QyzxInvoiceDataMapper.java</p>  
+* <p>Description: </p>  
+* @author dsc  
+* @date 2020年4月21日  
+* @version 1.0  
+*/
+public interface QyzxInvoiceUsualMapper extends BaseMapper<QyzxInvoiceUsual>{
+
+}

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 cn.timer.api.bean.qyzx.QyzxSuggestionFeeback;
+
 /**
 *  员工企业关联表
 * @author Tang 2019-11-11
 */
 @Repository
-public interface QyzxSuggestionFeebackMapper extends BaseMapper<QyzxSuggestionFeebackMapper> {
+public interface QyzxSuggestionFeebackMapper extends BaseMapper<QyzxSuggestionFeeback> {
 
     
 }

src/main/java/cn/timer/api/dto/qyzx/EntauthDto.java

@@ -31,7 +31,7 @@ public class EntauthDto extends Page implements Serializable{
 	@ApiModelProperty(value="组织机构代码",example="117")
 	private Integer orgCode;
 	
-	@ApiModelProperty(value="认证状态",example="2未通过或3通过")
+	@ApiModelProperty(value="认证状态",example="2通过或3未通过")
 	private Integer authType;
 	
 	

src/main/java/cn/timer/api/dto/spmk/ApprovingDto.java

+package cn.timer.api.dto.spmk;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import cn.hutool.json.JSONObject;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ApprovingDto {
+	
+	@ApiModelProperty(value = "审批汇总id", example = "2")
+	private Integer asId;
+	
+	@ApiModelProperty(value = "审批执行记录id", example = "10")
+	private Integer executeRecordId;
+	
+	@ApiModelProperty(value = "执行人记录id", example = "10")
+	private Integer executorId;
+	
+	@ApiModelProperty(value = "意见", example = "MMMMMMMM")
+	private String opinion;
+	
+	@ApiModelProperty(value = "状态 2同意 3拒绝", example = "2")
+	private Integer sts;
+	
+}

src/main/java/cn/timer/api/dto/spmk/Condition.java

 package cn.timer.api.dto.spmk;
 
 import java.io.Serializable;
+import java.util.List;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -18,10 +19,14 @@ public class Condition implements Serializable {
 	 */
 	private static final long serialVersionUID = 1L;
 
+	private String className;
+	
+	private String displayName;
+	
 	private String key;
 
 	private String format;
-
-	private String value;
+	
+	private List<String> values;
 
 }

src/main/java/cn/timer/api/dto/spmk/Router.java

@@ -55,4 +55,9 @@ public class Router extends JSONSupport implements Serializable{
 	 */
 	private List<Router> children;
 	
+	/**
+	 * 名称
+	 */
+	private String name;
+	
 }

src/main/java/cn/timer/api/dto/spmk/SpmkApprovalGDto.java

 package cn.timer.api.dto.spmk;
 
+import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
-import javax.persistence.Entity;
-
-import cn.timer.api.bean.spmk.SpmkApprovalG;
+import cn.hutool.json.JSONObject;
 import cn.timer.api.bean.spmk.SpmkCustomApproval;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SpmkApprovalGDto extends SpmkApprovalG {
+public class SpmkApprovalGDto implements Serializable {
 
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "编号 编号", example = "101")
+	private Integer id;
+
+	@ApiModelProperty(value = "企业组织代码 企业组织代码", example = "101")
+	private Integer orgCode;
+
+	@ApiModelProperty(value = "组名 ", example = "组名")
+	private String name;
+
+	@ApiModelProperty(value = "排序 排序", example = "101")
+	private Integer ranks;
+
+	@ApiModelProperty(value = "是否可编辑 0是 1否", example = "101")
+	private Integer isEditable;
+
 	private List<SpmkCustomApproval> spmkCustomApprovals;
 
 }

src/main/java/cn/timer/api/dto/spmk/SpmkApproveSummaryDto.java

 package cn.timer.api.dto.spmk;
 
 import java.util.Date;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -38,7 +39,7 @@ public class SpmkApproveSummaryDto{
 	private JSONObject requestData;
 
 	@ApiModelProperty(value = "审批表单 ", example = "审批表单")
-	private JSONObject froms;
+	private List<JSONObject> froms;
 
 	@ApiModelProperty(value = "审批流程 ", example = "审批流程")
 	private Router router;

src/main/java/cn/timer/api/dto/spmk/SpmkCustomApprovalDto.java

@@ -54,13 +54,12 @@ public class SpmkCustomApprovalDto {
 	private Integer assoType;
 
 	@ApiModelProperty(value = "审批表单 ", example = "审批表单")
-	private JSONObject froms;
+	private List<JSONObject> froms;
 
 	@ApiModelProperty(value = "审批流程 ", example = "审批流程")
 	private Router router;
-	
+
 	@ApiModelProperty(value = "可见发起人配置 ", example = "可见发起人配置 ")
 	private List<SpmkInitiatorConfig> initiatorConfigs;
-	
 
 }

src/main/resources/application-dev.yml

@@ -141,7 +141,7 @@ pagehelper:
 logging:
   level:
     root: info
-    cn.timer.api.dao: error
+    cn.timer.api.dao: debug
   pattern:
     console: '--%p--%m%n'
     

src/main/resources/mapping/qyzx/QyzxEntInfoMMapper.xml

@@ -21,6 +21,11 @@
                 <result column="is_on_stock" property="isOnStock" />
                 <result column="level" property="level" />
                 <result column="register_time" property="registerTime" />
+                <result column="license_url" property="licenseUrl" />
+                <result column="area" property="area" />
+                <result column="attest_name" property="attestName" />
+                <result column="attest_status" property="attestStatus" />
+                <result column="attest_time" property="attestTime" />
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -40,7 +45,12 @@
                 credit_code,
                 is_on_stock,
                 level,
-                register_time
+                register_time,
+                license_url,
+                area,
+                attest_name,
+                attest_status,
+                attest_time
     </sql>
 
 	<!-- 

src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml

@@ -60,9 +60,9 @@
                 b.is_opinion SpmkCustomApproval_is_opinion,
                 b.update_time SpmkCustomApproval_update_time,
                 b.create_time SpmkCustomApproval_create_time,
-                b.asso_type SpmkCustomApproval_asso_type,
+                b.asso_type SpmkCustomApproval_asso_type<!-- ,
                 b.froms SpmkCustomApproval_froms,
-                b.router SpmkCustomApproval_router
+                b.router SpmkCustomApproval_router -->
     </sql>      
     
     <select id="selectListAgInCa" resultMap="BaseResultMapDto">
@@ -73,16 +73,16 @@
          
         LEFT JOIN spmk_custom_approval b ON a.id = b.approval_g_id
         
-        WHERE b.org_code = #{org_code} AND b.id in 
-        (
-        	SELECT custom_approval_id FROM spmk_initiator_config WHERE emp_num = #{emp_num} GROUP BY custom_approval_id
-        )
+        WHERE a.org_code = #{org_code}  
+<!--        AND b.id IN (
+        	SELECT custom_approval_id FROM spmk_initiator_config WHERE asso_id = #{emp_num} AND type = 1 GROUP BY custom_approval_id
+        ) -->
         ORDER BY a.ranks, b.ranks
     </select>
     
     <update id="updateListRandsById" parameterType="list">
         <foreach item="item" index="index" collection="list" open="" separator=";" close="">
-	        		UPDATE spmk_approval_template_g
+	        		UPDATE spmk_approval_g
 			        <set>
 			                    <if test ='null != item.ranks'>ranks = #{item.ranks},</if>
 			        </set>