Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
41167741
Commit
41167741
authored
Oct 22, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.16-去掉电子签的审核日志
parent
0afa14a7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
507 additions
and
139 deletions
+507
-139
TFascCompany.java
...yifu/cloud/plus/v1/yifu/archives/entity/TFascCompany.java
+91
-0
TFascTemplate.java
...ifu/cloud/plus/v1/yifu/archives/entity/TFascTemplate.java
+8
-0
TFascCompanyMapper.java
...loud/plus/v1/yifu/archives/mapper/TFascCompanyMapper.java
+39
-0
TFascCompanyService.java
...ud/plus/v1/yifu/archives/service/TFascCompanyService.java
+38
-0
FascServiceImpl.java
...d/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
+138
-94
TFascCompanyServiceImpl.java
...1/yifu/archives/service/impl/TFascCompanyServiceImpl.java
+46
-0
FascUtil.java
.../com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
+45
-43
TFascCompanyMapper.xml
...ives-biz/src/main/resources/mapper/TFascCompanyMapper.xml
+95
-0
TFascTemplateMapper.xml
...ves-biz/src/main/resources/mapper/TFascTemplateMapper.xml
+5
-0
TSocialDeadlineInfoMapper.xml
...z/src/main/resources/mapper/TSocialDeadlineInfoMapper.xml
+2
-2
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TFascCompany.java
0 → 100644
View file @
41167741
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
entity
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
org.hibernate.validator.constraints.Length
;
/**
* 法大大专业版公司信息表
*
* @author hgw
* @date 2025-10-22 17:43:17
*/
@Data
@TableName
(
"t_fasc_company"
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Schema
(
description
=
"法大大专业版公司信息表"
)
public
class
TFascCompany
extends
BaseEntity
{
/**
* id
*/
@TableId
(
type
=
IdType
.
ASSIGN_ID
)
@ExcelProperty
(
"id"
)
@Schema
(
description
=
"id"
)
private
String
id
;
/**
* 公司主体
*/
@ExcelAttribute
(
name
=
"公司主体"
,
maxLength
=
100
)
@Length
(
max
=
100
,
message
=
"公司主体不能超过100个字符"
)
@ExcelProperty
(
"公司主体"
)
@Schema
(
description
=
"公司主体"
)
private
String
companyName
;
/**
* APPID
*/
@ExcelAttribute
(
name
=
"APPID"
,
maxLength
=
100
)
@Length
(
max
=
100
,
message
=
"APPID不能超过100个字符"
)
@ExcelProperty
(
"APPID"
)
@Schema
(
description
=
"APPID"
)
private
String
appId
;
/**
* AppSecret
*/
@ExcelAttribute
(
name
=
"AppSecret"
,
maxLength
=
100
)
@Length
(
max
=
100
,
message
=
"AppSecret不能超过100个字符"
)
@ExcelProperty
(
"AppSecret"
)
@Schema
(
description
=
"AppSecret"
)
private
String
appSecret
;
/**
* AppUrl
*/
@ExcelAttribute
(
name
=
"AppUrl"
,
maxLength
=
100
)
@Length
(
max
=
100
,
message
=
"AppUrl不能超过100个字符"
)
@ExcelProperty
(
"AppUrl"
)
@Schema
(
description
=
"AppUrl"
)
private
String
appUrl
;
/**
* openId
*/
@ExcelAttribute
(
name
=
"openId"
,
maxLength
=
100
)
@Length
(
max
=
100
,
message
=
"openId不能超过100个字符"
)
@ExcelProperty
(
"openId"
)
@Schema
(
description
=
"openId"
)
private
String
openId
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TFascTemplate.java
View file @
41167741
...
@@ -51,6 +51,14 @@ public class TFascTemplate extends BaseEntity {
...
@@ -51,6 +51,14 @@ public class TFascTemplate extends BaseEntity {
@ExcelProperty
(
"id"
)
@ExcelProperty
(
"id"
)
@Schema
(
description
=
"id"
)
@Schema
(
description
=
"id"
)
private
String
id
;
private
String
id
;
/**
* 公司主体Id
*/
@ExcelAttribute
(
name
=
"公司主体Id"
,
maxLength
=
100
)
@Length
(
max
=
100
,
message
=
"公司主体Id不能超过100个字符"
)
@ExcelProperty
(
"公司主体Id"
)
@Schema
(
description
=
"公司主体Id"
)
private
String
companyId
;
/**
/**
* 公司主体
* 公司主体
*/
*/
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TFascCompanyMapper.java
0 → 100644
View file @
41167741
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascCompany
;
import
org.apache.ibatis.annotations.Mapper
;
import
java.util.List
;
/**
* 法大大专业版公司信息表
*
* @author hgw
* @date 2025-10-22 17:43:17
*/
@Mapper
public
interface
TFascCompanyMapper
extends
BaseMapper
<
TFascCompany
>
{
/**
* 法大大专业版公司信息表简单分页查询
* @return
*/
List
<
TFascCompany
>
getTFascCompanyAllList
();
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/TFascCompanyService.java
0 → 100644
View file @
41167741
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascCompany
;
import
java.util.List
;
/**
* 法大大专业版公司信息表
*
* @author hgw
* @date 2025-10-22 17:43:17
*/
public
interface
TFascCompanyService
extends
IService
<
TFascCompany
>
{
/**
* 法大大专业版公司信息表简单分页查询
*
* @return
*/
List
<
TFascCompany
>
getTFascCompanyAllList
();
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FascServiceImpl.java
View file @
41167741
...
@@ -57,20 +57,26 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -57,20 +57,26 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
private
final
TEmployeeContractPreMapper
tEmployeeContractPreMapper
;
private
final
TEmployeeContractPreMapper
tEmployeeContractPreMapper
;
private
final
TEmployeeContractInfoMapper
tEmployeeContractInfoMapper
;
private
final
TEmployeeContractInfoMapper
tEmployeeContractInfoMapper
;
private
final
TAttaInfoMapper
tAttaInfoMapper
;
private
final
TAttaInfoMapper
tAttaInfoMapper
;
private
final
TFascCompanyService
tFascCompanyService
;
private
final
OSSUtil
ossUtil
;
private
final
OSSUtil
ossUtil
;
private
final
static
String
FASC_NO_CONTRACT
=
"未找到合同自动化"
;
private
static
final
String
FASC_NO_CONTRACT
=
"未找到合同自动化"
;
private
final
static
String
FASC_NO_EMP_CONTRACT
=
"未找到自动生成的员工合同"
;
private
static
final
String
FASC_NO_EMP_CONTRACT
=
"未找到自动生成的员工合同"
;
private
final
static
String
FASC_NO_TEMPLATE
=
"未找到新法大大模板"
;
private
static
final
String
FASC_NO_TEMPLATE
=
"未找到新法大大模板"
;
@Override
@Override
public
R
<
String
>
getTemplate
(
String
templateName
)
throws
ApiException
{
public
R
<
String
>
getTemplate
(
String
templateName
)
throws
ApiException
{
List
<
TFascCompany
>
companyList
=
tFascCompanyService
.
getTFascCompanyAllList
();
if
(
companyList
!=
null
&&
!
companyList
.
isEmpty
())
{
for
(
TFascCompany
company
:
companyList
)
{
// templateName 签署任务模板名称
// templateName 签署任务模板名称
List
<
SignTemplateListInfo
>
list
=
fascUtil
.
getTemplateList
(
templateName
,
tFascPushLogService
);
List
<
SignTemplateListInfo
>
list
=
fascUtil
.
getTemplateList
(
templateName
,
tFascPushLogService
,
company
);
if
(
list
!=
null
&&
!
list
.
isEmpty
())
{
if
(
list
!=
null
&&
!
list
.
isEmpty
())
{
List
<
TFascTemplate
>
tList
=
new
ArrayList
<>();
List
<
TFascTemplate
>
tList
=
new
ArrayList
<>();
List
<
TFascTemplateDetail
>
detailList
=
new
ArrayList
<>();
List
<
TFascTemplateDetail
>
detailList
=
new
ArrayList
<>();
fascUtil
.
getTemplateDetailList
(
list
,
tList
,
detailList
,
tFascPushLogService
);
fascUtil
.
getTemplateDetailList
(
list
,
tList
,
detailList
,
tFascPushLogService
,
company
);
// 拉取到数据再更新:
// 拉取到数据再更新:
if
(!
tList
.
isEmpty
()
&&
!
detailList
.
isEmpty
())
{
if
(!
tList
.
isEmpty
()
&&
!
detailList
.
isEmpty
())
{
String
editContent1
=
"定时任务同步,拉取到数据"
;
String
editContent1
=
"定时任务同步,拉取到数据"
;
...
@@ -159,6 +165,8 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -159,6 +165,8 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
tFascTemplateDetailService
.
initFascTemplateIsMust
(
null
);
tFascTemplateDetailService
.
initFascTemplateIsMust
(
null
);
}
}
}
}
}
}
return
R
.
ok
();
return
R
.
ok
();
}
}
...
@@ -166,7 +174,17 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -166,7 +174,17 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
@Override
@Override
public
R
<
String
>
getTemplateDetailUrl
(
String
signTemplateId
)
throws
ApiException
{
public
R
<
String
>
getTemplateDetailUrl
(
String
signTemplateId
)
throws
ApiException
{
// templateName 签署任务模板名称
// templateName 签署任务模板名称
return
fascUtil
.
getTemplateDetailUrl
(
signTemplateId
,
tFascPushLogService
);
TFascCompany
company
=
null
;
TFascTemplate
tFascTemplate
=
tFascTemplateService
.
getOne
(
Wrappers
.<
TFascTemplate
>
query
()
.
lambda
().
eq
(
TFascTemplate:
:
getSignTemplateId
,
signTemplateId
)
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
tFascTemplate
!=
null
&&
Common
.
isNotNull
(
tFascTemplate
.
getCompanyId
()))
{
company
=
tFascCompanyService
.
getById
(
tFascTemplate
.
getCompanyId
());
}
if
(
company
==
null
)
{
return
R
.
failed
(
"无公司信息,请检查数据!"
);
}
return
fascUtil
.
getTemplateDetailUrl
(
signTemplateId
,
tFascPushLogService
,
company
);
}
}
/**
/**
...
@@ -231,7 +249,9 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -231,7 +249,9 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
List
<
TFascTemplateDetail
>
detailList
=
tFascTemplateDetailService
.
getTFascTemplateDetailList
(
detail
);
List
<
TFascTemplateDetail
>
detailList
=
tFascTemplateDetailService
.
getTFascTemplateDetailList
(
detail
);
// - 判断是否入职超过1个月——接口入口做了
// - 判断是否入职超过1个月——接口入口做了
R
<
String
>
requestInfo
=
fascUtil
.
submitContract
(
contract
,
tFascPushLogService
,
tEmployeeContractPreMapper
,
tFascTemplate
,
detailList
);
TFascCompany
company
=
tFascCompanyService
.
getById
(
tFascTemplate
.
getCompanyId
());
R
<
String
>
requestInfo
=
fascUtil
.
submitContract
(
contract
,
tFascPushLogService
,
tEmployeeContractPreMapper
,
tFascTemplate
,
detailList
,
company
);
return
requestInfo
;
return
requestInfo
;
}
}
...
@@ -254,9 +274,25 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -254,9 +274,25 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
return
R
.
failed
(
"无requestId,请检查数据"
);
return
R
.
failed
(
"无requestId,请检查数据"
);
}
}
// TODO - 判断什么状态撤销等,需要产品定
// TODO - 判断什么状态撤销等,需要产品定
TFascCompany
company
=
getTFascCompany
(
contract
);
if
(
company
==
null
)
{
return
R
.
failed
(
"无公司信息,请检查数据!"
);
}
return
fascUtil
.
cancelTask
(
contract
,
tFascPushLogService
,
tEmployeeContractPreMapper
,
company
);
return
fascUtil
.
cancelTask
(
contract
,
tFascPushLogService
,
tEmployeeContractPreMapper
);
}
private
TFascCompany
getTFascCompany
(
TEmployeeContractPre
contract
)
{
TFascCompany
company
=
null
;
if
(
Common
.
isNotNull
(
contract
.
getFadadaTemplateId
()))
{
TFascTemplate
tFascTemplate
=
tFascTemplateService
.
getOne
(
Wrappers
.<
TFascTemplate
>
query
()
.
lambda
().
eq
(
TFascTemplate:
:
getSignTemplateId
,
contract
.
getFadadaTemplateId
())
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
tFascTemplate
!=
null
&&
Common
.
isNotNull
(
tFascTemplate
.
getCompanyId
()))
{
company
=
tFascCompanyService
.
getById
(
tFascTemplate
.
getCompanyId
());
}
}
return
company
;
}
}
/**
/**
...
@@ -278,7 +314,11 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -278,7 +314,11 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
}
}
// TODO - 判断什么状态催办等,需要产品定
// TODO - 判断什么状态催办等,需要产品定
return
fascUtil
.
urgeTask
(
contract
,
tFascPushLogService
,
tEmployeeContractPreMapper
);
TFascCompany
company
=
getTFascCompany
(
contract
);
if
(
company
==
null
)
{
return
R
.
failed
(
"无公司信息,请检查数据!"
);
}
return
fascUtil
.
urgeTask
(
contract
,
tFascPushLogService
,
tEmployeeContractPreMapper
,
company
);
}
}
/**
/**
...
@@ -299,7 +339,11 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
...
@@ -299,7 +339,11 @@ public class FascServiceImpl extends ServiceImpl<FddContractInfoMapper, FddContr
// return R.failed("无requestId,请检查数据")
// return R.failed("无requestId,请检查数据")
return
false
;
return
false
;
}
}
return
fascUtil
.
getFileByRequestId
(
contract
,
tFascPushLogService
,
tAttaInfoMapper
,
ossUtil
);
TFascCompany
company
=
getTFascCompany
(
contract
);
if
(
company
==
null
)
{
return
false
;
}
return
fascUtil
.
getFileByRequestId
(
contract
,
tFascPushLogService
,
tAttaInfoMapper
,
ossUtil
,
company
);
}
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TFascCompanyServiceImpl.java
0 → 100644
View file @
41167741
/*
* Copyright (c) 2018-2025, lengleng All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* Neither the name of the yifu4cloud.com developer nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
* Author: lengleng (wangiegie@gmail.com)
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
archives
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.archives.entity.TFascCompany
;
import
com.yifu.cloud.plus.v1.yifu.archives.mapper.TFascCompanyMapper
;
import
com.yifu.cloud.plus.v1.yifu.archives.service.TFascCompanyService
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
/**
* 法大大专业版公司信息表
*
* @author hgw
* @date 2025-10-22 17:43:17
*/
@Log4j2
@Service
public
class
TFascCompanyServiceImpl
extends
ServiceImpl
<
TFascCompanyMapper
,
TFascCompany
>
implements
TFascCompanyService
{
/**
* 法大大专业版公司信息表简单分页查询
*
* @return
*/
@Override
public
List
<
TFascCompany
>
getTFascCompanyAllList
()
{
return
baseMapper
.
getTFascCompanyAllList
();
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/FascUtil.java
View file @
41167741
This diff is collapsed.
Click to expand it.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TFascCompanyMapper.xml
0 → 100644
View file @
41167741
<?xml version="1.0" encoding="UTF-8"?>
<!--
~
~ Copyright (c) 2018-2025, lengleng All rights reserved.
~
~ Redistribution and use in source and binary forms, with or without
~ modification, are permitted provided that the following conditions are met:
~
~ Redistributions of source code must retain the above copyright notice,
~ this list of conditions and the following disclaimer.
~ Redistributions in binary form must reproduce the above copyright
~ notice, this list of conditions and the following disclaimer in the
~ documentation and/or other materials provided with the distribution.
~ Neither the name of the yifu4cloud.com developer nor the names of its
~ contributors may be used to endorse or promote products derived from
~ this software without specific prior written permission.
~ Author: lengleng (wangiegie@gmail.com)
~
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.yifu.cloud.plus.v1.yifu.archives.mapper.TFascCompanyMapper"
>
<resultMap
id=
"tFascCompanyMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.entity.TFascCompany"
>
<id
property=
"id"
column=
"id"
/>
<result
property=
"companyName"
column=
"company_name"
/>
<result
property=
"appId"
column=
"app_id"
/>
<result
property=
"openId"
column=
"open_id"
/>
<result
property=
"appSecret"
column=
"app_secret"
/>
<result
property=
"appUrl"
column=
"app_url"
/>
<result
property=
"createBy"
column=
"CREATE_BY"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"updateBy"
column=
"UPDATE_BY"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.id,
a.company_name,
a.app_id,
a.app_secret,
a.app_url,
a.open_id,
a.CREATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME
</sql>
<sql
id=
"tFascCompany_where"
>
<if
test=
"tFascCompany != null"
>
<if
test=
"tFascCompany.id != null and tFascCompany.id.trim() != ''"
>
AND a.id = #{tFascCompany.id}
</if>
<if
test=
"tFascCompany.companyName != null and tFascCompany.companyName.trim() != ''"
>
AND a.company_name = #{tFascCompany.companyName}
</if>
<if
test=
"tFascCompany.appId != null and tFascCompany.appId.trim() != ''"
>
AND a.app_id = #{tFascCompany.appId}
</if>
<if
test=
"tFascCompany.appSecret != null and tFascCompany.appSecret.trim() != ''"
>
AND a.app_secret = #{tFascCompany.appSecret}
</if>
<if
test=
"tFascCompany.appUrl != null and tFascCompany.appUrl.trim() != ''"
>
AND a.app_url = #{tFascCompany.appUrl}
</if>
<if
test=
"tFascCompany.createBy != null and tFascCompany.createBy.trim() != ''"
>
AND a.CREATE_BY = #{tFascCompany.createBy}
</if>
<if
test=
"tFascCompany.createName != null and tFascCompany.createName.trim() != ''"
>
AND a.CREATE_NAME = #{tFascCompany.createName}
</if>
<if
test=
"tFascCompany.createTime != null"
>
AND a.CREATE_TIME = #{tFascCompany.createTime}
</if>
<if
test=
"tFascCompany.updateBy != null and tFascCompany.updateBy.trim() != ''"
>
AND a.UPDATE_BY = #{tFascCompany.updateBy}
</if>
<if
test=
"tFascCompany.updateTime != null"
>
AND a.UPDATE_TIME = #{tFascCompany.updateTime}
</if>
</if>
</sql>
<select
id=
"getTFascCompanyAllList"
resultMap=
"tFascCompanyMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
FROM t_fasc_company a
<where>
1=1
<include
refid=
"tFascCompany_where"
/>
</where>
</select>
</mapper>
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TFascTemplateMapper.xml
View file @
41167741
...
@@ -25,6 +25,7 @@
...
@@ -25,6 +25,7 @@
<resultMap
id=
"tFascTemplateMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate"
>
<resultMap
id=
"tFascTemplateMap"
type=
"com.yifu.cloud.plus.v1.yifu.archives.entity.TFascTemplate"
>
<id
property=
"id"
column=
"id"
/>
<id
property=
"id"
column=
"id"
/>
<result
property=
"companyId"
column=
"company_id"
/>
<result
property=
"companyName"
column=
"company_name"
/>
<result
property=
"companyName"
column=
"company_name"
/>
<result
property=
"signName"
column=
"sign_name"
/>
<result
property=
"signName"
column=
"sign_name"
/>
<result
property=
"signOpenId"
column=
"sign_open_id"
/>
<result
property=
"signOpenId"
column=
"sign_open_id"
/>
...
@@ -65,6 +66,7 @@
...
@@ -65,6 +66,7 @@
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.id,
a.id,
a.company_id,
a.company_name,
a.company_name,
a.sign_name,
a.sign_name,
a.sign_open_id,
a.sign_open_id,
...
@@ -89,6 +91,9 @@
...
@@ -89,6 +91,9 @@
<if
test=
"tFascTemplate.id != null and tFascTemplate.id.trim() != ''"
>
<if
test=
"tFascTemplate.id != null and tFascTemplate.id.trim() != ''"
>
AND a.id = #{tFascTemplate.id}
AND a.id = #{tFascTemplate.id}
</if>
</if>
<if
test=
"tFascTemplate.companyId != null and tFascTemplate.companyId.trim() != ''"
>
AND a.company_id like concat('%', #{tFascTemplate.companyId}, '%')
</if>
<if
test=
"tFascTemplate.companyName != null and tFascTemplate.companyName.trim() != ''"
>
<if
test=
"tFascTemplate.companyName != null and tFascTemplate.companyName.trim() != ''"
>
AND a.company_name like concat('%', #{tFascTemplate.companyName}, '%')
AND a.company_name like concat('%', #{tFascTemplate.companyName}, '%')
</if>
</if>
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialDeadlineInfoMapper.xml
View file @
41167741
...
@@ -45,8 +45,8 @@
...
@@ -45,8 +45,8 @@
<result
property=
"medicalStartDateReduce"
column=
"MEDICAL_START_DATE_REDUCE"
/>
<result
property=
"medicalStartDateReduce"
column=
"MEDICAL_START_DATE_REDUCE"
/>
<result
property=
"socialEndDateReduce"
column=
"SOCIAL_END_DATE_REDUCE"
/>
<result
property=
"socialEndDateReduce"
column=
"SOCIAL_END_DATE_REDUCE"
/>
<result
property=
"medicalEndDateReduce"
column=
"MEDICAL_END_DATE_REDUCE"
/>
<result
property=
"medicalEndDateReduce"
column=
"MEDICAL_END_DATE_REDUCE"
/>
<result
property=
"
SOCIAL_PRE_REDUCE_START_DATE
"
column=
"SOCIAL_PRE_REDUCE_START_DATE"
/>
<result
property=
"
socialPreReduceStartDate
"
column=
"SOCIAL_PRE_REDUCE_START_DATE"
/>
<result
property=
"
SOCIAL_PRE_REDUCE_END_DATE
"
column=
"SOCIAL_PRE_REDUCE_END_DATE"
/>
<result
property=
"
socialPreReduceEndDate
"
column=
"SOCIAL_PRE_REDUCE_END_DATE"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
a.ID,
a.ID,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment