zf
2023-07-31 e0ff6529b4364fdbf81d25f33e881118b147b3fa
bug修改
已修改2个文件
43 ■■■■ 文件已修改
src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-prod.yml 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/gk/hotwork/Mapper/mybatis/InspectionHiddenDangerMapper.xml
@@ -23,12 +23,12 @@
        (
        SELECT
        t.*,
        ( CASE WHEN t.unrectifyCount = 0 THEN -1 WHEN t.unrectifyCount = t.hdTocalCount THEN 2 ELSE 1 END ) rectificationStatus
        ( CASE WHEN t.unRectifyCount = t.hdTocalCount THEN - 1 WHEN t.rectifyCount = t.hdTocalCount THEN 2 ELSE 1 END ) rectificationStatus
        FROM
        (
        SELECT
        s.*,
        count( h.`status` = -1 OR NULL ) unRectifyCount,
        count( h.`status` = - 1 OR NULL ) unRectifyCount,
        count( h.`status` = 1 OR NULL ) rectifyCount,
        count( h.`status` ) hdTocalCount,
        count( h.LEVEL = 1 OR NULL ) sameAsCount,
@@ -45,7 +45,8 @@
        ) t
        ) l
        LEFT JOIN company AS co ON l.checked_company_id = co.id
        where 1=1
        WHERE
        1 =1
        <if test="params.inspectionName != null  and params.inspectionName != ''">
            and l.inspection_name like concat("%",#{params.inspectionName},"%")
        </if>
src/main/resources/application-prod.yml
@@ -3,7 +3,7 @@
  tomcat:
    uri-encoding: UTF-8
    basedir: /
  port: 8016
  port: 8006
  servlet:
    context-path: /
# mysql
@@ -33,63 +33,63 @@
#  enabled: true
  enabled: false
host: http://localhost:8016
host: http://localhost:8006
filePath: /home/uploads/
fileurl: http://nmy.sinanoaq.cn:8016/upload/
fileurl: http://nmy.sinanoaq.cn:8006/upload/
socketport: 504
sqlPath: /home/dbback/
sqlurl: http://nmy.sinanoaq.cn:8016/dbback/
sqlurl: http://nmy.sinanoaq.cn:8006/dbback/
enterprisePath: /home/uploads/enterprise/
enterpriseUrl: http://nmy.sinanoaq.cn:8016/upload/enterprise/
enterpriseUrl: http://nmy.sinanoaq.cn:8006/upload/enterprise/
enterprise: enterprise/
transportCertificatePath: /home/uploads/transportCertificate/
transportCertificateUrl: http://nmy.sinanoaq.cn:8016/upload/transportCertificate/
transportCertificateUrl: http://nmy.sinanoaq.cn:8006/upload/transportCertificate/
transportCertificate: transportCertificate/
hiddenDangerPath: /home/uploads/hiddenDanger/
hiddenDangerUrl: http://nmy.sinanoaq.cn:8016/upload/hiddenDanger/
hiddenDangerUrl: http://nmy.sinanoaq.cn:8006/upload/hiddenDanger/
hiddenDanger: hiddenDanger/
standardPath: /home/uploads/standard/
standardUrl: http://nmy.sinanoaq.cn:8016/upload/standard/
standardUrl: http://nmy.sinanoaq.cn:8006/upload/standard/
standard: standard/
contractPath: /home/uploads/contract/
contractUrl: http://nmy.sinanoaq.cn:8016/upload/contract/
contractUrl: http://nmy.sinanoaq.cn:8006/upload/contract/
contract: contract/
patrolPath: /home/uploads/patrol/
patrolUrl: http://nmy.sinanoaq.cn:8016/upload/patrol/
patrolUrl: http://nmy.sinanoaq.cn:8006/upload/patrol/
appPath: /home/uploads/app/
app: app/
appUrl: http://nmy.sinanoaq.cn:8016/upload/app/
appUrl: http://nmy.sinanoaq.cn:8006/upload/app/
productPath: /home/uploads/product/
productUrl: http://nmy.sinanoaq.cn:8016/upload/product/
productUrl: http://nmy.sinanoaq.cn:8006/upload/product/
assessApplyPath: /home/uploads/assessApply/
assessApplytUrl: http://nmy.sinanoaq.cn:8016/upload/assessApply/
assessApplytUrl: http://nmy.sinanoaq.cn:8006/upload/assessApply/
assessApply: assessApply/
workCertPath: /home/uploads/workCert/
workCertUrl: http://nmy.sinanoaq.cn:8016/upload/workCert/
workCertUrl: http://nmy.sinanoaq.cn:8006/upload/workCert/
workCert: workCert/
nanowebUrl: http://nmy.sinanoaq.cn:8016/nanoweb/api/register
nanowebUrl: http://nmy.sinanoaq.cn:8006/nanoweb/api/register
nanowebEnable: true
taskPath: /home/uploads/task/
taskPathPrefix: /home/uploads/
taskUrl: http://nmy.sinanoaq.cn:8016/upload/task/
taskUrl: http://nmy.sinanoaq.cn:8006/upload/task/
task: task/
emergencyPlanPath:  /home/uploads/emergencyPlan/
emergencyPlanUrl: http://localhost:8016/upload/emergencyPlan/
emergencyPlanUrl: http://localhost:8006/upload/emergencyPlan/
emergencyPlan : emergencyPlan/
safecheckExecImagePath : /home/uploads/safecheck/
@@ -122,7 +122,7 @@
file:
  path:
    #基础路径
    dcPath: /home/upload/hazardInvestigation/
    dcPath: /home/uploads/hazardInvestigation/
    urlRootPath: /uploadfile/
    module:
      #用户模块