Merge branch 'dev' of http://192.168.2.237:3000/root/kangarooDataCenterV3 into dev
# Conflicts: # buildpackage/src/main/resources/application.yml
This commit is contained in:
commit
5d002e8472
|
|
@ -69,6 +69,12 @@
|
|||
<profile.active>llg</profile.active>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>yuqh</id> <!--于群辉-->
|
||||
<properties>
|
||||
<profile.active>yuqh</profile.active>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>xel</id> <!--相二林-->
|
||||
<properties>
|
||||
|
|
|
|||
|
|
@ -13,12 +13,11 @@ import org.springframework.context.annotation.Import;
|
|||
import org.springframework.context.annotation.ImportResource;
|
||||
|
||||
@EnableCaching
|
||||
@ServletComponentScan(basePackages = {"com.hzya.frame"})
|
||||
@ServletComponentScan(basePackages = {"com.hzya.frame" ,"org.jeecg.modules.jmreport","com.jimureport.demo"})
|
||||
@ImportResource(locations = {"classpath:cfgHome/**/spring/spring-*.xml"})
|
||||
@Import({DruidDynamicDataSourceConfiguration.class, DynamicDataSourceCreatorAutoConfiguration.class, DynamicDataSourceAssistConfiguration.class})
|
||||
|
||||
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
|
||||
//@SpringBootApplication(scanBasePackages = {"com.hzya.frame"})
|
||||
public class WebappApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
#######################本地环境#######################
|
||||
logging:
|
||||
#日志级别 指定目录级别
|
||||
level:
|
||||
root: info
|
||||
encodings: UTF-8
|
||||
file:
|
||||
# 日志保存路径
|
||||
path: E:\yongansystem\log
|
||||
spring:
|
||||
datasource:
|
||||
dynamic:
|
||||
datasource:
|
||||
master:
|
||||
url: jdbc:mysql://hzya.ufyct.com:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true
|
||||
username: root
|
||||
password: bd993088e8a7c3dc5f44441617f9b4bf
|
||||
driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
|
||||
savefile:
|
||||
# 文件保存路径
|
||||
path: E:\yongansystem\log
|
||||
ax:
|
||||
url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
|
||||
46
pom.xml
46
pom.xml
|
|
@ -59,7 +59,9 @@
|
|||
<unit.version>4.12</unit.version>
|
||||
<quartz.version>2.3.0</quartz.version>
|
||||
<org.springframework.version>5.3.23</org.springframework.version>
|
||||
|
||||
<minio.version>8.0.3</minio.version>
|
||||
<postgresql.version>42.2.6</postgresql.version>
|
||||
<jimureport.version>1.7.4</jimureport.version>
|
||||
</properties>
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
|
|
@ -326,11 +328,34 @@
|
|||
<version>1.6.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- 缓存-->
|
||||
<!-- 缓存-->
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-cache</artifactId>
|
||||
</dependency>
|
||||
|
||||
|
||||
<!-- JimuReport 积木报表 -->
|
||||
<dependency>
|
||||
<groupId>org.jeecgframework.jimureport</groupId>
|
||||
<artifactId>jimureport-spring-boot-starter</artifactId>
|
||||
<version>${jimureport.version}</version>
|
||||
</dependency>
|
||||
<!-- minio oss-->
|
||||
<dependency>
|
||||
<groupId>io.minio</groupId>
|
||||
<artifactId>minio</artifactId>
|
||||
<version>${minio.version}</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<!-- postgresql驱动 -->
|
||||
<dependency>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>postgresql</artifactId>
|
||||
<version>${postgresql.version}</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
@ -419,6 +444,23 @@
|
|||
</snapshots>
|
||||
</repository>
|
||||
|
||||
<repository>
|
||||
<id>aliyun</id>
|
||||
<name>aliyun Repository</name>
|
||||
<url>https://maven.aliyun.com/repository/public</url>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>jeecg</id>
|
||||
<name>jeecg Repository</name>
|
||||
<url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
|
||||
</repositories>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
|
|||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.hzya.frame.base.PluginBaseEntity;
|
||||
import com.hzya.frame.mdm.entity.DbFiledsDto;
|
||||
import com.hzya.frame.mdm.entity.MdmDataDto;
|
||||
import com.hzya.frame.mdm.entity.MdmDataFiledDto;
|
||||
|
|
@ -61,6 +62,7 @@ import com.hzya.frame.sysnew.buttonConfig.dao.ISysButtonConfigDao;
|
|||
import com.hzya.frame.sysnew.buttonConfig.entity.SysButtonConfigEntity;
|
||||
import com.hzya.frame.sysnew.menuConfig.dao.ISysMenuConfigDao;
|
||||
import com.hzya.frame.sysnew.menuConfig.entity.SysMenuConfigEntity;
|
||||
import com.hzya.frame.util.PluginUtils;
|
||||
import com.hzya.frame.uuid.UUIDUtils;
|
||||
import com.hzya.frame.web.entity.BaseResult;
|
||||
import com.hzya.frame.web.entity.JsonResultEntity;
|
||||
|
|
@ -1531,9 +1533,14 @@ public class MdmServiceImpl implements IMdmService {
|
|||
mdmViewVo.setListList(listListVo);
|
||||
|
||||
List<MdmViewButtonVo> buttonList = new ArrayList<>();
|
||||
MdmViewButtonVo mdmViewButtonVo = new MdmViewButtonVo();
|
||||
buttonList.add(new MdmViewButtonVo("new","新建"));
|
||||
buttonList.add(new MdmViewButtonVo("resize","重置"));
|
||||
buttonList.add(new MdmViewButtonVo("search","查询"));
|
||||
buttonList.add(new MdmViewButtonVo("edit","修改"));
|
||||
buttonList.add(new MdmViewButtonVo("dele","删除"));
|
||||
buttonList.add(new MdmViewButtonVo("view","查看"));
|
||||
buttonList.add(new MdmViewButtonVo("send","下发"));
|
||||
mdmViewVo.setButtonList(buttonList);
|
||||
|
||||
return BaseResult.getSuccessMessageEntity("获取字段成功", mdmViewVo);
|
||||
}
|
||||
|
||||
|
|
@ -2690,6 +2697,20 @@ public class MdmServiceImpl implements IMdmService {
|
|||
return BaseResult.getFailureMessageEntity("请先传递要删除的数据");
|
||||
}
|
||||
//TODO 后续完成下发或者删除业务
|
||||
//1、根据服务名查询分发数据
|
||||
MdmModuleEntity mdmModuleEntity = new MdmModuleEntity();
|
||||
mdmModuleEntity.setMdmCode(jsonObject.getInteger("mdmCode"));
|
||||
mdmModuleEntity.setSts("Y");
|
||||
List<MdmModuleEntity> mdmModuleEntities = mdmModuleDao.queryBase(mdmModuleEntity);
|
||||
//if（）
|
||||
MdmModuleDistributeEntity mdmModuleDistributeEntity = new MdmModuleDistributeEntity();
|
||||
//mdmModuleDistributeEntity
|
||||
//mdmModuleDistributeDao.
|
||||
//2、查找插件
|
||||
//3、调用插件
|
||||
//PluginBaseEntity pluginBaseEntity = PluginUtils.getPluginsById(jsonObjectStr.getString("plug_id"));
|
||||
//JsonResultEntity s = pluginBaseEntity.executeBusiness(jsonObjectStr);
|
||||
|
||||
return BaseResult.getSuccessMessageEntity("处理分发数据成功");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
package com.hzya.frame.sysnew.integrationTaskLogDetails.dao;
|
||||
|
||||
import com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity;
|
||||
import com.hzya.frame.basedao.dao.IBaseDao;
|
||||
|
||||
/**
|
||||
* 集成任务-日志详情(integration_task_log_details: table)表数据库访问层
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-05-15 10:14:46
|
||||
*/
|
||||
public interface IIntegrationTaskLogDetailsDao extends IBaseDao<IntegrationTaskLogDetailsEntity, String> {
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
package com.hzya.frame.sysnew.integrationTaskLogDetails.dao.impl;
|
||||
|
||||
import com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity;
|
||||
import com.hzya.frame.sysnew.integrationTaskLogDetails.dao.IIntegrationTaskLogDetailsDao;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import com.hzya.frame.basedao.dao.MybatisGenericDao;
|
||||
/**
|
||||
* 集成任务-日志详情(IntegrationTaskLogDetails)表数据库访问层
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-05-15 10:14:46
|
||||
*/
|
||||
@Repository(value = "IntegrationTaskLogDetailsDaoImpl")
|
||||
public class IntegrationTaskLogDetailsDaoImpl extends MybatisGenericDao<IntegrationTaskLogDetailsEntity, String> implements IIntegrationTaskLogDetailsDao{
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
package com.hzya.frame.sysnew.integrationTaskLogDetails.service;
|
||||
|
||||
import com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity;
|
||||
import com.hzya.frame.basedao.service.IBaseService;
|
||||
/**
|
||||
* 集成任务-日志详情(IntegrationTaskLogDetails)表服务接口
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-05-15 10:14:46
|
||||
*/
|
||||
public interface IIntegrationTaskLogDetailsService extends IBaseService<IntegrationTaskLogDetailsEntity, String>{
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
package com.hzya.frame.sysnew.integrationTaskLogDetails.service.impl;
|
||||
|
||||
import com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity;
|
||||
import com.hzya.frame.sysnew.integrationTaskLogDetails.dao.IIntegrationTaskLogDetailsDao;
|
||||
import com.hzya.frame.sysnew.integrationTaskLogDetails.service.IIntegrationTaskLogDetailsService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import javax.annotation.Resource;
|
||||
import com.hzya.frame.basedao.service.impl.BaseService;
|
||||
/**
|
||||
* 集成任务-日志详情(IntegrationTaskLogDetails)表服务实现类
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-05-15 10:14:46
|
||||
*/
|
||||
@Service(value = "integrationTaskLogDetailsService")
|
||||
public class IntegrationTaskLogDetailsServiceImpl extends BaseService<IntegrationTaskLogDetailsEntity, String> implements IIntegrationTaskLogDetailsService {
|
||||
|
||||
private IIntegrationTaskLogDetailsDao integrationTaskLogDetailsDao;
|
||||
|
||||
@Autowired
|
||||
public void setIntegrationTaskLogDetailsDao(IIntegrationTaskLogDetailsDao dao) {
|
||||
this.integrationTaskLogDetailsDao = dao;
|
||||
this.dao = dao;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
package com.hzya.frame.sysnew.integtationTaskLivingDetails.dao;
|
||||
|
||||
import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
|
||||
import com.hzya.frame.basedao.dao.IBaseDao;
|
||||
|
||||
/**
|
||||
* 集成任务-实例详情(integration_task_living_details: table)表数据库访问层
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-05-15 14:06:30
|
||||
*/
|
||||
public interface IIntegrationTaskLivingDetailsDao extends IBaseDao<IntegrationTaskLivingDetailsEntity, String> {
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
package com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.impl;
|
||||
|
||||
import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
|
||||
import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import com.hzya.frame.basedao.dao.MybatisGenericDao;
|
||||
/**
|
||||
* 集成任务-实例详情(IntegrationTaskLivingDetails)表数据库访问层
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-05-15 14:06:34
|
||||
*/
|
||||
@Repository(value = "IntegrationTaskLivingDetailsDaoImpl")
|
||||
public class IntegrationTaskLivingDetailsDaoImpl extends MybatisGenericDao<IntegrationTaskLivingDetailsEntity, String> implements IIntegrationTaskLivingDetailsDao{
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
package com.hzya.frame.sysnew.integrationTaskLogDetails.entity;
|
||||
package com.hzya.frame.sysnew.integtationTaskLivingDetails.entity;
|
||||
|
||||
import java.util.Date;
|
||||
import com.hzya.frame.web.entity.BaseEntity;
|
||||
/**
|
||||
* 集成任务-日志详情(IntegrationTaskLogDetails)实体类
|
||||
* 集成任务-实例详情(IntegrationTaskLivingDetails)实体类
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-05-15 10:14:46
|
||||
* @since 2024-05-15 14:06:41
|
||||
*/
|
||||
public class IntegrationTaskLogDetailsEntity extends BaseEntity {
|
||||
public class IntegrationTaskLivingDetailsEntity extends BaseEntity {
|
||||
|
||||
/** 集成任务-实例_id */
|
||||
private String taskLinvingId;
|
||||
|
|
@ -26,24 +26,28 @@ public class IntegrationTaskLogDetailsEntity extends BaseEntity {
|
|||
private String newTransmitInfo;
|
||||
/** 最新推送时间 */
|
||||
private Date newPushDate;
|
||||
/** 源系统编码 */
|
||||
private String rootAppCode;
|
||||
/** 业务日期 */
|
||||
private String businessTime;
|
||||
/** 最新推送状态 */
|
||||
private String newPushState;
|
||||
/** 处理人 */
|
||||
private String processor;
|
||||
/** 处理时间 */
|
||||
private String processorTime;
|
||||
/** 处理备注 */
|
||||
private String processorRemark;
|
||||
/** 最新元数据 */
|
||||
private String newMetadata;
|
||||
/** 是否补推(Y是N不是) */
|
||||
private String repairPust;
|
||||
/** 公司id */
|
||||
private String companyId;
|
||||
/** 场景id */
|
||||
private String senceId;
|
||||
/** 最新推送状态 */
|
||||
private String newState;
|
||||
/** 单据业务日期 */
|
||||
private String businessDate;
|
||||
/** 插件id */
|
||||
private String pluginId;
|
||||
/** 处理时间 */
|
||||
private Date processingTime;
|
||||
/** 处理备注 */
|
||||
private String processingRemarks;
|
||||
/** 处理⼈名称 */
|
||||
private String processorName;
|
||||
/** 处理⼈ */
|
||||
private String processor;
|
||||
/** 下游系统单号 */
|
||||
private String newSystemNumber;
|
||||
/** 下游系统主键 */
|
||||
private String newSystemPrimary;
|
||||
/** 备注 */
|
||||
private String remark;
|
||||
/** 扩展1 */
|
||||
|
|
@ -122,28 +126,68 @@ public class IntegrationTaskLogDetailsEntity extends BaseEntity {
|
|||
this.newPushDate = newPushDate;
|
||||
}
|
||||
|
||||
public String getRootAppCode() {
|
||||
return rootAppCode;
|
||||
public String getRepairPust() {
|
||||
return repairPust;
|
||||
}
|
||||
|
||||
public void setRootAppCode(String rootAppCode) {
|
||||
this.rootAppCode = rootAppCode;
|
||||
public void setRepairPust(String repairPust) {
|
||||
this.repairPust = repairPust;
|
||||
}
|
||||
|
||||
public String getBusinessTime() {
|
||||
return businessTime;
|
||||
public String getSenceId() {
|
||||
return senceId;
|
||||
}
|
||||
|
||||
public void setBusinessTime(String businessTime) {
|
||||
this.businessTime = businessTime;
|
||||
public void setSenceId(String senceId) {
|
||||
this.senceId = senceId;
|
||||
}
|
||||
|
||||
public String getNewPushState() {
|
||||
return newPushState;
|
||||
public String getNewState() {
|
||||
return newState;
|
||||
}
|
||||
|
||||
public void setNewPushState(String newPushState) {
|
||||
this.newPushState = newPushState;
|
||||
public void setNewState(String newState) {
|
||||
this.newState = newState;
|
||||
}
|
||||
|
||||
public String getBusinessDate() {
|
||||
return businessDate;
|
||||
}
|
||||
|
||||
public void setBusinessDate(String businessDate) {
|
||||
this.businessDate = businessDate;
|
||||
}
|
||||
|
||||
public String getPluginId() {
|
||||
return pluginId;
|
||||
}
|
||||
|
||||
public void setPluginId(String pluginId) {
|
||||
this.pluginId = pluginId;
|
||||
}
|
||||
|
||||
public Date getProcessingTime() {
|
||||
return processingTime;
|
||||
}
|
||||
|
||||
public void setProcessingTime(Date processingTime) {
|
||||
this.processingTime = processingTime;
|
||||
}
|
||||
|
||||
public String getProcessingRemarks() {
|
||||
return processingRemarks;
|
||||
}
|
||||
|
||||
public void setProcessingRemarks(String processingRemarks) {
|
||||
this.processingRemarks = processingRemarks;
|
||||
}
|
||||
|
||||
public String getProcessorName() {
|
||||
return processorName;
|
||||
}
|
||||
|
||||
public void setProcessorName(String processorName) {
|
||||
this.processorName = processorName;
|
||||
}
|
||||
|
||||
public String getProcessor() {
|
||||
|
|
@ -154,44 +198,20 @@ public class IntegrationTaskLogDetailsEntity extends BaseEntity {
|
|||
this.processor = processor;
|
||||
}
|
||||
|
||||
public String getProcessorTime() {
|
||||
return processorTime;
|
||||
public String getNewSystemNumber() {
|
||||
return newSystemNumber;
|
||||
}
|
||||
|
||||
public void setProcessorTime(String processorTime) {
|
||||
this.processorTime = processorTime;
|
||||
public void setNewSystemNumber(String newSystemNumber) {
|
||||
this.newSystemNumber = newSystemNumber;
|
||||
}
|
||||
|
||||
public String getProcessorRemark() {
|
||||
return processorRemark;
|
||||
public String getNewSystemPrimary() {
|
||||
return newSystemPrimary;
|
||||
}
|
||||
|
||||
public void setProcessorRemark(String processorRemark) {
|
||||
this.processorRemark = processorRemark;
|
||||
}
|
||||
|
||||
public String getNewMetadata() {
|
||||
return newMetadata;
|
||||
}
|
||||
|
||||
public void setNewMetadata(String newMetadata) {
|
||||
this.newMetadata = newMetadata;
|
||||
}
|
||||
|
||||
public String getRepairPust() {
|
||||
return repairPust;
|
||||
}
|
||||
|
||||
public void setRepairPust(String repairPust) {
|
||||
this.repairPust = repairPust;
|
||||
}
|
||||
|
||||
public String getCompanyId() {
|
||||
return companyId;
|
||||
}
|
||||
|
||||
public void setCompanyId(String companyId) {
|
||||
this.companyId = companyId;
|
||||
public void setNewSystemPrimary(String newSystemPrimary) {
|
||||
this.newSystemPrimary = newSystemPrimary;
|
||||
}
|
||||
|
||||
public String getRemark() {
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?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.hzya.frame.sysnew.integrationTaskLogDetails.dao.impl.IntegrationTaskLogDetailsDaoImpl">
|
||||
<mapper namespace="com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.impl.IntegrationTaskLivingDetailsDaoImpl">
|
||||
|
||||
<resultMap id="get-IntegrationTaskLogDetailsEntity-result" type="com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity" >
|
||||
<resultMap id="get-IntegrationTaskLivingDetailsEntity-result" type="com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity" >
|
||||
<result property="id" column="id" jdbcType="VARCHAR"/>
|
||||
<result property="taskLinvingId" column="task_linving_id" jdbcType="VARCHAR"/>
|
||||
<result property="result" column="result" jdbcType="VARCHAR"/>
|
||||
|
|
@ -12,22 +12,23 @@
|
|||
<result property="rootAppNewData" column="root_app_new_data" jdbcType="VARCHAR"/>
|
||||
<result property="newTransmitInfo" column="new_transmit_info" jdbcType="VARCHAR"/>
|
||||
<result property="newPushDate" column="new_push_date" jdbcType="TIMESTAMP"/>
|
||||
<result property="rootAppCode" column="root_app_code" jdbcType="VARCHAR"/>
|
||||
<result property="businessTime" column="business_time" jdbcType="VARCHAR"/>
|
||||
<result property="newPushState" column="new_push_state" jdbcType="VARCHAR"/>
|
||||
<result property="processor" column="processor" jdbcType="VARCHAR"/>
|
||||
<result property="processorTime" column="processor_time" jdbcType="VARCHAR"/>
|
||||
<result property="processorRemark" column="processor_remark" jdbcType="VARCHAR"/>
|
||||
<result property="newMetadata" column="new_metadata" jdbcType="VARCHAR"/>
|
||||
<result property="repairPust" column="repair_pust" jdbcType="VARCHAR"/>
|
||||
<result property="sorts" column="sorts" jdbcType="INTEGER"/>
|
||||
<result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
|
||||
<result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
|
||||
<result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
|
||||
<result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
|
||||
<result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
|
||||
<result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
|
||||
<result property="sts" column="sts" jdbcType="VARCHAR"/>
|
||||
<result property="org_id" column="org_id" jdbcType="VARCHAR"/>
|
||||
<result property="companyId" column="company_id" jdbcType="VARCHAR"/>
|
||||
<result property="sorts" column="sorts" jdbcType="INTEGER"/>
|
||||
<result property="senceId" column="sence_id" jdbcType="VARCHAR"/>
|
||||
<result property="newState" column="new_state" jdbcType="VARCHAR"/>
|
||||
<result property="businessDate" column="business_date" jdbcType="VARCHAR"/>
|
||||
<result property="pluginId" column="plugin_id" jdbcType="VARCHAR"/>
|
||||
<result property="processingTime" column="processing_time" jdbcType="TIMESTAMP"/>
|
||||
<result property="processingRemarks" column="processing_remarks" jdbcType="VARCHAR"/>
|
||||
<result property="processorName" column="processor_name" jdbcType="VARCHAR"/>
|
||||
<result property="processor" column="processor" jdbcType="VARCHAR"/>
|
||||
<result property="newSystemNumber" column="new_system_number" jdbcType="VARCHAR"/>
|
||||
<result property="newSystemPrimary" column="new_system_primary" jdbcType="VARCHAR"/>
|
||||
<result property="remark" column="remark" jdbcType="VARCHAR"/>
|
||||
<result property="def1" column="def1" jdbcType="VARCHAR"/>
|
||||
<result property="def2" column="def2" jdbcType="VARCHAR"/>
|
||||
|
|
@ -36,7 +37,7 @@
|
|||
<result property="def5" column="def5" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
<!-- 查询的字段-->
|
||||
<sql id = "IntegrationTaskLogDetailsEntity_Base_Column_List">
|
||||
<sql id = "IntegrationTaskLivingDetailsEntity_Base_Column_List">
|
||||
id
|
||||
,task_linving_id
|
||||
,result
|
||||
|
|
@ -46,22 +47,23 @@
|
|||
,root_app_new_data
|
||||
,new_transmit_info
|
||||
,new_push_date
|
||||
,root_app_code
|
||||
,business_time
|
||||
,new_push_state
|
||||
,processor
|
||||
,processor_time
|
||||
,processor_remark
|
||||
,new_metadata
|
||||
,repair_pust
|
||||
,sorts
|
||||
,create_user_id
|
||||
,create_time
|
||||
,modify_user_id
|
||||
,create_user_id
|
||||
,modify_time
|
||||
,modify_user_id
|
||||
,sts
|
||||
,org_id
|
||||
,company_id
|
||||
,sorts
|
||||
,sence_id
|
||||
,new_state
|
||||
,business_date
|
||||
,plugin_id
|
||||
,processing_time
|
||||
,processing_remarks
|
||||
,processor_name
|
||||
,processor
|
||||
,new_system_number
|
||||
,new_system_primary
|
||||
,remark
|
||||
,def1
|
||||
,def2
|
||||
|
|
@ -70,10 +72,10 @@
|
|||
,def5
|
||||
</sql>
|
||||
<!-- 查询 采用==查询 -->
|
||||
<select id="entity_list_base" resultMap="get-IntegrationTaskLogDetailsEntity-result" parameterType = "com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity">
|
||||
<select id="entity_list_base" resultMap="get-IntegrationTaskLivingDetailsEntity-result" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity">
|
||||
select
|
||||
<include refid="IntegrationTaskLogDetailsEntity_Base_Column_List" />
|
||||
from integration_task_log_details
|
||||
<include refid="IntegrationTaskLivingDetailsEntity_Base_Column_List" />
|
||||
from integration_task_living_details
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<if test="id != null and id != ''"> and id = #{id} </if>
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''"> and task_linving_id = #{taskLinvingId} </if>
|
||||
|
|
@ -84,22 +86,23 @@
|
|||
<if test="rootAppNewData != null and rootAppNewData != ''"> and root_app_new_data = #{rootAppNewData} </if>
|
||||
<if test="newTransmitInfo != null and newTransmitInfo != ''"> and new_transmit_info = #{newTransmitInfo} </if>
|
||||
<if test="newPushDate != null"> and new_push_date = #{newPushDate} </if>
|
||||
<if test="rootAppCode != null and rootAppCode != ''"> and root_app_code = #{rootAppCode} </if>
|
||||
<if test="businessTime != null and businessTime != ''"> and business_time = #{businessTime} </if>
|
||||
<if test="newPushState != null and newPushState != ''"> and new_push_state = #{newPushState} </if>
|
||||
<if test="processor != null and processor != ''"> and processor = #{processor} </if>
|
||||
<if test="processorTime != null and processorTime != ''"> and processor_time = #{processorTime} </if>
|
||||
<if test="processorRemark != null and processorRemark != ''"> and processor_remark = #{processorRemark} </if>
|
||||
<if test="newMetadata != null and newMetadata != ''"> and new_metadata = #{newMetadata} </if>
|
||||
<if test="repairPust != null and repairPust != ''"> and repair_pust = #{repairPust} </if>
|
||||
<if test="sorts != null"> and sorts = #{sorts} </if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
|
||||
<if test="create_time != null"> and create_time = #{create_time} </if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
|
||||
<if test="modify_time != null"> and modify_time = #{modify_time} </if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
|
||||
<if test="sts != null and sts != ''"> and sts = #{sts} </if>
|
||||
<if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
|
||||
<if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
|
||||
<if test="sorts != null"> and sorts = #{sorts} </if>
|
||||
<if test="senceId != null and senceId != ''"> and sence_id = #{senceId} </if>
|
||||
<if test="newState != null and newState != ''"> and new_state = #{newState} </if>
|
||||
<if test="businessDate != null and businessDate != ''"> and business_date = #{businessDate} </if>
|
||||
<if test="pluginId != null and pluginId != ''"> and plugin_id = #{pluginId} </if>
|
||||
<if test="processingTime != null"> and processing_time = #{processingTime} </if>
|
||||
<if test="processingRemarks != null and processingRemarks != ''"> and processing_remarks = #{processingRemarks} </if>
|
||||
<if test="processorName != null and processorName != ''"> and processor_name = #{processorName} </if>
|
||||
<if test="processor != null and processor != ''"> and processor = #{processor} </if>
|
||||
<if test="newSystemNumber != null and newSystemNumber != ''"> and new_system_number = #{newSystemNumber} </if>
|
||||
<if test="newSystemPrimary != null and newSystemPrimary != ''"> and new_system_primary = #{newSystemPrimary} </if>
|
||||
<if test="remark != null and remark != ''"> and remark = #{remark} </if>
|
||||
<if test="def1 != null and def1 != ''"> and def1 = #{def1} </if>
|
||||
<if test="def2 != null and def2 != ''"> and def2 = #{def2} </if>
|
||||
|
|
@ -113,8 +116,8 @@
|
|||
</select>
|
||||
|
||||
<!-- 查询符合条件的数量 -->
|
||||
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity">
|
||||
select count(1) from integration_task_log_details
|
||||
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity">
|
||||
select count(1) from integration_task_living_details
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<if test="id != null and id != ''"> and id = #{id} </if>
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''"> and task_linving_id = #{taskLinvingId} </if>
|
||||
|
|
@ -125,22 +128,23 @@
|
|||
<if test="rootAppNewData != null and rootAppNewData != ''"> and root_app_new_data = #{rootAppNewData} </if>
|
||||
<if test="newTransmitInfo != null and newTransmitInfo != ''"> and new_transmit_info = #{newTransmitInfo} </if>
|
||||
<if test="newPushDate != null"> and new_push_date = #{newPushDate} </if>
|
||||
<if test="rootAppCode != null and rootAppCode != ''"> and root_app_code = #{rootAppCode} </if>
|
||||
<if test="businessTime != null and businessTime != ''"> and business_time = #{businessTime} </if>
|
||||
<if test="newPushState != null and newPushState != ''"> and new_push_state = #{newPushState} </if>
|
||||
<if test="processor != null and processor != ''"> and processor = #{processor} </if>
|
||||
<if test="processorTime != null and processorTime != ''"> and processor_time = #{processorTime} </if>
|
||||
<if test="processorRemark != null and processorRemark != ''"> and processor_remark = #{processorRemark} </if>
|
||||
<if test="newMetadata != null and newMetadata != ''"> and new_metadata = #{newMetadata} </if>
|
||||
<if test="repairPust != null and repairPust != ''"> and repair_pust = #{repairPust} </if>
|
||||
<if test="sorts != null"> and sorts = #{sorts} </if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
|
||||
<if test="create_time != null"> and create_time = #{create_time} </if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> and create_user_id = #{create_user_id} </if>
|
||||
<if test="modify_time != null"> and modify_time = #{modify_time} </if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id = #{modify_user_id} </if>
|
||||
<if test="sts != null and sts != ''"> and sts = #{sts} </if>
|
||||
<if test="org_id != null and org_id != ''"> and org_id = #{org_id} </if>
|
||||
<if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
|
||||
<if test="sorts != null"> and sorts = #{sorts} </if>
|
||||
<if test="senceId != null and senceId != ''"> and sence_id = #{senceId} </if>
|
||||
<if test="newState != null and newState != ''"> and new_state = #{newState} </if>
|
||||
<if test="businessDate != null and businessDate != ''"> and business_date = #{businessDate} </if>
|
||||
<if test="pluginId != null and pluginId != ''"> and plugin_id = #{pluginId} </if>
|
||||
<if test="processingTime != null"> and processing_time = #{processingTime} </if>
|
||||
<if test="processingRemarks != null and processingRemarks != ''"> and processing_remarks = #{processingRemarks} </if>
|
||||
<if test="processorName != null and processorName != ''"> and processor_name = #{processorName} </if>
|
||||
<if test="processor != null and processor != ''"> and processor = #{processor} </if>
|
||||
<if test="newSystemNumber != null and newSystemNumber != ''"> and new_system_number = #{newSystemNumber} </if>
|
||||
<if test="newSystemPrimary != null and newSystemPrimary != ''"> and new_system_primary = #{newSystemPrimary} </if>
|
||||
<if test="remark != null and remark != ''"> and remark = #{remark} </if>
|
||||
<if test="def1 != null and def1 != ''"> and def1 = #{def1} </if>
|
||||
<if test="def2 != null and def2 != ''"> and def2 = #{def2} </if>
|
||||
|
|
@ -154,10 +158,10 @@
|
|||
</select>
|
||||
|
||||
<!-- 分页查询列表 采用like格式 -->
|
||||
<select id="entity_list_like" resultMap="get-IntegrationTaskLogDetailsEntity-result" parameterType = "com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity">
|
||||
<select id="entity_list_like" resultMap="get-IntegrationTaskLivingDetailsEntity-result" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity">
|
||||
select
|
||||
<include refid="IntegrationTaskLogDetailsEntity_Base_Column_List" />
|
||||
from integration_task_log_details
|
||||
<include refid="IntegrationTaskLivingDetailsEntity_Base_Column_List" />
|
||||
from integration_task_living_details
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<if test="id != null and id != ''"> and id like concat('%',#{id},'%') </if>
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''"> and task_linving_id like concat('%',#{taskLinvingId},'%') </if>
|
||||
|
|
@ -168,22 +172,23 @@
|
|||
<if test="rootAppNewData != null and rootAppNewData != ''"> and root_app_new_data like concat('%',#{rootAppNewData},'%') </if>
|
||||
<if test="newTransmitInfo != null and newTransmitInfo != ''"> and new_transmit_info like concat('%',#{newTransmitInfo},'%') </if>
|
||||
<if test="newPushDate != null"> and new_push_date like concat('%',#{newPushDate},'%') </if>
|
||||
<if test="rootAppCode != null and rootAppCode != ''"> and root_app_code like concat('%',#{rootAppCode},'%') </if>
|
||||
<if test="businessTime != null and businessTime != ''"> and business_time like concat('%',#{businessTime},'%') </if>
|
||||
<if test="newPushState != null and newPushState != ''"> and new_push_state like concat('%',#{newPushState},'%') </if>
|
||||
<if test="processor != null and processor != ''"> and processor like concat('%',#{processor},'%') </if>
|
||||
<if test="processorTime != null and processorTime != ''"> and processor_time like concat('%',#{processorTime},'%') </if>
|
||||
<if test="processorRemark != null and processorRemark != ''"> and processor_remark like concat('%',#{processorRemark},'%') </if>
|
||||
<if test="newMetadata != null and newMetadata != ''"> and new_metadata like concat('%',#{newMetadata},'%') </if>
|
||||
<if test="repairPust != null and repairPust != ''"> and repair_pust like concat('%',#{repairPust},'%') </if>
|
||||
<if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
|
||||
<if test="create_time != null"> and create_time like concat('%',#{create_time},'%') </if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> and create_user_id like concat('%',#{create_user_id},'%') </if>
|
||||
<if test="modify_time != null"> and modify_time like concat('%',#{modify_time},'%') </if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> and modify_user_id like concat('%',#{modify_user_id},'%') </if>
|
||||
<if test="sts != null and sts != ''"> and sts like concat('%',#{sts},'%') </if>
|
||||
<if test="org_id != null and org_id != ''"> and org_id like concat('%',#{org_id},'%') </if>
|
||||
<if test="companyId != null and companyId != ''"> and company_id like concat('%',#{companyId},'%') </if>
|
||||
<if test="sorts != null"> and sorts like concat('%',#{sorts},'%') </if>
|
||||
<if test="senceId != null and senceId != ''"> and sence_id like concat('%',#{senceId},'%') </if>
|
||||
<if test="newState != null and newState != ''"> and new_state like concat('%',#{newState},'%') </if>
|
||||
<if test="businessDate != null and businessDate != ''"> and business_date like concat('%',#{businessDate},'%') </if>
|
||||
<if test="pluginId != null and pluginId != ''"> and plugin_id like concat('%',#{pluginId},'%') </if>
|
||||
<if test="processingTime != null"> and processing_time like concat('%',#{processingTime},'%') </if>
|
||||
<if test="processingRemarks != null and processingRemarks != ''"> and processing_remarks like concat('%',#{processingRemarks},'%') </if>
|
||||
<if test="processorName != null and processorName != ''"> and processor_name like concat('%',#{processorName},'%') </if>
|
||||
<if test="processor != null and processor != ''"> and processor like concat('%',#{processor},'%') </if>
|
||||
<if test="newSystemNumber != null and newSystemNumber != ''"> and new_system_number like concat('%',#{newSystemNumber},'%') </if>
|
||||
<if test="newSystemPrimary != null and newSystemPrimary != ''"> and new_system_primary like concat('%',#{newSystemPrimary},'%') </if>
|
||||
<if test="remark != null and remark != ''"> and remark like concat('%',#{remark},'%') </if>
|
||||
<if test="def1 != null and def1 != ''"> and def1 like concat('%',#{def1},'%') </if>
|
||||
<if test="def2 != null and def2 != ''"> and def2 like concat('%',#{def2},'%') </if>
|
||||
|
|
@ -197,10 +202,10 @@
|
|||
</select>
|
||||
|
||||
<!-- 查询列表 字段采用or格式 -->
|
||||
<select id="IntegrationTaskLogDetailsentity_list_or" resultMap="get-IntegrationTaskLogDetailsEntity-result" parameterType = "com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity">
|
||||
<select id="IntegrationTaskLivingDetailsentity_list_or" resultMap="get-IntegrationTaskLivingDetailsEntity-result" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity">
|
||||
select
|
||||
<include refid="IntegrationTaskLogDetailsEntity_Base_Column_List" />
|
||||
from integration_task_log_details
|
||||
<include refid="IntegrationTaskLivingDetailsEntity_Base_Column_List" />
|
||||
from integration_task_living_details
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<if test="id != null and id != ''"> or id = #{id} </if>
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''"> or task_linving_id = #{taskLinvingId} </if>
|
||||
|
|
@ -211,22 +216,23 @@
|
|||
<if test="rootAppNewData != null and rootAppNewData != ''"> or root_app_new_data = #{rootAppNewData} </if>
|
||||
<if test="newTransmitInfo != null and newTransmitInfo != ''"> or new_transmit_info = #{newTransmitInfo} </if>
|
||||
<if test="newPushDate != null"> or new_push_date = #{newPushDate} </if>
|
||||
<if test="rootAppCode != null and rootAppCode != ''"> or root_app_code = #{rootAppCode} </if>
|
||||
<if test="businessTime != null and businessTime != ''"> or business_time = #{businessTime} </if>
|
||||
<if test="newPushState != null and newPushState != ''"> or new_push_state = #{newPushState} </if>
|
||||
<if test="processor != null and processor != ''"> or processor = #{processor} </if>
|
||||
<if test="processorTime != null and processorTime != ''"> or processor_time = #{processorTime} </if>
|
||||
<if test="processorRemark != null and processorRemark != ''"> or processor_remark = #{processorRemark} </if>
|
||||
<if test="newMetadata != null and newMetadata != ''"> or new_metadata = #{newMetadata} </if>
|
||||
<if test="repairPust != null and repairPust != ''"> or repair_pust = #{repairPust} </if>
|
||||
<if test="sorts != null"> or sorts = #{sorts} </if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
|
||||
<if test="create_time != null"> or create_time = #{create_time} </if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
|
||||
<if test="create_time != null"> or create_time = #{create_time} </if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> or create_user_id = #{create_user_id} </if>
|
||||
<if test="modify_time != null"> or modify_time = #{modify_time} </if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> or modify_user_id = #{modify_user_id} </if>
|
||||
<if test="sts != null and sts != ''"> or sts = #{sts} </if>
|
||||
<if test="org_id != null and org_id != ''"> or org_id = #{org_id} </if>
|
||||
<if test="companyId != null and companyId != ''"> or company_id = #{companyId} </if>
|
||||
<if test="sorts != null"> or sorts = #{sorts} </if>
|
||||
<if test="senceId != null and senceId != ''"> or sence_id = #{senceId} </if>
|
||||
<if test="newState != null and newState != ''"> or new_state = #{newState} </if>
|
||||
<if test="businessDate != null and businessDate != ''"> or business_date = #{businessDate} </if>
|
||||
<if test="pluginId != null and pluginId != ''"> or plugin_id = #{pluginId} </if>
|
||||
<if test="processingTime != null"> or processing_time = #{processingTime} </if>
|
||||
<if test="processingRemarks != null and processingRemarks != ''"> or processing_remarks = #{processingRemarks} </if>
|
||||
<if test="processorName != null and processorName != ''"> or processor_name = #{processorName} </if>
|
||||
<if test="processor != null and processor != ''"> or processor = #{processor} </if>
|
||||
<if test="newSystemNumber != null and newSystemNumber != ''"> or new_system_number = #{newSystemNumber} </if>
|
||||
<if test="newSystemPrimary != null and newSystemPrimary != ''"> or new_system_primary = #{newSystemPrimary} </if>
|
||||
<if test="remark != null and remark != ''"> or remark = #{remark} </if>
|
||||
<if test="def1 != null and def1 != ''"> or def1 = #{def1} </if>
|
||||
<if test="def2 != null and def2 != ''"> or def2 = #{def2} </if>
|
||||
|
|
@ -240,8 +246,8 @@
|
|||
</select>
|
||||
|
||||
<!--新增所有列-->
|
||||
<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity" >
|
||||
insert into integration_task_log_details(
|
||||
<insert id="entity_insert" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity" >
|
||||
insert into integration_task_living_details(
|
||||
<trim suffix="" suffixOverrides=",">
|
||||
<if test="id != null and id != ''"> id , </if>
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''"> task_linving_id , </if>
|
||||
|
|
@ -252,22 +258,23 @@
|
|||
<if test="rootAppNewData != null and rootAppNewData != ''"> root_app_new_data , </if>
|
||||
<if test="newTransmitInfo != null and newTransmitInfo != ''"> new_transmit_info , </if>
|
||||
<if test="newPushDate != null"> new_push_date , </if>
|
||||
<if test="rootAppCode != null and rootAppCode != ''"> root_app_code , </if>
|
||||
<if test="businessTime != null and businessTime != ''"> business_time , </if>
|
||||
<if test="newPushState != null and newPushState != ''"> new_push_state , </if>
|
||||
<if test="processor != null and processor != ''"> processor , </if>
|
||||
<if test="processorTime != null and processorTime != ''"> processor_time , </if>
|
||||
<if test="processorRemark != null and processorRemark != ''"> processor_remark , </if>
|
||||
<if test="newMetadata != null and newMetadata != ''"> new_metadata , </if>
|
||||
<if test="repairPust != null and repairPust != ''"> repair_pust , </if>
|
||||
<if test="sorts != null"> sorts , </if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
|
||||
<if test="create_time != null"> create_time , </if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> create_user_id , </if>
|
||||
<if test="modify_time != null"> modify_time , </if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> modify_user_id , </if>
|
||||
<if test="sts != null and sts != ''"> sts , </if>
|
||||
<if test="org_id != null and org_id != ''"> org_id , </if>
|
||||
<if test="companyId != null and companyId != ''"> company_id , </if>
|
||||
<if test="sorts != null"> sorts , </if>
|
||||
<if test="senceId != null and senceId != ''"> sence_id , </if>
|
||||
<if test="newState != null and newState != ''"> new_state , </if>
|
||||
<if test="businessDate != null and businessDate != ''"> business_date , </if>
|
||||
<if test="pluginId != null and pluginId != ''"> plugin_id , </if>
|
||||
<if test="processingTime != null"> processing_time , </if>
|
||||
<if test="processingRemarks != null and processingRemarks != ''"> processing_remarks , </if>
|
||||
<if test="processorName != null and processorName != ''"> processor_name , </if>
|
||||
<if test="processor != null and processor != ''"> processor , </if>
|
||||
<if test="newSystemNumber != null and newSystemNumber != ''"> new_system_number , </if>
|
||||
<if test="newSystemPrimary != null and newSystemPrimary != ''"> new_system_primary , </if>
|
||||
<if test="remark != null and remark != ''"> remark , </if>
|
||||
<if test="def1 != null and def1 != ''"> def1 , </if>
|
||||
<if test="def2 != null and def2 != ''"> def2 , </if>
|
||||
|
|
@ -288,47 +295,48 @@
|
|||
<if test="rootAppNewData != null and rootAppNewData != ''"> #{rootAppNewData} ,</if>
|
||||
<if test="newTransmitInfo != null and newTransmitInfo != ''"> #{newTransmitInfo} ,</if>
|
||||
<if test="newPushDate != null"> #{newPushDate} ,</if>
|
||||
<if test="rootAppCode != null and rootAppCode != ''"> #{rootAppCode} ,</if>
|
||||
<if test="businessTime != null and businessTime != ''"> #{businessTime} ,</if>
|
||||
<if test="newPushState != null and newPushState != ''"> #{newPushState} ,</if>
|
||||
<if test="processor != null and processor != ''"> #{processor} ,</if>
|
||||
<if test="processorTime != null and processorTime != ''"> #{processorTime} ,</if>
|
||||
<if test="processorRemark != null and processorRemark != ''"> #{processorRemark} ,</if>
|
||||
<if test="newMetadata != null and newMetadata != ''"> #{newMetadata} ,</if>
|
||||
<if test="repairPust != null and repairPust != ''"> #{repairPust} ,</if>
|
||||
<if test="sorts != null"> #{sorts} ,</if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
|
||||
<if test="create_time != null"> #{create_time} ,</if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> #{create_user_id} ,</if>
|
||||
<if test="modify_time != null"> #{modify_time} ,</if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> #{modify_user_id} ,</if>
|
||||
<if test="sts != null and sts != ''"> #{sts} ,</if>
|
||||
<if test="org_id != null and org_id != ''"> #{org_id} ,</if>
|
||||
<if test="companyId != null and companyId != ''"> #{companyId} ,</if>
|
||||
<if test="sorts != null"> #{sorts} ,</if>
|
||||
<if test="senceId != null and senceId != ''"> #{senceId} ,</if>
|
||||
<if test="newState != null and newState != ''"> #{newState} ,</if>
|
||||
<if test="businessDate != null and businessDate != ''"> #{businessDate} ,</if>
|
||||
<if test="pluginId != null and pluginId != ''"> #{pluginId} ,</if>
|
||||
<if test="processingTime != null"> #{processingTime} ,</if>
|
||||
<if test="processingRemarks != null and processingRemarks != ''"> #{processingRemarks} ,</if>
|
||||
<if test="processorName != null and processorName != ''"> #{processorName} ,</if>
|
||||
<if test="processor != null and processor != ''"> #{processor} ,</if>
|
||||
<if test="newSystemNumber != null and newSystemNumber != ''"> #{newSystemNumber} ,</if>
|
||||
<if test="newSystemPrimary != null and newSystemPrimary != ''"> #{newSystemPrimary} ,</if>
|
||||
<if test="remark != null and remark != ''"> #{remark} ,</if>
|
||||
<if test="def1 != null and def1 != ''"> #{def1} ,</if>
|
||||
<if test="def2 != null and def2 != ''"> #{def2} ,</if>
|
||||
<if test="def3 != null and def3 != ''"> #{def3} ,</if>
|
||||
<if test="def4 != null and def4 != ''"> #{def4} ,</if>
|
||||
<if test="def5 != null and def5 != ''"> #{def5} ,</if>
|
||||
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_log_details a WHERE a.sts = 'Y' ),</if>
|
||||
<if test="sorts == null ">(select (max(IFNULL( a.sorts, 0 )) + 1) as sort from integration_task_living_details a WHERE a.sts = 'Y' ),</if>
|
||||
<if test="sts == null ">'Y',</if>
|
||||
</trim>
|
||||
)
|
||||
</insert>
|
||||
<!-- 批量新增 -->
|
||||
<insert id="entityInsertBatch" >
|
||||
insert into integration_task_log_details(task_linving_id, result, query_condition, root_app_pk, root_app_bill, root_app_new_data, new_transmit_info, new_push_date, root_app_code, business_time, new_push_state, processor, processor_time, processor_remark, new_metadata, repair_pust, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, remark, def1, def2, def3, def4, def5, sts)
|
||||
<insert id="entityInsertBatch" >
|
||||
insert into integration_task_living_details(task_linving_id, result, query_condition, root_app_pk, root_app_bill, root_app_new_data, new_transmit_info, new_push_date, repair_pust, create_time, create_user_id, modify_time, modify_user_id, sts, sence_id, new_state, business_date, plugin_id, processing_time, processing_remarks, processor_name, processor, new_system_number, new_system_primary, remark, def1, def2, def3, def4, def5, sts)
|
||||
values
|
||||
<foreach collection="entities" item="entity" separator=",">
|
||||
(#{entity.taskLinvingId},#{entity.result},#{entity.queryCondition},#{entity.rootAppPk},#{entity.rootAppBill},#{entity.rootAppNewData},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.rootAppCode},#{entity.businessTime},#{entity.newPushState},#{entity.processor},#{entity.processorTime},#{entity.processorRemark},#{entity.newMetadata},#{entity.repairPust},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5}, 'Y')
|
||||
(#{entity.taskLinvingId},#{entity.result},#{entity.queryCondition},#{entity.rootAppPk},#{entity.rootAppBill},#{entity.rootAppNewData},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.repairPust},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id},#{entity.sts},#{entity.senceId},#{entity.newState},#{entity.businessDate},#{entity.pluginId},#{entity.processingTime},#{entity.processingRemarks},#{entity.processorName},#{entity.processor},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5}, 'Y')
|
||||
</foreach>
|
||||
</insert>
|
||||
<!-- 批量新增或者修改-->
|
||||
<insert id="entityInsertOrUpdateBatch" >
|
||||
insert into integration_task_log_details(task_linving_id, result, query_condition, root_app_pk, root_app_bill, root_app_new_data, new_transmit_info, new_push_date, root_app_code, business_time, new_push_state, processor, processor_time, processor_remark, new_metadata, repair_pust, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, remark, def1, def2, def3, def4, def5)
|
||||
<insert id="entityInsertOrUpdateBatch" >
|
||||
insert into integration_task_living_details(task_linving_id, result, query_condition, root_app_pk, root_app_bill, root_app_new_data, new_transmit_info, new_push_date, repair_pust, create_time, create_user_id, modify_time, modify_user_id, sts, sence_id, new_state, business_date, plugin_id, processing_time, processing_remarks, processor_name, processor, new_system_number, new_system_primary, remark, def1, def2, def3, def4, def5)
|
||||
values
|
||||
<foreach collection="entities" item="entity" separator=",">
|
||||
(#{entity.taskLinvingId},#{entity.result},#{entity.queryCondition},#{entity.rootAppPk},#{entity.rootAppBill},#{entity.rootAppNewData},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.rootAppCode},#{entity.businessTime},#{entity.newPushState},#{entity.processor},#{entity.processorTime},#{entity.processorRemark},#{entity.newMetadata},#{entity.repairPust},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5})
|
||||
(#{entity.taskLinvingId},#{entity.result},#{entity.queryCondition},#{entity.rootAppPk},#{entity.rootAppBill},#{entity.rootAppNewData},#{entity.newTransmitInfo},#{entity.newPushDate},#{entity.repairPust},#{entity.create_time},#{entity.create_user_id},#{entity.modify_time},#{entity.modify_user_id},#{entity.sts},#{entity.senceId},#{entity.newState},#{entity.businessDate},#{entity.pluginId},#{entity.processingTime},#{entity.processingRemarks},#{entity.processorName},#{entity.processor},#{entity.newSystemNumber},#{entity.newSystemPrimary},#{entity.remark},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5})
|
||||
</foreach>
|
||||
on duplicate key update
|
||||
task_linving_id = values(task_linving_id),
|
||||
|
|
@ -339,21 +347,22 @@
|
|||
root_app_new_data = values(root_app_new_data),
|
||||
new_transmit_info = values(new_transmit_info),
|
||||
new_push_date = values(new_push_date),
|
||||
root_app_code = values(root_app_code),
|
||||
business_time = values(business_time),
|
||||
new_push_state = values(new_push_state),
|
||||
processor = values(processor),
|
||||
processor_time = values(processor_time),
|
||||
processor_remark = values(processor_remark),
|
||||
new_metadata = values(new_metadata),
|
||||
repair_pust = values(repair_pust),
|
||||
create_user_id = values(create_user_id),
|
||||
create_time = values(create_time),
|
||||
modify_user_id = values(modify_user_id),
|
||||
create_user_id = values(create_user_id),
|
||||
modify_time = values(modify_time),
|
||||
modify_user_id = values(modify_user_id),
|
||||
sts = values(sts),
|
||||
org_id = values(org_id),
|
||||
company_id = values(company_id),
|
||||
sence_id = values(sence_id),
|
||||
new_state = values(new_state),
|
||||
business_date = values(business_date),
|
||||
plugin_id = values(plugin_id),
|
||||
processing_time = values(processing_time),
|
||||
processing_remarks = values(processing_remarks),
|
||||
processor_name = values(processor_name),
|
||||
processor = values(processor),
|
||||
new_system_number = values(new_system_number),
|
||||
new_system_primary = values(new_system_primary),
|
||||
remark = values(remark),
|
||||
def1 = values(def1),
|
||||
def2 = values(def2),
|
||||
|
|
@ -361,8 +370,8 @@
|
|||
def4 = values(def4),
|
||||
def5 = values(def5)</insert>
|
||||
<!--通过主键修改方法-->
|
||||
<update id="entity_update" parameterType = "com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity" >
|
||||
update integration_task_log_details set
|
||||
<update id="entity_update" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity" >
|
||||
update integration_task_living_details set
|
||||
<trim suffix="" suffixOverrides=",">
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''"> task_linving_id = #{taskLinvingId},</if>
|
||||
<if test="result != null and result != ''"> result = #{result},</if>
|
||||
|
|
@ -372,21 +381,22 @@ update integration_task_log_details set
|
|||
<if test="rootAppNewData != null and rootAppNewData != ''"> root_app_new_data = #{rootAppNewData},</if>
|
||||
<if test="newTransmitInfo != null and newTransmitInfo != ''"> new_transmit_info = #{newTransmitInfo},</if>
|
||||
<if test="newPushDate != null"> new_push_date = #{newPushDate},</if>
|
||||
<if test="rootAppCode != null and rootAppCode != ''"> root_app_code = #{rootAppCode},</if>
|
||||
<if test="businessTime != null and businessTime != ''"> business_time = #{businessTime},</if>
|
||||
<if test="newPushState != null and newPushState != ''"> new_push_state = #{newPushState},</if>
|
||||
<if test="processor != null and processor != ''"> processor = #{processor},</if>
|
||||
<if test="processorTime != null and processorTime != ''"> processor_time = #{processorTime},</if>
|
||||
<if test="processorRemark != null and processorRemark != ''"> processor_remark = #{processorRemark},</if>
|
||||
<if test="newMetadata != null and newMetadata != ''"> new_metadata = #{newMetadata},</if>
|
||||
<if test="repairPust != null and repairPust != ''"> repair_pust = #{repairPust},</if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
|
||||
<if test="create_time != null"> create_time = #{create_time},</if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
|
||||
<if test="create_time != null"> create_time = #{create_time},</if>
|
||||
<if test="create_user_id != null and create_user_id != ''"> create_user_id = #{create_user_id},</if>
|
||||
<if test="modify_time != null"> modify_time = #{modify_time},</if>
|
||||
<if test="modify_user_id != null and modify_user_id != ''"> modify_user_id = #{modify_user_id},</if>
|
||||
<if test="sts != null and sts != ''"> sts = #{sts},</if>
|
||||
<if test="org_id != null and org_id != ''"> org_id = #{org_id},</if>
|
||||
<if test="companyId != null and companyId != ''"> company_id = #{companyId},</if>
|
||||
<if test="senceId != null and senceId != ''"> sence_id = #{senceId},</if>
|
||||
<if test="newState != null and newState != ''"> new_state = #{newState},</if>
|
||||
<if test="businessDate != null and businessDate != ''"> business_date = #{businessDate},</if>
|
||||
<if test="pluginId != null and pluginId != ''"> plugin_id = #{pluginId},</if>
|
||||
<if test="processingTime != null"> processing_time = #{processingTime},</if>
|
||||
<if test="processingRemarks != null and processingRemarks != ''"> processing_remarks = #{processingRemarks},</if>
|
||||
<if test="processorName != null and processorName != ''"> processor_name = #{processorName},</if>
|
||||
<if test="processor != null and processor != ''"> processor = #{processor},</if>
|
||||
<if test="newSystemNumber != null and newSystemNumber != ''"> new_system_number = #{newSystemNumber},</if>
|
||||
<if test="newSystemPrimary != null and newSystemPrimary != ''"> new_system_primary = #{newSystemPrimary},</if>
|
||||
<if test="remark != null and remark != ''"> remark = #{remark},</if>
|
||||
<if test="def1 != null and def1 != ''"> def1 = #{def1},</if>
|
||||
<if test="def2 != null and def2 != ''"> def2 = #{def2},</if>
|
||||
|
|
@ -397,13 +407,13 @@ update integration_task_log_details set
|
|||
where id = #{id}
|
||||
</update>
|
||||
<!-- 逻辑删除 -->
|
||||
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity" >
|
||||
update integration_task_log_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
|
||||
<update id="entity_logicDelete" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity" >
|
||||
update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
|
||||
where id = #{id}
|
||||
</update>
|
||||
<!-- 多条件逻辑删除 -->
|
||||
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.integrationTaskLogDetails.entity.IntegrationTaskLogDetailsEntity" >
|
||||
update integration_task_log_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
|
||||
<update id="entity_logicDelete_Multi_Condition" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity" >
|
||||
update integration_task_living_details set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<if test="id != null and id != ''"> and id = #{id} </if>
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''"> and task_linving_id = #{taskLinvingId} </if>
|
||||
|
|
@ -414,17 +424,19 @@ update integration_task_log_details set sts= 'N' ,modify_time = #{modify_time},
|
|||
<if test="rootAppNewData != null and rootAppNewData != ''"> and root_app_new_data = #{rootAppNewData} </if>
|
||||
<if test="newTransmitInfo != null and newTransmitInfo != ''"> and new_transmit_info = #{newTransmitInfo} </if>
|
||||
<if test="newPushDate != null"> and new_push_date = #{newPushDate} </if>
|
||||
<if test="rootAppCode != null and rootAppCode != ''"> and root_app_code = #{rootAppCode} </if>
|
||||
<if test="businessTime != null and businessTime != ''"> and business_time = #{businessTime} </if>
|
||||
<if test="newPushState != null and newPushState != ''"> and new_push_state = #{newPushState} </if>
|
||||
<if test="processor != null and processor != ''"> and processor = #{processor} </if>
|
||||
<if test="processorTime != null and processorTime != ''"> and processor_time = #{processorTime} </if>
|
||||
<if test="processorRemark != null and processorRemark != ''"> and processor_remark = #{processorRemark} </if>
|
||||
<if test="newMetadata != null and newMetadata != ''"> and new_metadata = #{newMetadata} </if>
|
||||
<if test="repairPust != null and repairPust != ''"> and repair_pust = #{repairPust} </if>
|
||||
<if test="sorts != null"> and sorts = #{sorts} </if>
|
||||
<if test="sts != null and sts != ''"> and sts = #{sts} </if>
|
||||
<if test="companyId != null and companyId != ''"> and company_id = #{companyId} </if>
|
||||
<if test="sorts != null"> and sorts = #{sorts} </if>
|
||||
<if test="senceId != null and senceId != ''"> and sence_id = #{senceId} </if>
|
||||
<if test="newState != null and newState != ''"> and new_state = #{newState} </if>
|
||||
<if test="businessDate != null and businessDate != ''"> and business_date = #{businessDate} </if>
|
||||
<if test="pluginId != null and pluginId != ''"> and plugin_id = #{pluginId} </if>
|
||||
<if test="processingTime != null"> and processing_time = #{processingTime} </if>
|
||||
<if test="processingRemarks != null and processingRemarks != ''"> and processing_remarks = #{processingRemarks} </if>
|
||||
<if test="processorName != null and processorName != ''"> and processor_name = #{processorName} </if>
|
||||
<if test="processor != null and processor != ''"> and processor = #{processor} </if>
|
||||
<if test="newSystemNumber != null and newSystemNumber != ''"> and new_system_number = #{newSystemNumber} </if>
|
||||
<if test="newSystemPrimary != null and newSystemPrimary != ''"> and new_system_primary = #{newSystemPrimary} </if>
|
||||
<if test="remark != null and remark != ''"> and remark = #{remark} </if>
|
||||
<if test="def1 != null and def1 != ''"> and def1 = #{def1} </if>
|
||||
<if test="def2 != null and def2 != ''"> and def2 = #{def2} </if>
|
||||
|
|
@ -436,7 +448,7 @@ update integration_task_log_details set sts= 'N' ,modify_time = #{modify_time},
|
|||
</update>
|
||||
<!--通过主键删除-->
|
||||
<delete id="entity_delete">
|
||||
delete from integration_task_log_details where id = #{id}
|
||||
delete from integration_task_living_details where id = #{id}
|
||||
</delete>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
package com.hzya.frame.sysnew.integtationTaskLivingDetails.service;
|
||||
|
||||
import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
|
||||
import com.hzya.frame.basedao.service.IBaseService;
|
||||
/**
|
||||
* 集成任务-实例详情(IntegrationTaskLivingDetails)表服务接口
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-05-15 14:06:43
|
||||
*/
|
||||
public interface IIntegrationTaskLivingDetailsService extends IBaseService<IntegrationTaskLivingDetailsEntity, String>{
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
package com.hzya.frame.sysnew.integtationTaskLivingDetails.service.impl;
|
||||
|
||||
import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
|
||||
import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao;
|
||||
import com.hzya.frame.sysnew.integtationTaskLivingDetails.service.IIntegrationTaskLivingDetailsService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import javax.annotation.Resource;
|
||||
import com.hzya.frame.basedao.service.impl.BaseService;
|
||||
/**
|
||||
* 集成任务-实例详情(IntegrationTaskLivingDetails)表服务实现类
|
||||
*
|
||||
* @author makejava
|
||||
* @since 2024-05-15 14:06:46
|
||||
*/
|
||||
@Service(value = "integrationTaskLivingDetailsService")
|
||||
public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<IntegrationTaskLivingDetailsEntity, String> implements IIntegrationTaskLivingDetailsService {
|
||||
|
||||
private IIntegrationTaskLivingDetailsDao integrationTaskLivingDetailsDao;
|
||||
|
||||
@Autowired
|
||||
public void setIntegrationTaskLivingDetailsDao(IIntegrationTaskLivingDetailsDao dao) {
|
||||
this.integrationTaskLivingDetailsDao = dao;
|
||||
this.dao = dao;
|
||||
}
|
||||
}
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
<resultMap id="get-IntegrationTaskLogEntity-result"
|
||||
type="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
|
||||
<result property="id" column="id" jdbcType="VARCHAR"/>
|
||||
<result property="taskLinvingId" column="task_linving_id" jdbcType="VARCHAR"/>
|
||||
<result property="id" column="id" jdbcType="VARCHAR"/>
|
||||
<result property="taskLinvingId" column="task_linving_id" jdbcType="VARCHAR"/>
|
||||
<result property="taskId" column="task_id" jdbcType="VARCHAR"/>
|
||||
<result property="taskCode" column="task_code" jdbcType="VARCHAR"/>
|
||||
<result property="taskName" column="task_name" jdbcType="VARCHAR"/>
|
||||
|
|
@ -15,14 +15,14 @@
|
|||
<result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
|
||||
<result property="diffTime" column="diff_time" jdbcType="VARCHAR"/>
|
||||
<result property="sorts" column="sorts" jdbcType="INTEGER"/>
|
||||
<result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
|
||||
<result property="create_user_id" column="create_user_id" jdbcType="VARCHAR"/>
|
||||
<result property="create_time" column="create_time" jdbcType="TIMESTAMP"/>
|
||||
<result property="modify_user_id" column="modify_user_id" jdbcType="VARCHAR"/>
|
||||
<result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
|
||||
<result property="sts" column="sts" jdbcType="VARCHAR"/>
|
||||
<result property="modify_time" column="modify_time" jdbcType="TIMESTAMP"/>
|
||||
<result property="sts" column="sts" jdbcType="VARCHAR"/>
|
||||
<result property="org_id" column="org_id" jdbcType="VARCHAR"/>
|
||||
<result property="companyId" column="company_id" jdbcType="VARCHAR"/>
|
||||
</resultMap>
|
||||
</resultMap>
|
||||
<!-- 查询的字段-->
|
||||
<sql id="IntegrationTaskLogEntity_Base_Column_List">
|
||||
id
|
||||
|
|
@ -50,13 +50,13 @@
|
|||
<include refid="IntegrationTaskLogEntity_Base_Column_List"/>
|
||||
from integration_task_log where id = #{id} and sts = 'Y'
|
||||
</select>
|
||||
<!-- 查询 采用==查询 -->
|
||||
<!-- 查询 采用==查询 -->
|
||||
<select id="entity_list_base" resultMap="get-IntegrationTaskLogEntity-result"
|
||||
parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
|
||||
select
|
||||
select
|
||||
<include refid="IntegrationTaskLogEntity_Base_Column_List"/>
|
||||
from integration_task_log
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<if test="id != null and id != ''">and id = #{id}</if>
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''">and task_linving_id = #{taskLinvingId}</if>
|
||||
<if test="taskId != null and taskId != ''">and task_id = #{taskId}</if>
|
||||
|
|
@ -76,16 +76,16 @@
|
|||
<if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
|
||||
<if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
|
||||
and sts='Y'
|
||||
</trim>
|
||||
</trim>
|
||||
<if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
|
||||
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
|
||||
</select>
|
||||
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
|
||||
</select>
|
||||
|
||||
<!-- 查询符合条件的数量 -->
|
||||
<!-- 查询符合条件的数量 -->
|
||||
<select id="entity_count" resultType="Integer"
|
||||
parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
|
||||
select count(1) from integration_task_log
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<if test="id != null and id != ''">and id = #{id}</if>
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''">and task_linving_id = #{taskLinvingId}</if>
|
||||
<if test="taskId != null and taskId != ''">and task_id = #{taskId}</if>
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
<if test="org_id != null and org_id != ''">and org_id = #{org_id}</if>
|
||||
<if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
|
||||
and sts='Y'
|
||||
</trim>
|
||||
</trim>
|
||||
<if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
|
||||
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
|
||||
</select>
|
||||
|
|
@ -113,10 +113,10 @@
|
|||
<!-- 分页查询列表 采用like格式 -->
|
||||
<select id="entity_list_like" resultMap="get-IntegrationTaskLogEntity-result"
|
||||
parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
|
||||
select
|
||||
select
|
||||
<include refid="IntegrationTaskLogEntity_Base_Column_List"/>
|
||||
from integration_task_log
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<if test="id != null and id != ''">and id like concat('%',#{id},'%')</if>
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''">and task_linving_id like
|
||||
concat('%',#{taskLinvingId},'%')
|
||||
|
|
@ -142,18 +142,18 @@
|
|||
<if test="org_id != null and org_id != ''">and org_id like concat('%',#{org_id},'%')</if>
|
||||
<if test="companyId != null and companyId != ''">and company_id like concat('%',#{companyId},'%')</if>
|
||||
and sts='Y'
|
||||
</trim>
|
||||
</trim>
|
||||
<if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
|
||||
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
|
||||
</select>
|
||||
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
|
||||
</select>
|
||||
|
||||
<!-- 查询列表 字段采用or格式 -->
|
||||
<!-- 查询列表 字段采用or格式 -->
|
||||
<select id="IntegrationTaskLogentity_list_or" resultMap="get-IntegrationTaskLogEntity-result"
|
||||
parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
|
||||
select
|
||||
select
|
||||
<include refid="IntegrationTaskLogEntity_Base_Column_List"/>
|
||||
from integration_task_log
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<if test="id != null and id != ''">or id = #{id}</if>
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''">or task_linving_id = #{taskLinvingId}</if>
|
||||
<if test="taskId != null and taskId != ''">or task_id = #{taskId}</if>
|
||||
|
|
@ -173,16 +173,16 @@
|
|||
<if test="org_id != null and org_id != ''">or org_id = #{org_id}</if>
|
||||
<if test="companyId != null and companyId != ''">or company_id = #{companyId}</if>
|
||||
and sts='Y'
|
||||
</trim>
|
||||
</trim>
|
||||
<if test=" sort == null or sort == ''.toString() ">order by sorts asc</if>
|
||||
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
|
||||
</select>
|
||||
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
|
||||
</select>
|
||||
|
||||
<!--新增所有列-->
|
||||
<!--新增所有列-->
|
||||
<insert id="entity_insert"
|
||||
parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
|
||||
insert into integration_task_log(
|
||||
<trim suffix="" suffixOverrides=",">
|
||||
<trim suffix="" suffixOverrides=",">
|
||||
<if test="id != null and id != ''">id ,</if>
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''">task_linving_id ,</if>
|
||||
<if test="taskId != null and taskId != ''">task_id ,</if>
|
||||
|
|
@ -201,10 +201,10 @@
|
|||
<if test="sts != null and sts != ''">sts ,</if>
|
||||
<if test="org_id != null and org_id != ''">org_id ,</if>
|
||||
<if test="companyId != null and companyId != ''">company_id ,</if>
|
||||
<if test="sts == null ">sts,</if>
|
||||
</trim>
|
||||
)values(
|
||||
<trim suffix="" suffixOverrides=",">
|
||||
<if test="sts == null ">sts,</if>
|
||||
</trim>
|
||||
)values(
|
||||
<trim suffix="" suffixOverrides=",">
|
||||
<if test="id != null and id != ''">#{id} ,</if>
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''">#{taskLinvingId} ,</if>
|
||||
<if test="taskId != null and taskId != ''">#{taskId} ,</if>
|
||||
|
|
@ -224,32 +224,32 @@
|
|||
<if test="org_id != null and org_id != ''">#{org_id} ,</if>
|
||||
<if test="companyId != null and companyId != ''">#{companyId} ,</if>
|
||||
|
||||
<if test="sts == null ">'Y',</if>
|
||||
</trim>
|
||||
)
|
||||
</insert>
|
||||
<!-- 批量新增 -->
|
||||
<if test="sts == null ">'Y',</if>
|
||||
</trim>
|
||||
)
|
||||
</insert>
|
||||
<!-- 批量新增 -->
|
||||
<insert id="entityInsertBatch" >
|
||||
insert into integration_task_log(task_linving_id, task_id, task_code, task_name, remark, task_status,
|
||||
start_time, end_time, diff_time, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id,
|
||||
company_id, sts)
|
||||
values
|
||||
<foreach collection="entities" item="entity" separator=",">
|
||||
values
|
||||
<foreach collection="entities" item="entity" separator=",">
|
||||
(#{entity.taskLinvingId},#{entity.taskId},#{entity.taskCode},#{entity.taskName},#{entity.remark},#{entity.taskStatus},#{entity.startTime},#{entity.endTime},#{entity.diffTime},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},
|
||||
'Y')
|
||||
</foreach>
|
||||
</insert>
|
||||
<!-- 批量新增或者修改-->
|
||||
</foreach>
|
||||
</insert>
|
||||
<!-- 批量新增或者修改-->
|
||||
<insert id="entityInsertOrUpdateBatch" >
|
||||
insert into integration_task_log(task_linving_id, task_id, task_code, task_name, remark, task_status,
|
||||
start_time, end_time, diff_time, sorts, create_user_id, create_time, modify_user_id, modify_time, sts, org_id,
|
||||
company_id)
|
||||
values
|
||||
<foreach collection="entities" item="entity" separator=",">
|
||||
values
|
||||
<foreach collection="entities" item="entity" separator=",">
|
||||
(#{entity.taskLinvingId},#{entity.taskId},#{entity.taskCode},#{entity.taskName},#{entity.remark},#{entity.taskStatus},#{entity.startTime},#{entity.endTime},#{entity.diffTime},#{entity.sorts},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId})
|
||||
</foreach>
|
||||
on duplicate key update
|
||||
task_linving_id = values(task_linving_id),
|
||||
</foreach>
|
||||
on duplicate key update
|
||||
task_linving_id = values(task_linving_id),
|
||||
task_id = values(task_id),
|
||||
task_code = values(task_code),
|
||||
task_name = values(task_name),
|
||||
|
|
@ -260,18 +260,18 @@
|
|||
diff_time = values(diff_time),
|
||||
sorts = values(sorts),
|
||||
create_user_id = values(create_user_id),
|
||||
create_time = values(create_time),
|
||||
create_time = values(create_time),
|
||||
modify_user_id = values(modify_user_id),
|
||||
modify_time = values(modify_time),
|
||||
sts = values(sts),
|
||||
modify_time = values(modify_time),
|
||||
sts = values(sts),
|
||||
org_id = values(org_id),
|
||||
company_id = values(company_id)
|
||||
</insert>
|
||||
<!--通过主键修改方法-->
|
||||
<!--通过主键修改方法-->
|
||||
<update id="entity_update"
|
||||
parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
|
||||
update integration_task_log set
|
||||
<trim suffix="" suffixOverrides=",">
|
||||
<trim suffix="" suffixOverrides=",">
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''">task_linving_id = #{taskLinvingId},</if>
|
||||
<if test="taskId != null and taskId != ''">task_id = #{taskId},</if>
|
||||
<if test="taskCode != null and taskCode != ''">task_code = #{taskCode},</if>
|
||||
|
|
@ -289,21 +289,21 @@
|
|||
<if test="sts != null and sts != ''">sts = #{sts},</if>
|
||||
<if test="org_id != null and org_id != ''">org_id = #{org_id},</if>
|
||||
<if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
<!-- 逻辑删除 -->
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
<!-- 逻辑删除 -->
|
||||
<update id="entity_logicDelete"
|
||||
parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
|
||||
update integration_task_log set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id}
|
||||
where id = #{id}
|
||||
</update>
|
||||
<!-- 多条件逻辑删除 -->
|
||||
<!-- 多条件逻辑删除 -->
|
||||
<update id="entity_logicDelete_Multi_Condition"
|
||||
parameterType="com.hzya.frame.sysnew.integtationTaskLog.entity.IntegrationTaskLogEntity">
|
||||
update integration_task_log set sts= 'N' ,modify_time = #{modify_time},modify_user_id =
|
||||
#{modify_user_id}
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<trim prefix="where" prefixOverrides="and">
|
||||
<if test="id != null and id != ''">and id = #{id}</if>
|
||||
<if test="taskLinvingId != null and taskLinvingId != ''">and task_linving_id = #{taskLinvingId}</if>
|
||||
<if test="taskId != null and taskId != ''">and task_id = #{taskId}</if>
|
||||
|
|
@ -318,10 +318,10 @@ where id = #{id}
|
|||
<if test="sts != null and sts != ''">and sts = #{sts}</if>
|
||||
<if test="companyId != null and companyId != ''">and company_id = #{companyId}</if>
|
||||
and sts='Y'
|
||||
</trim>
|
||||
</update>
|
||||
<!--通过主键删除-->
|
||||
<delete id="entity_delete">
|
||||
</trim>
|
||||
</update>
|
||||
<!--通过主键删除-->
|
||||
<delete id="entity_delete">
|
||||
delete from integration_task_log where id = #{id}
|
||||
</delete>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue