修改了通过地市,区县,派出所查询派出所申领表

pom.xml

@@ -71,6 +71,12 @@
 			<version>1.1.8</version>
 		</dependency>
 
+		<dependency>
+			<groupId>dom4j</groupId>
+			<artifactId>dom4j</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+
 		<dependency>
 			<groupId>net.sf.json-lib</groupId>
 			<artifactId>json-lib</artifactId>
@@ -110,4 +116,6 @@
 	</build>
 
 
+
+
 </project>

src/main/java/com/yxproject/start/api/UserApi.java

@@ -536,14 +536,14 @@ public class UserApi {
     }
 
     /**
-     * 查询派出所申领表通过地市;
+     * 查询派出所申领表通过地市,区县,派出所;
      *
      * @return
      */
-    @RequestMapping("getPoliceStationApplyReasonByCity")
+    @RequestMapping("getPoliceStationApplyReasonByCityCode")
 //    @RequiresPermissions("userInfo.add")//权限管理;
-    public String getPoliceStationApplyReasonByCity(@RequestParam("city") String city, HttpServletResponse resp) {
-        List <Map <String, Object>> policeStationApplyReasonEntity = policeStationApplyReasonService.findPoliceStationApplyReasonByCity(city);
+    public String getPoliceStationApplyReasonByCity(@RequestParam("cityCode") String cityCode, HttpServletResponse resp) {
+        List <Map <String, Object>> policeStationApplyReasonEntity = policeStationApplyReasonService.findPoliceStationApplyReasonByCity(cityCode);
         YXJSONResponse yxjsonResponse = new YXJSONResponse();
         resp.setCharacterEncoding("UTF-8");
         yxjsonResponse.outPutSuccess(policeStationApplyReasonEntity);
@@ -552,41 +552,6 @@ public class UserApi {
         return yxjsonResponse.toJSONString();
     }
 
-    /**
-     * 查询派出所申领表通过区县;
-     *
-     * @return
-     */
-    @RequestMapping("getPoliceStationApplyReasonByCounty")
-//    @RequiresPermissions("userInfo.add")//权限管理;
-    public String getPoliceStationApplyReasonByCounty(@RequestParam("county") String county, HttpServletResponse resp) {
-        List <Map <String, Object>> policeStationApplyReasonEntity = policeStationApplyReasonService.findPoliceStationApplyReasonByCounty(county);
-        YXJSONResponse yxjsonResponse = new YXJSONResponse();
-        resp.setCharacterEncoding("UTF-8");
-        yxjsonResponse.outPutSuccess(policeStationApplyReasonEntity);
-        Map map = new HashMap();
-//      map.put("MakeType",productionTaskListEntity);
-        return yxjsonResponse.toJSONString();
-    }
-
-    /**
-     * 查询派出所申领表通过派出所;
-     *
-     * @return
-     */
-    @RequestMapping("getPoliceStationApplyReasonByGajgMC")
-//    @RequiresPermissions("userInfo.add")//权限管理;
-    public String getPoliceStationApplyReasonByGajgMC(@RequestParam("gajgMC") String gajgMC, HttpServletResponse resp) {
-        List <Map <String, Object>> policeStationApplyReasonEntity = policeStationApplyReasonService.findPoliceStationApplyReasonByCardType(gajgMC);
-        YXJSONResponse yxjsonResponse = new YXJSONResponse();
-        resp.setCharacterEncoding("UTF-8");
-        yxjsonResponse.outPutSuccess(policeStationApplyReasonEntity);
-        Map map = new HashMap();
-//      map.put("MakeType",productionTaskListEntity);
-        return yxjsonResponse.toJSONString();
-    }
-
-
     /**
      * 查询卡基表;
      *

src/main/java/com/yxproject/start/mapper/PoliceStationApplyReasonMapper.java

@@ -19,5 +19,5 @@ public interface PoliceStationApplyReasonMapper {
     public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType);
     public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String city);
     public List<Map<String,Object>> findPoliceStationApplyReasonByCounty(String county);
-    public List<Map<String,Object>> findPoliceStationApplyReasonByGajgMC(String gajgMC);
+    public List<Map<String,Object>> findPoliceStationApplyReasonByPoliceStation(String policeStation);
 }

src/main/java/com/yxproject/start/service/PoliceStationApplyReasonService.java

@@ -10,8 +10,5 @@ public interface PoliceStationApplyReasonService {
     public int savePoliceStationApplyReasonEntity(String cyclesheetID);
     public List<Map<String,Object>> findPoliceStationApplyReasonBySaveDate(String saveDate);
     public List<Map<String,Object>> findPoliceStationApplyReasonByCardType(String cardType);
-    public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String city);
-    public List<Map<String,Object>> findPoliceStationApplyReasonByCounty(String county);
-    public List<Map<String,Object>> findPoliceStationApplyReasonByGajgMC(String gajgMC);
-
+    public List<Map<String,Object>> findPoliceStationApplyReasonByCity(String cityCode);
 }

src/main/java/com/yxproject/start/service/TaskService.java

@@ -32,7 +32,7 @@ public interface TaskService {
 
     public int updateInStorageDate(TaskEntity taskEntity, CountyListEntity countyListEntity );
 
-    public List<Map<String,Object>> findTypeListByTaskStateId(String taskStateId);
+    public List<Map<String,Object>> findTypeListByTaskStateId( String taskStateId);
 
     public List<Map<String,Object>> findCityListByTaskStateId(String taskStateId);
 

src/main/java/com/yxproject/start/service/impl/PoliceStationApplyReasonServiceImpl.java

@@ -76,30 +76,20 @@ public class PoliceStationApplyReasonServiceImpl implements PoliceStationApplyRe
      * @return
      */
     @Override
-    public List <Map <String, Object>> findPoliceStationApplyReasonByCity(String city) {
-        List <Map <String, Object>> City =policeStationApplyReasonMapper.findPoliceStationApplyReasonByCity(city);
-        return City;
-    }
-
-    /**
-     * 查询派出所申领表通过区县;
-     * @param
-     * @return
-     */
-    @Override
-    public List <Map <String, Object>> findPoliceStationApplyReasonByCounty(String county) {
-        List <Map <String, Object>> County =policeStationApplyReasonMapper.findPoliceStationApplyReasonByCounty(county);
-        return County;
+    public List <Map <String, Object>> findPoliceStationApplyReasonByCity(String cityCode) {
+        if(cityCode.length()==4){
+            List <Map <String, Object>> CityCode =policeStationApplyReasonMapper.findPoliceStationApplyReasonByCity(cityCode);
+            return CityCode;
+        }
+        if(cityCode.length()==6){
+            List <Map <String, Object>> CityCode =policeStationApplyReasonMapper.findPoliceStationApplyReasonByCounty(cityCode);
+            return CityCode;
+        }
+        if(cityCode.length()==8){
+            List <Map <String, Object>> CityCode =policeStationApplyReasonMapper.findPoliceStationApplyReasonByPoliceStation(cityCode);
+            return CityCode;
+        }
+        return null;
     }
 
-    /**
-     * 查询派出所申领表通过派出所;
-     * @param
-     * @return
-     */
-    @Override
-    public List <Map <String, Object>> findPoliceStationApplyReasonByGajgMC(String gajgMC) {
-        List <Map <String, Object>> GajgMC =policeStationApplyReasonMapper.findPoliceStationApplyReasonByGajgMC(gajgMC);
-        return GajgMC;
-    }
 }

src/main/resources/mapper/PoliceStationApplyReasonMapper.xml

@@ -42,15 +42,15 @@
     </select>
 
     <select id="findPoliceStationApplyReasonByCity" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
-        SELECT  * FROM  POLICE_STATION_APPLY_REASON left join TASK on POLICE_STATION_APPLY_REASON.TASK_ID = TASK.TASK_ID left join CITY_DIC on TASK.CITYCODE = CITY_DIC.CITYCODE where CITYNAME=#{cityname}
+        select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,5) left join CITY_DIC on CITY_DIC.CITYCODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,3) where CITYCODE=#{citycode}
     </select>
 
     <select id="findPoliceStationApplyReasonByCounty" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
