Commit 57961d41 authored by 单奇雲's avatar 单奇雲

1.bug,2.增加文件请求大小配置

parent 045181bf
...@@ -33,6 +33,9 @@ mybatis.type-aliases-package = com.yeejoin.amos.fas.business.entity.mybatis ...@@ -33,6 +33,9 @@ mybatis.type-aliases-package = com.yeejoin.amos.fas.business.entity.mybatis
mybatis.configuration.mapUnderscoreToCamelCase=true mybatis.configuration.mapUnderscoreToCamelCase=true
logging.level.com.yeejoin.amos.fas.business.dao.mapper=debug logging.level.com.yeejoin.amos.fas.business.dao.mapper=debug
spring.servlet.multipart.max-file-size=20MB
spring.servlet.multipart.max-request-size=20MB
#liquibase #liquibase
spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml spring.liquibase.change-log = classpath:/db/changelog/changelog-master.xml
spring.liquibase.enabled= true spring.liquibase.enabled= true
......
...@@ -480,7 +480,14 @@ ...@@ -480,7 +480,14 @@
WHERE WHERE
DATEDIFF(t.begin_time,CURRENT_DATE) <= 0 AND DATEDIFF(t.end_time,CURRENT_DATE) >= 0 DATEDIFF(t.begin_time,CURRENT_DATE) <= 0 AND DATEDIFF(t.end_time,CURRENT_DATE) >= 0
AND (t.org_code like CONCAT(#{orgCode},'-%') OR t.org_code = #{orgCode}) AND (t.org_code like CONCAT(#{orgCode},'-%') OR t.org_code = #{orgCode})
GROUP BY d.status AND d.status = 0
UNION ALL
select
is_ok as type,count(1) as value
from p_check a
where (a.org_code like CONCAT(#{orgCode},'-%') OR a.org_code = #{orgCode})
and TO_DAYS(a.check_time) = TO_DAYS(CURRENT_DATE)
GROUP BY a.is_ok
]]> ]]>
</select> </select>
...@@ -488,7 +495,7 @@ ...@@ -488,7 +495,7 @@
SELECT n.id,r.code,r.name as label,r.id as pointId,'risk' as type,n.create_date as changeDate SELECT n.id,r.code,r.name as label,r.id as pointId,'risk' as type,n.create_date as changeDate
FROM f_rpn_change_log n FROM f_rpn_change_log n
LEFT JOIN f_risk_source r ON r.id = n.risk_source_id LEFT JOIN f_risk_source r ON r.id = n.risk_source_id
WHERE n.type = 1 WHERE n.type = 0
AND (r.org_code = #{org_code} OR r.org_code like CONCAT(#{org_code},'-%')) AND (r.org_code = #{org_code} OR r.org_code like CONCAT(#{org_code},'-%'))
ORDER BY n.create_date desc ORDER BY n.create_date desc
limit 0,5 limit 0,5
......
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