kangwei：安环处置点表结构与相关代码

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 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.ApiModelProperty;
 import lombok.Data;
@@ -29,17 +30,18 @@ public class AjhWasteSolidContract {
 	@TableId(type = IdType.ID_WORKER_STR)
     @ApiModelProperty(value = "报警ID 主键")
 	private String id;
-	/**处理单位*/
-	@Excel(name = "处理单位", width = 15)
+
+	@Excel(name = "水厂编号", width = 15)
     @ApiModelProperty(value = "水厂编号")
 	private String departId;
 	/**水厂名称*/
 	@Excel(name = "水厂名称", width = 15)
     @ApiModelProperty(value = "水厂名称")
 	private String departName;
-	/**处理单位*/
+
 	@Excel(name = "处理单位", width = 15)
     @ApiModelProperty(value = "处理单位")
+	@Dict(dictTable = "ajh_safe_handle_point", dicCode="id", dicText = "company_name")
 	private String handleDepartName;
 	/**合同签订时间*/
 	@Excel(name = "合同签订时间", width = 15)

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 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.ApiModelProperty;
 import lombok.Data;
@@ -29,17 +30,19 @@ public class AjhWasteSolidTransport {
 	@TableId(type = IdType.ID_WORKER_STR)
     @ApiModelProperty(value = "报警ID 主键")
 	private String id;
-	/**处理单位*/
-	@Excel(name = "处理单位", width = 15)
-    @ApiModelProperty(value = "处理单位")
+
+	@Excel(name = "水厂编号", width = 15)
+    @ApiModelProperty(value = "水厂编号")
+
 	private String departId;
 	/**水厂名称*/
 	@Excel(name = "水厂名称", width = 15)
     @ApiModelProperty(value = "水厂名称")
 	private String departName;
-	/**处理单位*/
+
 	@Excel(name = "处理单位", width = 15)
     @ApiModelProperty(value = "处理单位")
+	@Dict(dictTable = "ajh_safe_handle_point", dicCode="id", dicText = "company_name")
 	private String handleDepartName;
 	/**车牌号*/
 	@Excel(name = "车牌号", width = 15)

@@ -74,14 +74,14 @@ public class PurchaseContractController {
 		Page<ERPPurchaseContract> page = new Page<ERPPurchaseContract>(pageNo, pageSize);
 
 		// 需要添加条件判断
-		/*if(StringUtils.isEmpty(purchaseContract.getStatus())){
+		if(StringUtils.isEmpty(purchaseContract.getStatus())){
 			queryWrapper.gt("status" , "0");// >0
 			queryWrapper.ne("status" , "2");  // 不等于2
-		}*/
+		}
 		//启用状态：=0
-		/*if(StringUtils.isEmpty(purchaseContract.getUseFlag())){
+		if(StringUtils.isEmpty(purchaseContract.getUseFlag())){
 			queryWrapper.eq("use_flag","0");
-		}*/
+		}
 		IPage<ERPPurchaseContract> pageList = purchaseContractService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);
@@ -228,6 +228,9 @@ public class PurchaseContractController {
 		if(purchaseContract==null) {
 			result.error500("未找到对应实体");
 		}else {
+			if("1".equals(purchaseContract.getUseFlag())){
+				result.error500("合同状态是：[未启用]，不能提交审核！");
+			}else{
 				purchaseContract.setStatus("1");
 				purchaseContract.setApplyUser(BaseContextHandler.getUserId());
 				purchaseContract.setApplyTime(DateUtils.now());
@@ -235,6 +238,8 @@ public class PurchaseContractController {
 				result.setResult(purchaseContract);
 				result.setSuccess(true);
 			}
+
+		}
 		return result;
 	}
 	@AutoLog(value = "erp统购合同-审批")

+package com.skua.modules.safe.entity;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.skua.core.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 安环处置点
+ */
+@Data
+@TableName("ajh_safe_handle_point")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ajh_safe_handle_point对象", description="安环处置点")
+public class SafeHandlePoint {
+
+	/**id*/
+	@TableId(type = IdType.ID_WORKER_STR)
+    @ApiModelProperty(value = "id")
+	private String id;
+	/**公司名称*/
+	@Excel(name = "公司名称", width = 15)
+    @ApiModelProperty(value = "公司名称")
+	private String companyName;
+	/**简称*/
+	@Excel(name = "简称", width = 15)
+    @ApiModelProperty(value = "简称")
+	private String nameAbbr;
+	/**处置方式*/
+	@Excel(name = "处置方式", width = 15)
+    @ApiModelProperty(value = "处置方式")
+	@Dict(dicCode = "safe_handle_type")
+	private String handleType;
+	/**日处理能力*/
+	@Excel(name = "日处理能力", width = 15)
+    @ApiModelProperty(value = "日处理能力")
+	private String dayHandleCapacity;
+	/**合作状态*/
+	@Excel(name = "合作状态", width = 15)
+    @ApiModelProperty(value = "合作状态")
+	@Dict(dicCode = "cooperate_status")
+	private String status;
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+	private String address;
+	/**附件*/
+	@Excel(name = "附件", width = 15)
+    @ApiModelProperty(value = "附件")
+	private String filePath;
+	/**录入全国信息系统：0 是 1否*/
+	@Excel(name = "录入全国信息系统：0 是 1否", width = 15)
+    @ApiModelProperty(value = "录入全国信息系统：0 是 1否")
+	private Integer enterSystem;
+	/**关联合同集合*/
+	@Excel(name = "关联合同集合", width = 15)
+    @ApiModelProperty(value = "关联合同集合")
+	private String contractIds;
+	/**0未删除1删除*/
+	@Excel(name = "0未删除1删除", width = 15)
+    @ApiModelProperty(value = "0未删除1删除")
+	private Integer delFlag;
+	/**createTime*/
+	@Excel(name = "createTime", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "createTime")
+	private Date createTime;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+    @ApiModelProperty(value = "创建人")
+	private String createBy;
+	/**updateBy*/
+	@Excel(name = "updateBy", width = 15)
+    @ApiModelProperty(value = "updateBy")
+	private String updateBy;
+	/**updateTime*/
+	@Excel(name = "updateTime", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "updateTime")
+	private Date updateTime;
+}

+package com.skua.modules.safe.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.skua.modules.safe.entity.SafeHandlePoint;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 安环处置点
+ */
+public interface SafeHandlePointMapper extends BaseMapper<SafeHandlePoint> {
+
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.skua.modules.safe.mapper.SafeHandlePointMapper">
+
+</mapper>
\ No newline at end of file

+package com.skua.modules.safe.service;
+
+import com.skua.modules.safe.entity.SafeHandlePoint;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 安环处置点
+ */
+public interface ISafeHandlePointService extends IService<SafeHandlePoint> {
+
+}

+package com.skua.modules.safe.service.impl;
+
+import com.skua.modules.safe.entity.SafeHandlePoint;
+import com.skua.modules.safe.mapper.SafeHandlePointMapper;
+import com.skua.modules.safe.service.ISafeHandlePointService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 安环处置点
+ */
+@Service
+public class SafeHandlePointServiceImpl extends ServiceImpl<SafeHandlePointMapper, SafeHandlePoint> implements ISafeHandlePointService {
+
+}

@@ -133,7 +133,7 @@ mybatis-plus:
   configuration:
     call-setters-on-nulls: true
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #数矿专用配置
 skua:
   web-url: http://192.168.100.29:3000