Browse Source

综合查询

lizeyu 9 months ago
parent
commit
f71f77f5a3

+ 0 - 1
parth5/parth5/src/app/views/pages/propagandawork/dzzfc/list.component.ts

@@ -50,7 +50,6 @@ export class DzzfcListComponent implements OnInit {
   ngOnInit() {
     this.userInfo = this.userService.GetUser();
     this.routeInfo.queryParams.subscribe(params => {
-      debugger;
       this.searchParams.dzzdm = this.searchParams.dzzdm || this.userService.GetUser().dataDzzdm;
       this.reload();
     });

+ 2 - 1
src/main/resources/application.yml

@@ -118,7 +118,8 @@ appconfig:
   app-fromSys: dangjian
   #模拟登陆密码
   auto-pwd: 123456
-  lead-uids: '2121217762,2121402851'
+  #模拟登陆密码
+  lead-uids: '127687'
   #特殊菜单过滤 a,a|b,b,c
   menu-dwids: '001091209135'
   safe-ext: '.jpg,.png,.gif,.zip,.rar,.7z,.xls,.xlsx,.doc,.docx,.pdf,.ppt,.pptx,.jpeg,.txt,.mp4,.avi'

+ 2 - 2
src/main/resources/mapping/IntegratedQueryCQuery.xml

@@ -11,11 +11,11 @@
         from ZZ_ZZQKXX dep
         inner join ZZ_ZZQKXXFB depinfo on dep.DZZDM=depinfo.DZZDM
         inner join ZZZD_ZZLBDMNEW deptype on depinfo.ZZLB=deptype.BM
-        inner join ZZZD_JCZZFL depcate on depinfo.JCZZFL=depcate.BM
+        inner join ZZZD_JCZZFLNEW depcate on depinfo.JCZZFL=depcate.BM
         left join ZZ_BZJCXX ses on dep.DZZDM=ses.DZZDM and depinfo.LDJTJC=ses.LDJTJC
         where 1=1
         <if test="dzzmc != null and dzzmc != ''">
-            and dep.DZZMC like concat('%',#{dzzdm},'%')
+            and dep.DZZMC like concat('%',#{dzzmc},'%')
         </if>
         <if test="dzzdm != null and dzzdm != ''">
             and dep.DZZDM like concat('%',#{dzzdm},'%')

+ 8 - 8
src/main/resources/mapping/PartyUserCQuery.xml

@@ -54,7 +54,7 @@
             and us.ZWJB = #{zwjb}
         </if>
         <if test="sqrdrq_begin != null and sqrdrq_begin != ''">
-            and dj.JRZGZZRQ >= #{sqrdrq_begin}
+            and dj.JRZGZZRQ <![CDATA[ >= ]]> #{sqrdrq_begin}
         </if>
         <if test="sqrdrq_end != null and sqrdrq_end != ''">
             and dj.JRZGZZRQ <![CDATA[ <= ]]> #{sqrdrq_end}
@@ -307,7 +307,7 @@
             and us.zwjb = #{zwjb}
         </if>
         <if test="sqrdrq_begin != null and sqrdrq_begin != ''">
-            and us.sqrdrq >= #{sqrdrq_begin}
+            and us.sqrdrq <![CDATA[ >= ]]> #{sqrdrq_begin}
         </if>
         <if test="sqrdrq_end != null and sqrdrq_end != ''">
             and us.sqrdrq <![CDATA[ <= ]]> #{sqrdrq_end}
@@ -350,7 +350,7 @@
             and us.xm like concat('%',#{xm},'%')
         </if>
         <if test="zlzbrq_begin != null and zlzbrq_begin != ''">
-            and r.zlzbrq >= #{zlzbrq_begin}
+            and r.zlzbrq <![CDATA[ >= ]]> #{zlzbrq_begin}
         </if>
         <if test="zlzbrq_end != null and zlzbrq_end != ''">
             and r.zlzbrq <![CDATA[ <= ]]> #{zlzbrq_end}
@@ -501,7 +501,7 @@
         left join ZZ_DJXX dj on us.RYBM=dj.RYBM
         left join vw_partyduty uszw on us.rybm=uszw.rybm -- 党内职务名称
         left join (
-        select USERID from DJ_JLCFXX j where j.YXKSRQ <![CDATA[ <= ]]> CURDATE() and j.YXJSRQ>=CURDATE() group
+        select USERID from DJ_JLCFXX j where j.YXKSRQ <![CDATA[ <= ]]> CURDATE() and j.YXJSRQ <![CDATA[ >= ]]> CURDATE() group
         by USERID
         ) jlcf on us.RYBM=jlcf.USERID
         where 1=1
@@ -515,7 +515,7 @@
             and us.xm like concat('%',#{xm},'%')
         </if>
         <if test="csrq_begin != null and csrq_begin != ''">
-            and us.csrq >= #{csrq_begin}
+            and us.csrq <![CDATA[ >= ]]> #{csrq_begin}
         </if>
         <if test="csrq_end != null and csrq_end != ''">
             and us.csrq <![CDATA[ <= ]]> #{csrq_end}
@@ -527,13 +527,13 @@
             and usfb.NL <![CDATA[ <= ]]> #{age_end}
         </if>
         <if test="rdsj_begin != null and rdsj_begin != ''">
-            and dj.jrzgzzrq >= #{rdsj_begin}
+            and dj.jrzgzzrq <![CDATA[ >= ]]> #{rdsj_begin}
         </if>
         <if test="rdsj_end != null and rdsj_end != ''">
             and dj.jrzgzzrq <![CDATA[ <= ]]> #{rdsj_end}
         </if>
         <if test="zzsj_begin != null and zzsj_begin != ''">
-            and dj.zzrq >= #{zzsj_begin}
+            and dj.zzrq <![CDATA[ >= ]]> #{zzsj_begin}
         </if>
         <if test="zzsj_end != null and zzsj_end != ''">
             and dj.zzrq <![CDATA[ <= ]]> #{zzsj_end}
@@ -825,7 +825,7 @@
                           where us.RYZT in ('2', '3') and cast(substr(zd.JRZGZZRQ, 1, 6) as signed) <![CDATA[ <= ]]> #{yearMonth}
                                 and (fb.ISARCHIVE is null
                                          or fb.ISARCHIVE = 0
-                                         or (fb.ISARCHIVE = 1 and cast(substr(DATE_FORMAT(fb.archiveDate, '%Y%m%d'), 1, 6) as signed) >= #{yearMonth}))
+                                         or (fb.ISARCHIVE = 1 and cast(substr(DATE_FORMAT(fb.archiveDate, '%Y%m%d'), 1, 6) as signed) <![CDATA[ >= ]]> #{yearMonth}))
                       ) um
                           left join us_party_month upm on um.userCode=upm.userCode and upm.yearMonth=#{yearMonth}
         where upm.userCode is null