Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
d442111a 由 康伟
选项

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

1 个父辈 cc65a079
全部展开
内嵌 并排
正在显示 10 个修改的文件 包含 167 行增加 和 18 行删除
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhWasteSolidContract.java
...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
6 import com.baomidou.mybatisplus.annotation.TableId; 6 import com.baomidou.mybatisplus.annotation.TableId;
7 import com.baomidou.mybatisplus.annotation.TableName; 7 import com.baomidou.mybatisplus.annotation.TableName;
8 import com.baomidou.mybatisplus.annotation.TableField; 8 import com.baomidou.mybatisplus.annotation.TableField;
9 import com.skua.core.aspect.annotation.Dict;
9 import io.swagger.annotations.ApiModel; 10 import io.swagger.annotations.ApiModel;
10 import io.swagger.annotations.ApiModelProperty; 11 import io.swagger.annotations.ApiModelProperty;
11 import lombok.Data; 12 import lombok.Data;
...@@ -29,17 +30,18 @@ public class AjhWasteSolidContract { ...@@ -29,17 +30,18 @@ public class AjhWasteSolidContract {
29 @TableId(type = IdType.ID_WORKER_STR) 30 @TableId(type = IdType.ID_WORKER_STR)
30 @ApiModelProperty(value = "报警ID 主键") 31 @ApiModelProperty(value = "报警ID 主键")
31 private String id; 32 private String id;
32 /**处理单位*/ 33
33 @Excel(name = "处理单位", width = 15) 34 @Excel(name = "水厂编号", width = 15)
34 @ApiModelProperty(value = "水厂编号") 35 @ApiModelProperty(value = "水厂编号")
35 private String departId; 36 private String departId;
36 /**水厂名称*/ 37 /**水厂名称*/
37 @Excel(name = "水厂名称", width = 15) 38 @Excel(name = "水厂名称", width = 15)
38 @ApiModelProperty(value = "水厂名称") 39 @ApiModelProperty(value = "水厂名称")
39 private String departName; 40 private String departName;
40 /**处理单位*/ 41
41 @Excel(name = "处理单位", width = 15) 42 @Excel(name = "处理单位", width = 15)
42 @ApiModelProperty(value = "处理单位") 43 @ApiModelProperty(value = "处理单位")
44 @Dict(dictTable = "ajh_safe_handle_point", dicCode="id", dicText = "company_name")
43 private String handleDepartName; 45 private String handleDepartName;
44 /**合同签订时间*/ 46 /**合同签订时间*/
45 @Excel(name = "合同签订时间", width = 15) 47 @Excel(name = "合同签订时间", width = 15)
......
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhWasteSolidTransport.java
...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
6 import com.baomidou.mybatisplus.annotation.TableId; 6 import com.baomidou.mybatisplus.annotation.TableId;
7 import com.baomidou.mybatisplus.annotation.TableName; 7 import com.baomidou.mybatisplus.annotation.TableName;
8 import com.baomidou.mybatisplus.annotation.TableField; 8 import com.baomidou.mybatisplus.annotation.TableField;
9 import com.skua.core.aspect.annotation.Dict;
9 import io.swagger.annotations.ApiModel; 10 import io.swagger.annotations.ApiModel;
10 import io.swagger.annotations.ApiModelProperty; 11 import io.swagger.annotations.ApiModelProperty;
11 import lombok.Data; 12 import lombok.Data;
...@@ -29,17 +30,19 @@ public class AjhWasteSolidTransport { ...@@ -29,17 +30,19 @@ public class AjhWasteSolidTransport {
29 @TableId(type = IdType.ID_WORKER_STR) 30 @TableId(type = IdType.ID_WORKER_STR)
30 @ApiModelProperty(value = "报警ID 主键") 31 @ApiModelProperty(value = "报警ID 主键")
31 private String id; 32 private String id;
32 /**处理单位*/ 33
33 @Excel(name = "处理单位", width = 15) 34 @Excel(name = "水厂编号", width = 15)
34 @ApiModelProperty(value = "处理单位") 35 @ApiModelProperty(value = "水厂编号")
36
35 private String departId; 37 private String departId;
36 /**水厂名称*/ 38 /**水厂名称*/
37 @Excel(name = "水厂名称", width = 15) 39 @Excel(name = "水厂名称", width = 15)
38 @ApiModelProperty(value = "水厂名称") 40 @ApiModelProperty(value = "水厂名称")
39 private String departName; 41 private String departName;
40 /**处理单位*/ 42
41 @Excel(name = "处理单位", width = 15) 43 @Excel(name = "处理单位", width = 15)
42 @ApiModelProperty(value = "处理单位") 44 @ApiModelProperty(value = "处理单位")
45 @Dict(dictTable = "ajh_safe_handle_point", dicCode="id", dicText = "company_name")
43 private String handleDepartName; 46 private String handleDepartName;
44 /**车牌号*/ 47 /**车牌号*/
45 @Excel(name = "车牌号", width = 15) 48 @Excel(name = "车牌号", width = 15)
......
sk-module-biz/src/main/java/com/skua/modules/erp/controller/PurchaseContractController.java
...@@ -74,14 +74,14 @@ public class PurchaseContractController { ...@@ -74,14 +74,14 @@ public class PurchaseContractController {
74 Page<ERPPurchaseContract> page = new Page<ERPPurchaseContract>(pageNo, pageSize); 74 Page<ERPPurchaseContract> page = new Page<ERPPurchaseContract>(pageNo, pageSize);
75 75
76 // 需要添加条件判断 76 // 需要添加条件判断
77 /*if(StringUtils.isEmpty(purchaseContract.getStatus())){ 77 if(StringUtils.isEmpty(purchaseContract.getStatus())){
78 queryWrapper.gt("status" , "0");// >0 78 queryWrapper.gt("status" , "0");// >0
79 queryWrapper.ne("status" , "2"); // 不等于2 79 queryWrapper.ne("status" , "2"); // 不等于2
80 }*/ 80 }
81 //启用状态：=0 81 //启用状态：=0
82 /*if(StringUtils.isEmpty(purchaseContract.getUseFlag())){ 82 if(StringUtils.isEmpty(purchaseContract.getUseFlag())){
83 queryWrapper.eq("use_flag","0"); 83 queryWrapper.eq("use_flag","0");
84 }*/ 84 }
85 IPage<ERPPurchaseContract> pageList = purchaseContractService.page(page, queryWrapper); 85 IPage<ERPPurchaseContract> pageList = purchaseContractService.page(page, queryWrapper);
86 result.setSuccess(true); 86 result.setSuccess(true);
87 result.setResult(pageList); 87 result.setResult(pageList);
...@@ -228,12 +228,17 @@ public class PurchaseContractController { ...@@ -228,12 +228,17 @@ public class PurchaseContractController {
228 if(purchaseContract==null) { 228 if(purchaseContract==null) {
229 result.error500("未找到对应实体"); 229 result.error500("未找到对应实体");
230 }else { 230 }else {
231 purchaseContract.setStatus("1"); 231 if("1".equals(purchaseContract.getUseFlag())){
232 purchaseContract.setApplyUser(BaseContextHandler.getUserId()); 232 result.error500("合同状态是：[未启用]，不能提交审核！");
233 purchaseContract.setApplyTime(DateUtils.now()); 233 }else{
234 purchaseContractService.updateById(purchaseContract); 234 purchaseContract.setStatus("1");
235 result.setResult(purchaseContract); 235 purchaseContract.setApplyUser(BaseContextHandler.getUserId());
236 result.setSuccess(true); 236 purchaseContract.setApplyTime(DateUtils.now());
237 purchaseContractService.updateById(purchaseContract);
238 result.setResult(purchaseContract);
239 result.setSuccess(true);
240 }
241
237 } 242 }
238 return result; 243 return result;
239 } 244 }
......
sk-module-biz/src/main/java/com/skua/modules/safe/entity/SafeHandlePoint.java 0 → 100644
1 package com.skua.modules.safe.entity;
2
3 import java.util.Date;
4 import com.baomidou.mybatisplus.annotation.IdType;
5 import com.baomidou.mybatisplus.annotation.TableId;
6 import com.baomidou.mybatisplus.annotation.TableName;
7 import com.skua.core.aspect.annotation.Dict;
8 import io.swagger.annotations.ApiModel;
9 import io.swagger.annotations.ApiModelProperty;
10 import lombok.Data;
11 import lombok.EqualsAndHashCode;
12 import lombok.experimental.Accessors;
13 import com.fasterxml.jackson.annotation.JsonFormat;
14 import org.springframework.format.annotation.DateTimeFormat;
15 import org.jeecgframework.poi.excel.annotation.Excel;
16
17 /**
18 * 安环处置点
19 */
20 @Data
21 @TableName("ajh_safe_handle_point")
22 @EqualsAndHashCode(callSuper = false)
23 @Accessors(chain = true)
24 @ApiModel(value="ajh_safe_handle_point对象", description="安环处置点")
25 public class SafeHandlePoint {
26
27 /**id*/
28 @TableId(type = IdType.ID_WORKER_STR)
29 @ApiModelProperty(value = "id")
30 private String id;
31 /**公司名称*/
32 @Excel(name = "公司名称", width = 15)
33 @ApiModelProperty(value = "公司名称")
34 private String companyName;
35 /**简称*/
36 @Excel(name = "简称", width = 15)
37 @ApiModelProperty(value = "简称")
38 private String nameAbbr;
39 /**处置方式*/
40 @Excel(name = "处置方式", width = 15)
41 @ApiModelProperty(value = "处置方式")
42 @Dict(dicCode = "safe_handle_type")
43 private String handleType;
44 /**日处理能力*/
45 @Excel(name = "日处理能力", width = 15)
46 @ApiModelProperty(value = "日处理能力")
47 private String dayHandleCapacity;
48 /**合作状态*/
49 @Excel(name = "合作状态", width = 15)
50 @ApiModelProperty(value = "合作状态")
51 @Dict(dicCode = "cooperate_status")
52 private String status;
53 /**地址*/
54 @Excel(name = "地址", width = 15)
55 @ApiModelProperty(value = "地址")
56 private String address;
57 /**附件*/
58 @Excel(name = "附件", width = 15)
59 @ApiModelProperty(value = "附件")
60 private String filePath;
61 /**录入全国信息系统：0 是 1否*/
62 @Excel(name = "录入全国信息系统：0 是 1否", width = 15)
63 @ApiModelProperty(value = "录入全国信息系统：0 是 1否")
64 private Integer enterSystem;
65 /**关联合同集合*/
66 @Excel(name = "关联合同集合", width = 15)
67 @ApiModelProperty(value = "关联合同集合")
68 private String contractIds;
69 /**0未删除1删除*/
70 @Excel(name = "0未删除1删除", width = 15)
71 @ApiModelProperty(value = "0未删除1删除")
72 private Integer delFlag;
73 /**createTime*/
74 @Excel(name = "createTime", width = 20, format = "yyyy-MM-dd HH:mm:ss")
75 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
76 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
77 @ApiModelProperty(value = "createTime")
78 private Date createTime;
79 /**创建人*/
80 @Excel(name = "创建人", width = 15)
81 @ApiModelProperty(value = "创建人")
82 private String createBy;
83 /**updateBy*/
84 @Excel(name = "updateBy", width = 15)
85 @ApiModelProperty(value = "updateBy")
86 private String updateBy;
87 /**updateTime*/
88 @Excel(name = "updateTime", width = 20, format = "yyyy-MM-dd HH:mm:ss")
89 @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
90 @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
91 @ApiModelProperty(value = "updateTime")
92 private Date updateTime;
93 }
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/SafeHandlePointMapper.java 0 → 100644
1 package com.skua.modules.safe.mapper;
2
3 import java.util.List;
4
5 import org.apache.ibatis.annotations.Param;
6 import com.skua.modules.safe.entity.SafeHandlePoint;
7 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
8
9 /**
10 * 安环处置点
11 */
12 public interface SafeHandlePointMapper extends BaseMapper<SafeHandlePoint> {
13
14 }
sk-module-biz/src/main/java/com/skua/modules/safe/mapper/xml/SafeHandlePointMapper.xml 0 → 100644
1 <?xml version="1.0" encoding="UTF-8"?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.skua.modules.safe.mapper.SafeHandlePointMapper">
4
5 </mapper>
...\ No newline at end of file ...\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/safe/service/ISafeHandlePointService.java 0 → 100644
1 package com.skua.modules.safe.service;
2
3 import com.skua.modules.safe.entity.SafeHandlePoint;
4 import com.baomidou.mybatisplus.extension.service.IService;
5
6 /**
7 * 安环处置点
8 */
9 public interface ISafeHandlePointService extends IService<SafeHandlePoint> {
10
11 }
sk-module-biz/src/main/java/com/skua/modules/safe/service/impl/SafeHandlePointServiceImpl.java 0 → 100644
1 package com.skua.modules.safe.service.impl;
2
3 import com.skua.modules.safe.entity.SafeHandlePoint;
4 import com.skua.modules.safe.mapper.SafeHandlePointMapper;
5 import com.skua.modules.safe.service.ISafeHandlePointService;
6 import org.springframework.stereotype.Service;
7
8 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
9
10 /**
11 * 安环处置点
12 */
13 @Service
14 public class SafeHandlePointServiceImpl extends ServiceImpl<SafeHandlePointMapper, SafeHandlePoint> implements ISafeHandlePointService {
15
16 }
sk-module-biz/src/main/resources/application-test.yml
...@@ -133,7 +133,7 @@ mybatis-plus: ...@@ -133,7 +133,7 @@ mybatis-plus:
133 configuration: 133 configuration:
134 call-setters-on-nulls: true 134 call-setters-on-nulls: true
135 # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用 135 # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
136 log-impl: org.apache.ibatis.logging.stdout.StdOutImpl 136 #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
137 #数矿专用配置 137 #数矿专用配置
138 skua: 138 skua:
139 web-url: http://192.168.100.29:3000 139 web-url: http://192.168.100.29:3000
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!