Commit 16aa1cc3 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21

parents 05964839 80677c18
...@@ -420,7 +420,7 @@ ...@@ -420,7 +420,7 @@
if(#{type} = '1',concat('自动化手动-',a.customer_username),concat('自动化自动-',a.customer_username)) preName if(#{type} = '1',concat('自动化手动-',a.customer_username),concat('自动化自动-',a.customer_username)) preName
FROM t_employee_contract_pre a,(select @i:=0) as itable FROM t_employee_contract_pre a,(select @i:=0) as itable
<where> <where>
1=1 1=1 and a.IS_REFUSE ='1'
AND a.id in AND a.id in
<foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")"> <foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")">
#{idStr} #{idStr}
...@@ -436,7 +436,7 @@ ...@@ -436,7 +436,7 @@
SELECT SELECT
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_employee_contract_pre a FROM t_employee_contract_pre a
where a.process_status = '0' and a.expected_confirm_time is not null where a.process_status = '0' and a.expected_confirm_time is not null and a.IS_REFUSE ='1'
and DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE() and DATE_FORMAT(a.expected_confirm_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
group by a.customer_user_loginname group by a.customer_user_loginname
</select> </select>
...@@ -449,6 +449,6 @@ ...@@ -449,6 +449,6 @@
a.expected_collection_time is not null a.expected_collection_time is not null
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE() and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and ((a.timeout_elec_sign = '0' and a.process_status = '0' and a.sign_type = '0') or and ((a.timeout_elec_sign = '0' and a.process_status = '0' and a.sign_type = '0') or
a.process_status in ('1','3','5','7','11')) a.process_status in ('1','3','5','7','11')) and a.IS_REFUSE ='1'
</select> </select>
</mapper> </mapper>
...@@ -526,7 +526,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper, ...@@ -526,7 +526,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
/** /**
* @Author fxj * @Author fxj
* @Description 更加项目编码CODES 获取项目前端客服用户信息 * @Description 根据项目编码CODES 获取项目前端客服用户信息
* @Date 19:07 2025/3/12 * @Date 19:07 2025/3/12
**/ **/
private Map<String, SysUser> getStringSysUserMap(Map<String, SysUser> sysUserMap, Map<String, TSettleDomain> domainHashMap) { private Map<String, SysUser> getStringSysUserMap(Map<String, SysUser> sysUserMap, Map<String, TSettleDomain> domainHashMap) {
......
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
if(a.is_address = '0','是',if(a.is_address = '1','否','')) as is_address if(a.is_address = '0','是',if(a.is_address = '1','否','')) as is_address
FROM t_employee_insurance_pre a FROM t_employee_insurance_pre a
<where> <where>
1=1 1=1 and a.IS_REFUSE = '1'
<include refid="tEmployeeInsurancePre_where"/> <include refid="tEmployeeInsurancePre_where"/>
</where> </where>
order by a.create_time desc order by a.create_time desc
...@@ -325,7 +325,7 @@ ...@@ -325,7 +325,7 @@
SELECT SELECT
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_employee_insurance_pre a FROM t_employee_insurance_pre a
where a.process_status = '0' and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") = CURDATE() where a.process_status = '0' and a.IS_REFUSE = '1' and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") = CURDATE()
group by a.customer_user_loginname group by a.customer_user_loginname
</select> </select>
...@@ -333,6 +333,6 @@ ...@@ -333,6 +333,6 @@
SELECT SELECT
id id
FROM t_employee_insurance_pre a FROM t_employee_insurance_pre a
where a.process_status in ('0','1','2','5') and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE() where a.process_status in ('0','1','2','5') and a.IS_REFUSE = '1' and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
</select> </select>
</mapper> </mapper>
...@@ -652,7 +652,7 @@ ...@@ -652,7 +652,7 @@
if(#{type} = '1',concat('自动化手动-',a.customer_username),concat('自动化自动-',a.customer_username)) preName if(#{type} = '1',concat('自动化手动-',a.customer_username),concat('自动化自动-',a.customer_username)) preName
FROM t_dispatch_info_pre a,(select @i:=0) as itable FROM t_dispatch_info_pre a,(select @i:=0) as itable
<where> <where>
1=1 1=1 and a.IS_REFUSE='1'
AND a.id in AND a.id in
<foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")"> <foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")">
#{idStr} #{idStr}
...@@ -689,7 +689,7 @@ ...@@ -689,7 +689,7 @@
) c on c.DEPART_NAME = a.PROVIDENT_HOUSEHOLD_NAME ) c on c.DEPART_NAME = a.PROVIDENT_HOUSEHOLD_NAME
,(select @i:=0) as itable ,(select @i:=0) as itable
<where> <where>
1=1 1=1 and a.IS_REFUSE='1'
AND a.id in AND a.id in
<foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")"> <foreach item="idStr" index="index" collection="idList" open="(" separator="," close=")">
#{idStr} #{idStr}
...@@ -708,7 +708,7 @@ ...@@ -708,7 +708,7 @@
where where
a.expected_collection_time is not null and type_sub = '0' a.expected_collection_time is not null and type_sub = '0'
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE() and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and a.process_status = '0' and a.process_status = '0' and a.IS_REFUSE='1'
group by a.customer_user_login_name group by a.customer_user_login_name
</select> </select>
...@@ -719,7 +719,7 @@ ...@@ -719,7 +719,7 @@
where where
a.expected_collection_time is not null and type_sub = '1' a.expected_collection_time is not null and type_sub = '1'
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE() and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and a.process_status = '0' and a.process_status = '0' and a.IS_REFUSE='1'
group by a.customer_user_login_name group by a.customer_user_login_name
</select> </select>
...@@ -731,7 +731,7 @@ ...@@ -731,7 +731,7 @@
a.expected_collection_time is not null a.expected_collection_time is not null
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE() and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and a.process_status in ('1','2','4','8','9') and a.process_status in ('1','2','4','8','9')
and a.type_sub = '0' and a.type_sub = '0' and a.IS_REFUSE='1'
</select> </select>
<select id="getAllUnDisDataIdFundList" resultType="java.lang.String"> <select id="getAllUnDisDataIdFundList" resultType="java.lang.String">
...@@ -742,6 +742,6 @@ ...@@ -742,6 +742,6 @@
a.expected_collection_time is not null a.expected_collection_time is not null
and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE() and DATE_FORMAT(a.expected_collection_time,"%Y-%m-%d") <![CDATA[ <= ]]> CURDATE()
and a.process_status in ('1','2','4','8','9') and a.process_status in ('1','2','4','8','9')
and a.type_sub = '1' and a.type_sub = '1' and a.IS_REFUSE='1'
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment