透视条件修改

src/main/java/org/springblade/founder/tjfx/controller/DwTjfxController.java

@@ -5,10 +5,7 @@ import org.springblade.founder.tjfx.service.DwTjfxService;
 import org.springblade.founder.utils.EasyUIPage;
 import org.springblade.founder.utils.R;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -237,4 +234,8 @@ public class DwTjfxController {
 			return R.error(e.getMessage());
 		}
 	}
+
+
+
+
 }

src/main/java/org/springblade/founder/tjfx/mapper/DwTjfxMapper.java

 package org.springblade.founder.tjfx.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import org.apache.ibatis.annotations.Mapper;
 import org.springblade.founder.tjfx.entity.*;
@@ -10,6 +11,7 @@ import java.util.Map;
 
 @Component
 @Mapper
+@DS("xzxt")
 public interface DwTjfxMapper {
 	DictitemXz getDwxxByDwdm(String unitcode);
 	List<DictitemXz> getXqdwList(Map<String, Object> levMap);

src/main/java/org/springblade/founder/tjfx/mapper/DwTjfxMapper.xml

@@ -353,7 +353,7 @@
         <if test="tjlb != null and tjlb != '' and tjlb == 'nl70'.toString() ">
             and xyr.ZHFZXYR_CSRQ_RQGZXX <![CDATA[<=]]> to_date('1979-12-31 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
         </if>
-        <if test="xzqhdm != null and xzqhdm != '' ">
+        <if test="xzqhdm != null and xzqhdm != '' and xzqhdm != '未知'.toString() ">
             and xyr.zhfzxyr_hjdz_xzqhdm like concat(#{xzqhdm},'%')
         </if>
         <if test="xzqhdm != null and xzqhdm != '' and xzqhdm == '未知'.toString() ">
@@ -395,6 +395,9 @@
         <if test="xzqhdm != null and xzqhdm != '' ">
             and xyr.zhfzxyr_hjdz_xzqhdm like concat(#{xzqhdm},'%')
         </if>
+        <if test="xzqhdm != null and xzqhdm != '' and xzqhdm == '未知'.toString() ">
+            and xyr.zhfzxyr_hjdz_xzqhdm is null
+        </if>
         <include refid="asjQry-where"/>
 
 
@@ -440,7 +443,7 @@
         <if test="tjlb != null and tjlb != '' and tjlb == 'nl70'.toString() ">
             and xyr.BHR_CSRQ_RQGZXX <![CDATA[<=]]> to_date('1979-12-31 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
         </if>
-        <if test="xzqhdm != null and xzqhdm != '' ">
+        <if test="xzqhdm != null and xzqhdm != '' and xzqhdm != '未知'.toString() ">
             and xyr.bhr_hjdz_xzqhdm like concat(#{xzqhdm},'%')
         </if>
         <if test="xzqhdm != null and xzqhdm != '' and xzqhdm == '未知'.toString() ">
@@ -482,7 +485,9 @@
         <if test="xzqhdm != null and xzqhdm != '' ">
             and xyr.bhr_hjdz_xzqhdm like concat(#{xzqhdm},'%')
         </if>
-
+        <if test="xzqhdm != null and xzqhdm != '' and xzqhdm == '未知'.toString() ">
+            and xyr.bhr_hjdz_xzqhdm is null
+        </if>
         <include refid="asjQry-where"/>
 
 

src/main/java/org/springblade/founder/tjfx/service/AjtjService.java

@@ -3,6 +3,7 @@ package org.springblade.founder.tjfx.service;
 import org.springblade.founder.tjfx.entity.*;
 
 import java.util.List;
+import java.util.Map;
 
 public interface AjtjService {
 
@@ -84,4 +85,6 @@ public interface AjtjService {
 	int getZaryListCount(AjtjParam ajtjParam);
 	List<TbXwZbfzxyr>  getZaryList(AjtjParam ajtjParam);
 	public AjtjParam setDwxx(AjtjParam ajtjParam);
+
+	DwXnpgTj getDwTjFx(Map<String, Object> paramMap);
 }

src/main/java/org/springblade/founder/tjfx/service/impl/DwTjfxServiceImpl.java

@@ -121,54 +121,7 @@ public class DwTjfxServiceImpl implements DwTjfxService {
 			}
 
 		}
-//		for (int i = 0; i < unitList.size(); i++) {
-//			DictitemXz item = unitList.get(i);
-//			String dwdm = item.getCode();
-//			String dwmc = item.getName();
-//			String dwtype="";
-//			paramMap.put("unitcode", dwdm);
-//			if (i == 0) {
-//				paramMap.put("qryType", "bdw");
-//				dwtype= "bdw";
-//			} else {
-//				paramMap.put("qryType", "bxq");
-//				dwtype= "bxq";
-//			}
-//
-//			DwXnpgTj dwXnpgTj = dwTjfxMapper.getDwTjFx(paramMap);
-////			if (dwXnpgTj.getAjts() == 0) {
-////				continue;
-////			}
-//			System.out.println("unitcode"+dwdm+":===="+ JSON.toJSONString(dwXnpgTj));
-//			dwXnpgTj.setDwdm(dwdm);
-//			dwXnpgTj.setDwmc(dwmc);
-//			dwXnpgTj.setQryType(dwtype);
-//			ajts += dwXnpgTj.getAjts();
-//			cjsswpajs += dwXnpgTj.getCjsswpajs();
-//			wcjsswpajs += dwXnpgTj.getWcjsswpajs();
-//			cssswpsl += dwXnpgTj.getCssswpsl();
-//			cjxyrajl += dwXnpgTj.getCjxyrajl();
-//			wcjxyrajl += dwXnpgTj.getWcjxyrajl();
-//			cjxyrsl += dwXnpgTj.getCjxyrsl();
-//			cjshrajl += dwXnpgTj.getCjshrajl();
-//			wcjshrajl+= dwXnpgTj.getWcjshrajl();
-//			cjshrsl += dwXnpgTj.getCjshrsl();
-//			dataList.add(dwXnpgTj);
-//		}
-//		DwXnpgTj dwXnpgTj = new DwXnpgTj();
-//		dwXnpgTj.setDwdm("");
-//		dwXnpgTj.setDwmc("合计");
-//		dwXnpgTj.setAjts(ajts);
-//		dwXnpgTj.setCjsswpajs(cjsswpajs);
-//		dwXnpgTj.setWcjsswpajs(wcjsswpajs);
-//		dwXnpgTj.setCssswpsl(cssswpsl);
-//		dwXnpgTj.setCjxyrajl(cjxyrajl);
-//		dwXnpgTj.setWcjxyrajl(wcjxyrajl);
-//		dwXnpgTj.setCjxyrsl(cjxyrsl);
-//		dwXnpgTj.setCjshrajl(cjshrajl);
-//		dwXnpgTj.setWcjshrajl(wcjshrajl);
-//		dwXnpgTj.setCjshrsl(cjshrsl);
-//		dataList.add(dwXnpgTj);
+
 		res = dataList.stream().sorted(Comparator.comparing(DwXnpgTj::getDwdm))
 			.collect(Collectors.toList());
 		rtMap.put("rows",res);