ソースを参照

修改sql

Signed-off-by: tangsong <86121657@qq.com>
tangsong 1 年間 前
コミット
8316d7128a

+ 1 - 1
accountability-server/src/main/java/com/unis/accountability/businessmanagement/mapper/BizRespScoreInputMapper.java

@@ -84,7 +84,7 @@ public interface BizRespScoreInputMapper {
84 84
     /**
85 85
      *
86 86
      * 结果汇总查看里的区级发布
87
-     * @param cityTaskPublishVO
87
+     * @param provinceTaskPage
88 88
      */
89 89
     void updateByArea(ProvinceTaskPage provinceTaskPage);
90 90
 

+ 6 - 9
accountability-server/src/main/resources/mybatis/mapper/BizRespCityTaskDistributionMapper.xml

@@ -49,7 +49,7 @@
49 49
         IT.QTBM,
50 50
         IT.PHBM,
51 51
         IT.ZPBM,
52
-        TO_CHAR(IT.UPDATE_TIME,'yyyy-mm-dd hh24:mi:ss ') UPDATE_TIME,
52
+        date_format(IT.UPDATE_TIME,'%Y-%m-%d %T') UPDATE_TIME,
53 53
         CASE IT.STATUS
54 54
         WHEN '0' THEN '未分配'
55 55
         WHEN '1' THEN '已分配'
@@ -60,23 +60,20 @@
60 60
         TASK.NYFZ,
61 61
         TASK.FNYFZ,
62 62
         TASK.KHFS,
63
-        to_number( substr(
63
+        CAST( substr(
64 64
         TASK.SCORE_STANDARD,
65 65
         instr(
66 66
         TASK.SCORE_STANDARD,
67
-        '(',
68
-        1
67
+        '('
69 68
         )+1,
70 69
         instr(
71 70
         TASK.SCORE_STANDARD,
72
-        ')',
73
-        1
71
+        ')'
74 72
         ) -1 - instr(
75 73
         TASK.SCORE_STANDARD,
76
-        '(',
77
-        1
74
+        '('
78 75
         )
79
-        )) px
76
+        ) as SIGNED) px
80 77
         FROM BIZ_RESP_SCORE_INPUT IT INNER JOIN BIZ_RESP_EXAMINATION_TASK TASK ON IT.BIZ_RESEXAMINATION_TASK_ID=TASK.ID
81 78
         INNER JOIN BIZ_RESP_RESPONSIBILITY BT ON TASK.BIZ_RESP_RESPONSIBILITY_ID=BT.ID
82 79
        -- INNER JOIN BIZ_RESP_EXAMINATION_QUOTA QU ON TASK.BIZ_RESP_EXAMINATION_QUOTA_ID=QU.ID

+ 10 - 16
accountability-server/src/main/resources/mybatis/mapper/BizRespCityTaskfFMapper.xml

@@ -254,23 +254,20 @@
254 254
     WHEN '20' THEN '已分发'
255 255
     WHEN '30' THEN '已发布'
256 256
     END AS STATUS_VALUE,
257
-    to_number( substr(
257
+    CAST ( substr(
258 258
     TASK.SCORE_STANDARD,
259 259
     instr(
260 260
     TASK.SCORE_STANDARD,
261
-    '(',
262
-    1
261
+    '('
263 262
     )+1,
264 263
     instr(
265 264
     TASK.SCORE_STANDARD,
266
-    ')',
267
-    1
265
+    ')'
268 266
     ) -1 - instr(
269 267
     TASK.SCORE_STANDARD,
270
-    '(',
271
-    1
268
+    '('
272 269
     )
273
-    )) px
270
+    ) as SIGNED) px
274 271
     FROM BIZ_RESP_EXAMINATION_TASK TASK
275 272
     INNER JOIN BIZ_RESP_RESPONSIBILITY BT ON TASK.BIZ_RESP_RESPONSIBILITY_ID=BT.ID
276 273
     INNER JOIN  BIZ_RESP_CITY_TASK_FF FF ON FF.BIZ_RESP_EXAMINATION_TASK_ID=TASK.ID
@@ -317,23 +314,20 @@
317 314
   WHEN 30 THEN '已发布'
318 315
   END AS STATUS_VALUE,
319 316
   IT.area_code  AS CITYAREACODE,
320
-  to_number( substr(
317
+  CAST ( substr(
321 318
   TASK.SCORE_STANDARD,
322 319
   instr(
323 320
   TASK.SCORE_STANDARD,
324
-  '(',
325
-  1
321
+  '('
326 322
   )+1,
327 323
   instr(
328 324
   TASK.SCORE_STANDARD,
329
-  ')',
330
-  1
325
+  ')'
331 326
   ) -1 - instr(
332 327
   TASK.SCORE_STANDARD,
333
-  '(',
334
-  1
328
+  '('
335 329
   )
336
-  )) px
330
+  ) as SIGNED) px
337 331
   from BIZ_RESP_DEPARTMENTAL_OPINION OP
338 332
   left join biz_resp_examination_task task on op.biz_resexamination_task_id = task.id
339 333
   left join biz_resp_score_input it on op.biz_resp_score_input_id = it.id

+ 20 - 29
accountability-server/src/main/resources/mybatis/mapper/BizRespCityZpbmMapper.xml

@@ -128,24 +128,21 @@
128 128
         IT.AREA_CODE,
129 129
         IT.QTBM,
130 130
         IT.PHBM,
131
-        TO_CHAR(QTBM.UPDATE_TIME,'yyyy-mm-dd hh24:mi:ss ') UPDATE_TIME,
132
-        to_number( substr(
131
+        date_format(QTBM.UPDATE_TIME,'%Y-%m-%d %T') UPDATE_TIME,
132
+        CAST( substr(
133 133
         TASK.SCORE_STANDARD,
134 134
         instr(
135 135
         TASK.SCORE_STANDARD,
136
-        '(',
137
-        1
136
+        '('
138 137
         )+1,
139 138
         instr(
140 139
         TASK.SCORE_STANDARD,
141
-        ')',
142
-        1
140
+        ')'
143 141
         ) -1 - instr(
144 142
         TASK.SCORE_STANDARD,
145
-        '(',
146
-        1
143
+        '('
147 144
         )
148
-        )) px
145
+        ) as SIGNED) px
149 146
         FROM BIZ_RESP_SCORE_INPUT IT INNER JOIN BIZ_RESP_EXAMINATION_TASK TASK ON IT.BIZ_RESEXAMINATION_TASK_ID=TASK.ID
150 147
         INNER JOIN BIZ_RESP_RESPONSIBILITY BT ON TASK.BIZ_RESP_RESPONSIBILITY_ID=BT.ID
151 148
         -- INNER JOIN BIZ_RESP_EXAMINATION_QUOTA QU ON TASK.BIZ_RESP_EXAMINATION_QUOTA_ID=QU.ID
@@ -264,24 +261,21 @@
264 261
         PHBMS.STATUS_VALUE,
265 262
         PHBMS.STATUS,
266 263
         IT.AREA_CODE,
267
-        TO_CHAR(PHBMS.UPDATE_TIME,'yyyy-mm-dd hh24:mi:ss ') UPDATE_TIME,
268
-        to_number( substr(
264
+        date_format(PHBMS.UPDATE_TIME,'%Y-%m-%d %T') UPDATE_TIME,
265
+        CAST( substr(
269 266
         TASK.SCORE_STANDARD,
270 267
         instr(
271 268
         TASK.SCORE_STANDARD,
272
-        '(',
273
-        1
269
+        '('
274 270
         )+1,
275 271
         instr(
276 272
         TASK.SCORE_STANDARD,
277
-        ')',
278
-        1
273
+        ')'
279 274
         ) -1 - instr(
280 275
         TASK.SCORE_STANDARD,
281
-        '(',
282
-        1
276
+        '('
283 277
         )
284
-        )) px
278
+        ) as SIGNED) px
285 279
         FROM BIZ_RESP_SCORE_INPUT IT INNER JOIN BIZ_RESP_EXAMINATION_TASK TASK ON IT.BIZ_RESEXAMINATION_TASK_ID=TASK.ID
286 280
         INNER JOIN BIZ_RESP_RESPONSIBILITY BT ON TASK.BIZ_RESP_RESPONSIBILITY_ID=BT.ID
287 281
 
@@ -372,24 +366,21 @@
372 366
         IT.AREA_CODE,
373 367
         IT.ZPBM,
374 368
         IT.BIZ_RESEXAMINATION_TASK_ID AS TASKID,
375
-        TO_CHAR(PHBMS.UPDATE_TIME,'yyyy-mm-dd hh24:mi:ss ') UPDATE_TIME,
376
-        to_number( substr(
369
+        date_format(PHBMS.UPDATE_TIME,'%Y-%m-%d %T') UPDATE_TIME,
370
+        CAST( substr(
377 371
         TASK.SCORE_STANDARD,
378 372
         instr(
379 373
         TASK.SCORE_STANDARD,
380
-        '(',
381
-        1
374
+        '('
382 375
         )+1,
383 376
         instr(
384 377
         TASK.SCORE_STANDARD,
385
-        ')',
386
-        1
378
+        ')'
387 379
         ) -1 - instr(
388 380
         TASK.SCORE_STANDARD,
389
-        '(',
390
-        1
381
+        '('
391 382
         )
392
-        )) px
383
+        ) as SIGNED) px
393 384
         FROM BIZ_RESP_SCORE_INPUT IT INNER JOIN BIZ_RESP_EXAMINATION_TASK TASK ON IT.BIZ_RESEXAMINATION_TASK_ID=TASK.ID
394 385
         INNER JOIN BIZ_RESP_RESPONSIBILITY BT ON TASK.BIZ_RESP_RESPONSIBILITY_ID=BT.ID
395 386
         --      INNER JOIN BIZ_RESP_EXAMINATION_QUOTA QU ON TASK.BIZ_RESP_EXAMINATION_QUOTA_ID=QU.ID
@@ -513,8 +504,8 @@
513 504
     <!-- 粮食安全行政首长责任制   省级任务考查询(省考核办)   根据填报设置ID 和州市行政区划果询 taskId inputId 集合-->
514 505
     <select id="finyNyfzAndFnyfz"  resultType="java.util.Map"   parameterType="java.lang.String">
515 506
         SELECT
516
-        SUM(to_number(TASK.nyfz)) as nyfz,
517
-        SUM(to_number(TASK.fnyfz)) as fnyfz
507
+        SUM(CAST(TASK.nyfz as DECIMAL(10,2))) as nyfz,
508
+        SUM(CAST(TASK.fnyfz as DECIMAL(10,2))) as fnyfz
518 509
         FROM BIZ_RESP_EXAMINATION_TASK TASK  INNER JOIN BIZ_RESP_SCORE_INPUT IT ON TASK.ID=IT.BIZ_RESEXAMINATION_TASK_ID
519 510
         WHERE TASK.BIZ_RESP_RESPONSIBILITY_ID=#{bizRespResponsibilityId} AND IT.AREA_CODE=#{areaCode}
520 511
         AND TASK.DELETE_TIME IS NULL AND TASK.DELETE_BY IS NULL

+ 1 - 1
accountability-server/src/main/resources/mybatis/mapper/BizRespDepartmentalOpinionMapper.xml

@@ -687,7 +687,7 @@
687 687
 
688 688
   <!-- 粮食安全行政首长责任制  查看配合部门明细 原来sql type = 30-->
689 689
   <select id="findByTaskFnyfzAndNyfzTotal" resultType="java.util.Map" parameterType="java.lang.String" >
690
-    select sum(to_number(task.nyfz)) as task_nyfz,sum(to_number(task.fnyfz))  as task_fnyfz FROM BIZ_RESP_EXAMINATION_TASK TASK
690
+    select sum(cast(task.nyfz  as DECIMAL(10,2))) as task_nyfz,sum(cast(task.fnyfz  as DECIMAL(10,2)))  as task_fnyfz FROM BIZ_RESP_EXAMINATION_TASK TASK
691 691
     INNER JOIN BIZ_RESP_SCORE_INPUT IT ON TASK.ID=IT.BIZ_RESEXAMINATION_TASK_ID
692 692
     WHERE TASK.BIZ_RESP_RESPONSIBILITY_ID=#{bilityId} AND IT.AREA_CODE=#{areaCode}
693 693
     and task.id in(

+ 5 - 8
accountability-server/src/main/resources/mybatis/mapper/BizRespExaminationTaskMapper.xml

@@ -389,23 +389,20 @@
389 389
     END AS ZTNAME,
390 390
     TASK.BIZ_RESP_RESPONSIBILITY_ID AS TBSJID,
391 391
     TASK.AREA_CODE,
392
-      to_number( substr(
392
+      CAST( substr(
393 393
       TASK.SCORE_STANDARD,
394 394
       instr(
395 395
       TASK.SCORE_STANDARD,
396
-      '(',
397
-      1
396
+      '('
398 397
       )+1,
399 398
       instr(
400 399
       TASK.SCORE_STANDARD,
401
-      ')',
402
-      1
400
+      ')'
403 401
       ) -1 - instr(
404 402
       TASK.SCORE_STANDARD,
405
-      '(',
406
-      1
403
+      '('
407 404
       )
408
-      )) px
405
+      ) as SIGNED) px
409 406
     FROM BIZ_RESP_EXAMINATION_TASK TASK
410 407
     INNER JOIN  BIZ_RESP_RESPONSIBILITY  TY ON TASK.BIZ_RESP_RESPONSIBILITY_ID=TY.ID
411 408
     <where>

+ 6 - 9
accountability-server/src/main/resources/mybatis/mapper/BizRespProvinceMapper.xml

@@ -32,7 +32,7 @@
32 32
         BT.YEAR,
33 33
         OP.AREA_CODE,
34 34
       --  QU.NAME AS KHZB,
35
-        TO_CHAR(OP.UPDATE_TIME,'yyyy-mm-dd hh24:mi:ss ') UPDATE_TIME,
35
+        date_format(OP.UPDATE_TIME,'%Y-%m-%d %T') UPDATE_TIME,
36 36
         OP.SCORE,
37 37
         TASK.SCORE_STANDARD AS KHRWPFBZ,
38 38
         TASK.NYFZ,
@@ -49,23 +49,20 @@
49 49
         WHEN '50' THEN '已审核'
50 50
         END AS STATUS_VALUE,
51 51
         OP.STATUS,
52
-        to_number( substr(
52
+        CAST( substr(
53 53
         TASK.SCORE_STANDARD,
54 54
         instr(
55 55
         TASK.SCORE_STANDARD,
56
-        '(',
57
-        1
56
+        '('
58 57
         )+1,
59 58
         instr(
60 59
         TASK.SCORE_STANDARD,
61
-        ')',
62
-        1
60
+        ')'
63 61
         ) -1 - instr(
64 62
         TASK.SCORE_STANDARD,
65
-        '(',
66
-        1
63
+        '('
67 64
         )
68
-        )) px
65
+        ) as SIGNED) px
69 66
         FROM BIZ_RESP_DEPARTMENTAL_OPINION OP
70 67
         INNER JOIN BIZ_RESP_EXAMINATION_TASK TASK ON OP.BIZ_RESEXAMINATION_TASK_ID=TASK.ID
71 68
         INNER JOIN BIZ_RESP_RESPONSIBILITY BT ON TASK.BIZ_RESP_RESPONSIBILITY_ID=BT.ID

+ 1 - 1
accountability-server/src/main/resources/mybatis/mapper/BizRespResponsibilityMapper.xml

@@ -248,7 +248,7 @@
248 248
     WHEN 1 THEN '发布'
249 249
     WHEN 2 THEN '发布'
250 250
     END  STATUS_VALUE,
251
-    TO_CHAR(BL.FB_TIME,'yyyy-mm-dd hh24:mi:ss ') as PFB_TIME
251
+    date_format(BL.FB_TIME,'%Y-%m-%d %T') as PFB_TIME
252 252
     FROM BIZ_RESP_RESPONSIBILITY BL
253 253
     <where>
254 254
       <if test="areaCode != null and areaCode != '' " >

+ 1 - 1
accountability-server/src/main/resources/mybatis/mapper/BizRespScoreInputMapper.xml

@@ -264,7 +264,7 @@
264 264
     WHEN 1 THEN '未发布'
265 265
     WHEN 2 THEN '已发布'
266 266
     END  STATUS_VALUE,
267
-    TO_CHAR(BL.KHRM_TIME,'yyyy-mm-dd hh24:mi:ss ') as KHRM_TIME
267
+    date_format(BL.KHRM_TIME,'%Y-%m-%d %T') as KHRM_TIME
268 268
     FROM BIZ_RESP_RESPONSIBILITY BL
269 269
     <where>
270 270
       <if test="areaCode != null and areaCode != '' " >

+ 2 - 2
accountability-server/src/main/resources/mybatis/mapper/BizRespScoringCityMapper.xml

@@ -266,8 +266,8 @@
266 266
     SELECT
267 267
     CY.ID,
268 268
     CY.YEAR,
269
-    TO_CHAR(CY.UPDATE_TIME,'yyyy-mm-dd hh24:mi:ss ') AS  UPDATE_TIME,
270
-    TO_CHAR(CY.FB_TIME,'yyyy-mm-dd hh24:mi:ss ') AS  FB_TIME,
269
+    date_format(CY.UPDATE_TIME,'%Y-%m-%d %T') AS  UPDATE_TIME,
270
+    date_format(CY.FB_TIME,'%Y-%m-%d %T') AS  FB_TIME,
271 271
     CY.STATUS,
272 272
     CASE CY.STATUS
273 273
     WHEN 0 THEN '草稿'

+ 2 - 2
accountability-server/src/main/resources/mybatis/mapper/BizRespScoringWeightMapper.xml

@@ -348,8 +348,8 @@
348 348
     select
349 349
     WH.ID,
350 350
     WH.YEAR,
351
-    TO_CHAR(WH.FB_TIME,'yyyy-mm-dd hh24:mi:ss ') AS  FB_TIME,
352
-    TO_CHAR(WH.UPDATE_TIME,'yyyy-mm-dd hh24:mi:ss ') AS  UPDATE_TIME,
351
+    date_format(WH.FB_TIME,'%Y-%m-%d %T') AS  FB_TIME,
352
+    date_format(WH.UPDATE_TIME,'%Y-%m-%d %T') AS  UPDATE_TIME,
353 353
     WH.STATUS,
354 354
     CASE WH.STATUS
355 355
     WHEN 0 THEN '草稿'

+ 3 - 3
accountability-server/src/main/resources/mybatis/mapper/MsgNoticeMapper.xml

@@ -268,7 +268,7 @@
268 268
     me.title,
269 269
     me.area_code as areaCode,
270 270
     me.org_id,
271
-    TO_CHAR(ME.publish_time,'yyyy-mm-dd hh24:mi:ss ') as publishTime,
271
+    date_format(ME.publish_time,'%Y-%m-%d %T') as publishTime,
272 272
     CASE me.STATUS
273 273
     WHEN 10 THEN '未提交'
274 274
     WHEN 20 THEN '已提交'
@@ -303,7 +303,7 @@
303 303
   <!-- 信息报送 分页  查询未报送和已报送-->
304 304
   <select id="findByMsgNoticeStatus"  resultType="java.util.Map"   parameterType="com.unis.accountability.businessmanagement.common.vo.msgNotice.MsgNoticePage">
305 305
     SELECT * FROM (
306
-    SELECT ME.ID,ME.TITLE,TO_CHAR(ME.UPDATE_TIME,'YYYY-MM-DD') AS TIME,ME.PUBLISH_SCOPE,ME.STATUS,ME.FILE_ID,
306
+    SELECT ME.ID,ME.TITLE,date_format(ME.UPDATE_TIME,'%Y-%m-%d') AS TIME,ME.PUBLISH_SCOPE,ME.STATUS,ME.FILE_ID,
307 307
     CASE ME.STATUS
308 308
     WHEN '10' THEN '未报送'
309 309
     WHEN '20' THEN '已报送'
@@ -333,7 +333,7 @@
333 333
   <!-- 信息报送分页   未读  已读-->
334 334
   <select id="findByMsgNoticeUserStatus"  resultType="java.util.Map"   parameterType="com.unis.accountability.businessmanagement.common.vo.msgNotice.MsgNoticePage">
335 335
     SELECT * FROM (
336
-    SELECT ME.ID,ME.TITLE,TO_CHAR(ME.UPDATE_TIME,'YYYY-MM-DD') AS TIME,ME.PUBLISH_SCOPE,ME.STATUS,ME.FILE_ID,'' AS STATUS_VALUE,'2' AS TYPE,ME.UPDATE_TIME
336
+    SELECT ME.ID,ME.TITLE,date_format(ME.UPDATE_TIME,'%Y-%m-%d') AS TIME,ME.PUBLISH_SCOPE,ME.STATUS,ME.FILE_ID,'' AS STATUS_VALUE,'2' AS TYPE,ME.UPDATE_TIME
337 337
     FROM  MSG_NOTICE ME WHERE ME.PUBLISH_SCOPE LIKE '%${deptId}%' AND ME.DELETE_TIME IS NULL AND  ME.STATUS='20'
338 338
     ) MEG
339 339
     <where>