diff --git a/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java b/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java
index fccd2e01..7937c8a3 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java
@@ -1,21 +1,20 @@
-package com.xm.core.entity;
+package com.xm.core.entity;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
import java.util.Date;
+import java.math.BigDecimal;
/**
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
+ * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmEnvList所有属性名:
- * id,remark,ipAddress,port,branchId,accessUserid,accessPassword,effect,accessUrl,supplier,webIpAddress,webPort,otherRemark,createUserid,createUsername,createTime,envState,startTime,endTime,feeAmount,feeRule;
- * 表 XM.xm_env_list xm_env_list的所有字段名:
- * id,remark,ip_address,port,branch_id,access_userid,access_password,effect,access_url,supplier,web_ip_address,web_port,other_remark,create_userid,create_username,create_time,env_state,start_time,end_time,fee_amount,fee_rule;
+ * "id","主键","remark","备注说明","ipAddress","内网ip地址","port","内网访问端口","branchId","归属机构","accessUserid","访问用户编号","accessPassword","访问密码","effect","作用说明","accessUrl","访问链接","supplier","供应商","webIpAddress","外网ip地址","webPort","外网端口","otherRemark","其它说明","createUserid","添加人员","createUsername","添加人员姓名","createTime","添加时间","envState","状态0不可用1已启用2已过期","startTime","有效日期开始","endTime","有效日期结束","feeAmount","费用","feeRule","计费规则","bizProcInstId","当前流程实例编号","bizFlowState","当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除";
* 当前主键(包括多主键):
* id;
*/
-@ApiModel(description="xm_env_list")
+ @Data
+@ApiModel(description="项目环境清单")
public class XmEnvList implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -83,268 +82,24 @@ public class XmEnvList implements java.io.Serializable {
@ApiModelProperty(notes="计费规则",allowEmptyValue=true,example="",allowableValues="")
String feeRule;
+
+ @ApiModelProperty(notes="当前流程实例编号",allowEmptyValue=true,example="",allowableValues="")
+ String bizProcInstId;
+
+ @ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
+ String bizFlowState;
- /**主键**/
+ /**
+ *主键
+ **/
public XmEnvList(String id) {
this.id = id;
}
- /**xm_env_list**/
+ /**
+ * 项目环境清单
+ **/
public XmEnvList() {
}
-
- /**
- * 主键
- **/
- public void setId(String id) {
- this.id = id;
- }
- /**
- * 备注说明
- **/
- public void setRemark(String remark) {
- this.remark = remark;
- }
- /**
- * 内网ip地址
- **/
- public void setIpAddress(String ipAddress) {
- this.ipAddress = ipAddress;
- }
- /**
- * 内网访问端口
- **/
- public void setPort(String port) {
- this.port = port;
- }
- /**
- * 归属机构
- **/
- public void setBranchId(String branchId) {
- this.branchId = branchId;
- }
- /**
- * 访问用户编号
- **/
- public void setAccessUserid(String accessUserid) {
- this.accessUserid = accessUserid;
- }
- /**
- * 访问密码
- **/
- public void setAccessPassword(String accessPassword) {
- this.accessPassword = accessPassword;
- }
- /**
- * 作用说明
- **/
- public void setEffect(String effect) {
- this.effect = effect;
- }
- /**
- * 访问链接
- **/
- public void setAccessUrl(String accessUrl) {
- this.accessUrl = accessUrl;
- }
- /**
- * 供应商
- **/
- public void setSupplier(String supplier) {
- this.supplier = supplier;
- }
- /**
- * 外网ip地址
- **/
- public void setWebIpAddress(String webIpAddress) {
- this.webIpAddress = webIpAddress;
- }
- /**
- * 外网端口
- **/
- public void setWebPort(String webPort) {
- this.webPort = webPort;
- }
- /**
- * 其它说明
- **/
- public void setOtherRemark(String otherRemark) {
- this.otherRemark = otherRemark;
- }
- /**
- * 添加人员
- **/
- public void setCreateUserid(String createUserid) {
- this.createUserid = createUserid;
- }
- /**
- * 添加人员姓名
- **/
- public void setCreateUsername(String createUsername) {
- this.createUsername = createUsername;
- }
- /**
- * 添加时间
- **/
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
- /**
- * 状态0不可用1已启用2已过期
- **/
- public void setEnvState(String envState) {
- this.envState = envState;
- }
- /**
- * 有效日期开始
- **/
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
- /**
- * 有效日期结束
- **/
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
- /**
- * 费用
- **/
- public void setFeeAmount(BigDecimal feeAmount) {
- this.feeAmount = feeAmount;
- }
- /**
- * 计费规则
- **/
- public void setFeeRule(String feeRule) {
- this.feeRule = feeRule;
- }
-
- /**
- * 主键
- **/
- public String getId() {
- return this.id;
- }
- /**
- * 备注说明
- **/
- public String getRemark() {
- return this.remark;
- }
- /**
- * 内网ip地址
- **/
- public String getIpAddress() {
- return this.ipAddress;
- }
- /**
- * 内网访问端口
- **/
- public String getPort() {
- return this.port;
- }
- /**
- * 归属机构
- **/
- public String getBranchId() {
- return this.branchId;
- }
- /**
- * 访问用户编号
- **/
- public String getAccessUserid() {
- return this.accessUserid;
- }
- /**
- * 访问密码
- **/
- public String getAccessPassword() {
- return this.accessPassword;
- }
- /**
- * 作用说明
- **/
- public String getEffect() {
- return this.effect;
- }
- /**
- * 访问链接
- **/
- public String getAccessUrl() {
- return this.accessUrl;
- }
- /**
- * 供应商
- **/
- public String getSupplier() {
- return this.supplier;
- }
- /**
- * 外网ip地址
- **/
- public String getWebIpAddress() {
- return this.webIpAddress;
- }
- /**
- * 外网端口
- **/
- public String getWebPort() {
- return this.webPort;
- }
- /**
- * 其它说明
- **/
- public String getOtherRemark() {
- return this.otherRemark;
- }
- /**
- * 添加人员
- **/
- public String getCreateUserid() {
- return this.createUserid;
- }
- /**
- * 添加人员姓名
- **/
- public String getCreateUsername() {
- return this.createUsername;
- }
- /**
- * 添加时间
- **/
- public Date getCreateTime() {
- return this.createTime;
- }
- /**
- * 状态0不可用1已启用2已过期
- **/
- public String getEnvState() {
- return this.envState;
- }
- /**
- * 有效日期开始
- **/
- public Date getStartTime() {
- return this.startTime;
- }
- /**
- * 有效日期结束
- **/
- public Date getEndTime() {
- return this.endTime;
- }
- /**
- * 费用
- **/
- public BigDecimal getFeeAmount() {
- return this.feeAmount;
- }
- /**
- * 计费规则
- **/
- public String getFeeRule() {
- return this.feeRule;
- }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmFile.java b/xm-core/src/main/java/com/xm/core/entity/XmFile.java
index dc340264..464eeaca 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmFile.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmFile.java
@@ -1,19 +1,18 @@
-package com.xm.core.entity;
+package com.xm.core.entity;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
import java.util.Date;
/**
- * 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块
+ * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmFile所有属性名:
- * id,name,projectId,projectName,description,createUserid,createUsername,createTime,bizProcInstId,bizFlowState;
- * 表 XM.xm_file xm_file的所有字段名:
- * id,name,project_id,project_name,description,create_userid,create_username,create_time,biz_proc_inst_id,biz_flow_state;
+ * "id","文档编号","name","文件名称","projectId","项目编号","projectName","项目名称","description","文件说明","createUserid","创建人编号","createUsername","创建人","createTime","创建时间","bizProcInstId","当前流程实例编号","bizFlowState","当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除";
* 当前主键(包括多主键):
* id;
*/
+ @Data
@ApiModel(description="xm_file")
public class XmFile implements java.io.Serializable {
@@ -50,135 +49,17 @@ public class XmFile implements java.io.Serializable {
@ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
String bizFlowState;
- /**文档编号**/
+ /**
+ *文档编号
+ **/
public XmFile(String id) {
this.id = id;
}
- /**xm_file**/
+ /**
+ * xm_file
+ **/
public XmFile() {
}
-
- /**
- * 文档编号
- **/
- public void setId(String id) {
- this.id = id;
- }
- /**
- * 文件名称
- **/
- public void setName(String name) {
- this.name = name;
- }
- /**
- * 项目编号
- **/
- public void setProjectId(String projectId) {
- this.projectId = projectId;
- }
- /**
- * 项目名称
- **/
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
- /**
- * 文件说明
- **/
- public void setDescription(String description) {
- this.description = description;
- }
- /**
- * 创建人编号
- **/
- public void setCreateUserid(String createUserid) {
- this.createUserid = createUserid;
- }
- /**
- * 创建人
- **/
- public void setCreateUsername(String createUsername) {
- this.createUsername = createUsername;
- }
- /**
- * 创建时间
- **/
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
- /**
- * 当前流程实例编号
- **/
- public void setBizProcInstId(String bizProcInstId) {
- this.bizProcInstId = bizProcInstId;
- }
- /**
- * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
- **/
- public void setBizFlowState(String bizFlowState) {
- this.bizFlowState = bizFlowState;
- }
-
- /**
- * 文档编号
- **/
- public String getId() {
- return this.id;
- }
- /**
- * 文件名称
- **/
- public String getName() {
- return this.name;
- }
- /**
- * 项目编号
- **/
- public String getProjectId() {
- return this.projectId;
- }
- /**
- * 项目名称
- **/
- public String getProjectName() {
- return this.projectName;
- }
- /**
- * 文件说明
- **/
- public String getDescription() {
- return this.description;
- }
- /**
- * 创建人编号
- **/
- public String getCreateUserid() {
- return this.createUserid;
- }
- /**
- * 创建人
- **/
- public String getCreateUsername() {
- return this.createUsername;
- }
- /**
- * 创建时间
- **/
- public Date getCreateTime() {
- return this.createTime;
- }
- /**
- * 当前流程实例编号
- **/
- public String getBizProcInstId() {
- return this.bizProcInstId;
- }
- /**
- * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
- **/
- public String getBizFlowState() {
- return this.bizFlowState;
- }
}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml
index 0987440b..9bc90a64 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml
@@ -3,31 +3,31 @@
-
-
+
+
+
+ and (res.id) in
+
+ ( #{item})
+
+
+
+
+ and (res.ip_address like #{fuzzy} or res.web_ip_address like #{fuzzy} or res.access_url like #{fuzzy})
+
+
+
-
-
@@ -45,7 +45,13 @@
where
res.id = #{id}
-
+
-
+
insert into xm_env_list(
) values (
- #{id},#{remark},#{ipAddress},#{port},#{branchId},#{accessUserid},#{accessPassword},#{effect},#{accessUrl},#{supplier},#{webIpAddress},#{webPort},#{otherRemark},#{createUserid},#{createUsername},#{createTime},#{envState},#{startTime},#{endTime},#{feeAmount},#{feeRule}
+ #{id},#{remark},#{ipAddress},#{port},#{branchId},#{accessUserid},#{accessPassword},#{effect},#{accessUrl},#{supplier},#{webIpAddress},#{webPort},#{otherRemark},#{createUserid},#{createUsername},#{createTime},#{envState},#{startTime},#{endTime},#{feeAmount},#{feeRule},#{bizProcInstId},#{bizFlowState}
)
@@ -78,13 +84,13 @@
- delete from xm_env_list
+ delete from xm_env_list
where id = #{id}
- update xm_env_list
+ update xm_env_list
@@ -93,7 +99,7 @@
- update xm_env_list
+ update xm_env_list
@@ -108,27 +114,40 @@
- update xm_env_list
+ update xm_env_list
set
where id = #{item.id}
+
+
+
+ update xm_env_list
+
+
+
+ where (id) in
+
+ ( #{item})
+
+
- delete from xm_env_list
- where id in
-
- #{item.id }
-
+ delete from xm_env_list
+ where
+ (id) in
+
+ ( #{item.id} )
+
- id,remark,ip_address,port,branch_id,access_userid,access_password,effect,access_url,supplier,web_ip_address,web_port,other_remark,create_userid,create_username,create_time,env_state,start_time,end_time,fee_amount,fee_rule
+ id,remark,ip_address,port,branch_id,access_userid,access_password,effect,access_url,supplier,web_ip_address,web_port,other_remark,create_userid,create_username,create_time,env_state,start_time,end_time,fee_amount,fee_rule,biz_proc_inst_id,biz_flow_state
-
+
and res.id = #{id}
@@ -146,12 +165,14 @@
and res.other_remark = #{otherRemark}
and res.create_userid = #{createUserid}
and res.create_username = #{createUsername}
- and TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD')
+ and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d')
and res.env_state = #{envState}
- and TO_CHAR(res.start_time,'YYYY-MM-DD') = TO_CHAR(#{startTime},'YYYY-MM-DD')
- and TO_CHAR(res.end_time,'YYYY-MM-DD') = TO_CHAR(#{endTime},'YYYY-MM-DD')
+ and date_format(res.start_time,'%Y-%m-%d') = date_format(#{startTime},'%Y-%m-%d')
+ and date_format(res.end_time,'%Y-%m-%d') = date_format(#{endTime},'%Y-%m-%d')
and res.fee_amount = #{feeAmount}
and res.fee_rule = #{feeRule}
+ and res.biz_proc_inst_id = #{bizProcInstId}
+ and res.biz_flow_state = #{bizFlowState}
@@ -174,7 +195,9 @@
start_time = #{startTime},
end_time = #{endTime},
fee_amount = #{feeAmount},
- fee_rule = #{feeRule}
+ fee_rule = #{feeRule},
+ biz_proc_inst_id = #{bizProcInstId},
+ biz_flow_state = #{bizFlowState}
remark = #{remark},
@@ -197,6 +220,8 @@
end_time = #{endTime},
fee_amount = #{feeAmount},
fee_rule = #{feeRule},
+ biz_proc_inst_id = #{bizProcInstId},
+ biz_flow_state = #{bizFlowState},
@@ -219,6 +244,8 @@
start_time = #{item.startTime},
end_time = #{item.endTime},
fee_amount = #{item.feeAmount},
- fee_rule = #{item.feeRule}
+ fee_rule = #{item.feeRule},
+ biz_proc_inst_id = #{item.bizProcInstId},
+ biz_flow_state = #{item.bizFlowState}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmFileMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmFileMapper.xml
index de081f1d..33720b15 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmFileMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmFileMapper.xml
@@ -3,26 +3,28 @@
-
-
+
+
+
+ and (res.id) in
+
+ ( #{item})
+
+
+
+
+
-
@@ -40,7 +42,13 @@
where
res.id = #{id}
-
+
-
+
insert into xm_file(
) values (
@@ -73,13 +81,13 @@
- delete from xm_file
+ delete from xm_file
where id = #{id}
- update xm_file
+ update xm_file
@@ -88,7 +96,7 @@
- update xm_file
+ update xm_file
@@ -103,19 +111,32 @@
- update xm_file
+ update xm_file
set
where id = #{item.id}
+
+
+
+ update xm_file
+
+
+
+ where (id) in
+
+ ( #{item})
+
+
- delete from xm_file
- where id in
-
- #{item.id }
-
+ delete from xm_file
+ where
+ (id) in
+
+ ( #{item.id} )
+
@@ -123,7 +144,7 @@
id,name,project_id,project_name,description,create_userid,create_username,create_time,biz_proc_inst_id,biz_flow_state
-
+
and res.id = #{id}
@@ -133,7 +154,7 @@
and res.description = #{description}
and res.create_userid = #{createUserid}
and res.create_username = #{createUsername}
- and TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD')
+ and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d')
and res.biz_proc_inst_id = #{bizProcInstId}
and res.biz_flow_state = #{bizFlowState}