-        SELECT  * FROM  POLICE_STATION_APPLY_REASON left join COUNTY_LIST on POLICE_STATION_APPLY_REASON.TASK_ID=COUNTY_LIST.TASK_ID left join COUNTY_DIC on COUNTY_LIST.COUNTY_CODE = COUNTY_DIC.COUNTY_CODE where COUNTYNAME=#{countyname}
+        select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,5) left join CITY_DIC on CITY_DIC.CITYCODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,3) where COUNTY_CODE=#{county_Code}
     </select>
 
-    <select id="findPoliceStationApplyReasonByGajgMC" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
-        SELECT  * FROM  POLICE_STATION_APPLY_REASON left join GAJG_DM on POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE = GAJG_DM.GAJG_DM where GAJG_MC=#{gajg_MC}
+    <select id="findPoliceStationApplyReasonByPoliceStation" resultType="java.util.HashMap" parameterType="com.yxproject.start.entity.PoliceStationApplyReasonEntity">
+        select POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,GAJG_DM.GAJG_MC,COUNTY_DIC.COUNTYNAME,CITY_DIC.CITYNAME from POLICE_STATION_APPLY_REASON left join GAJG_DM on GAJG_DM.GAJG_DM = POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,5) left join CITY_DIC on CITY_DIC.CITYCODE = substr(POLICE_STATION_APPLY_REASON.POLICE_STATION_CODE,0,3) where POLICE_STATION_CODE=#{police_Station_Code}
     </select>
 
 </mapper>
\ No newline at end of file