kangwei：排污许可报告:添加 报告类型

@@ -56,7 +56,6 @@ import io.swagger.annotations.ApiOperation;
 public class AjhWasteSolidPermitController {
 public class AjhWasteSolidPermitController {
 	@Autowired
 	@Autowired
 	private IAjhWasteSolidPermitService ajhWasteSolidPermitService;
 	private IAjhWasteSolidPermitService ajhWasteSolidPermitService;
-	@Autowired
 	private ICommonSqlService commonSqlService;
 	private ICommonSqlService commonSqlService;
 	@Autowired
 	@Autowired
 	private ISysDepartService departService;
 	private ISysDepartService departService;

 package com.skua.modules.ajh.entity;
 package com.skua.modules.ajh.entity;
 
 
-import java.io.Serializable;
+
 import java.util.Date;
 import java.util.Date;
 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.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.skua.core.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
@@ -41,6 +41,11 @@ public class AjhWasteSolidPermit {
 	@Excel(name = "文档名称", width = 15)
 	@Excel(name = "文档名称", width = 15)
     @ApiModelProperty(value = "文档名称")
     @ApiModelProperty(value = "文档名称")
 	private String docName;
 	private String docName;
+
+	@Excel(name = "许可证类型", width = 15)
+	@ApiModelProperty(value = "许可证类型")
+	@Dict(dicCode = "report_type")
+	private String reportType;
 	/**文档编号*/
 	/**文档编号*/
 	@Excel(name = "文档编号", width = 15)
 	@Excel(name = "文档编号", width = 15)
     @ApiModelProperty(value = "文档编号")
     @ApiModelProperty(value = "文档编号")

 package com.skua.modules.ajh.entity;
 package com.skua.modules.ajh.entity;
 
 
-import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;
 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.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.skua.core.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
@@ -40,6 +40,7 @@ public class AjhWasteSolidReport {
 	/**报告类型：1 月报；2 年报*/
 	/**报告类型：1 月报；2 年报*/
 	@Excel(name = "报告类型：1 月报；2 年报", width = 15)
 	@Excel(name = "报告类型：1 月报；2 年报", width = 15)
     @ApiModelProperty(value = "报告类型：1 月报；2 年报")
     @ApiModelProperty(value = "报告类型：1 月报；2 年报")
+	@Dict(dicCode = "report_type")
 	private String reportType;
 	private String reportType;
 	/**报告名称*/
 	/**报告名称*/
 	@Excel(name = "报告名称", width = 15)
 	@Excel(name = "报告名称", width = 15)

 package com.skua.modules.ajh.entity;
 package com.skua.modules.ajh.entity;
 
 
-import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;
 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.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.skua.core.aspect.annotation.Dict;
 import com.skua.core.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;

 package com.skua.modules.ajh.entity;
 package com.skua.modules.ajh.entity;
 
 
-import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;