skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.java
@@ -2,7 +2,9 @@ import cn.gistack.sm.materials.entity.MaterialsManage; import cn.gistack.sm.materials.vo.MaterialsManageVO; import cn.gistack.sm.materials.vo.RescueTeamManageVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,5 +17,5 @@ */ public interface MaterialsManageMapper extends BaseMapper<MaterialsManage> { List<MaterialsManageVO> selectMyPage(@Param("vo") MaterialsManageVO materialsManage); List<MaterialsManageVO> selectMyPage(IPage<MaterialsManageVO> page,@Param("vo") MaterialsManageVO materialsManage); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/MaterialsManageMapper.xml
@@ -7,13 +7,13 @@ <result property="materialsYear" column="materials_year"/> <result property="resGuid" column="res_guid"/> <result property="resName" column="res_name"/> <result property="city" column="city"/> <result property="cityCode" column="cityCode"/> <result property="cityName" column="cityName"/> <result property="county" column="county"/> <result property="countyCode" column="countyCode"/> <result property="countyName" column="countyName"/> <result property="engScal" column="engScal"/> <result property="resRegCode" column="resRegCode"/> <result property="town" column="town"/> <result property="townCode" column="townCode"/> <result property="townName" column="townName"/> <result property="materialsType" column="MATERIALS_TYPE"/> <result property="materialsName" column="MATERIALS_NAME"/> @@ -37,36 +37,42 @@ <select id="selectMyPage" resultMap="vo"> SELECT MM.*, arb."res_reg_code" as resRegCode,arb."eng_scal" as engScal, case when b."ad_grad" = 4 THEN b."ad_name" ELSE NULL END AS townName, case when b."ad_grad" = 3 THEN b."ad_name" when c."ad_grad" = 3 THEN c."ad_name" END AS countyName, case when b."ad_grad" = 2 THEN b."ad_name" when c."ad_grad" = 2 THEN c."ad_name" ELSE d."ad_name" END AS cityName, case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode, case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName, case when town."ad_grad" = 3 THEN town."ad_code" when county."ad_grad" = 3 THEN county."ad_code" END AS countyCode, case when town."ad_grad" = 3 THEN town."ad_name" when county."ad_grad" = 3 THEN county."ad_name" END AS countyName, case when town."ad_grad" = 2 THEN town."ad_code" when county."ad_grad" = 2 THEN county."ad_code" ELSE city."ad_code" END AS cityCode, case when town."ad_grad" = 2 THEN town."ad_name" when county."ad_grad" = 2 THEN county."ad_name" ELSE city."ad_name" END AS cityName, BDB.DICT_VALUE materialTypeName FROM SM_MATERIALS_MANAGE MM LEFT JOIN SJZT_MD."att_res_base" arb ON MM.res_guid = arb."guid" LEFT JOIN SJZT_MD."att_ad_base" b ON arb."interior_ad_guid" = b."guid" LEFT JOIN SJZT_MD."att_ad_base" c ON b."p_ad_code" = c."guid" LEFT JOIN SJZT_MD."att_ad_base" d ON c."p_ad_code" = d."guid" LEFT JOIN SJZT_MD."att_ad_base"town ON arb."interior_ad_guid" = town."guid" LEFT JOIN SJZT_MD."att_ad_base" county ON town."p_ad_code" = county."guid" LEFT JOIN SJZT_MD."att_ad_base" city ON county."p_ad_code" = city."guid" LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code" LEFT JOIN BLADE_DICT_BIZ BDB ON MM.MATERIALS_TYPE = BDB.DICT_KEY WHERE MM.IS_DELETED = 0 AND BDB.CODE='MATERIALS_TYPE' <if test=" vo.adCode!= null and vo.adCode !='' "> AND CONCAT(province."ad_code",city."ad_code",county."ad_code",town."ad_code") LIKE CONCAT('%',#{vo.adCode},'%') </if> <if test="vo.resName !=null and vo.resName !=''"> AND MM.RES_NAME LIKE CONCAT('%',#{vo.resName},'%') </if> <if test="vo.materialsType !=null and vo.materialsType !=''"> AND MM.MATERIALS_TYPE = #{vo.materialsType} </if> <if test="vo.city !=null and vo.city !=''"> AND MM.city = #{vo.city} </if> <if test="vo.county !=null and vo.county !=''"> AND MM.county = #{vo.county} </if> <if test="vo.town !=null and vo.town !=''"> AND MM.town = #{vo.town} </if> <if test="vo.resGuid !=null and vo.resGuid !=''"> AND MM.res_guid = #{vo.resGuid} skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/mapper/RescueTeamManageMapper.xml
@@ -5,20 +5,31 @@ <select id="selectMyPage" resultType="cn.gistack.sm.materials.vo.RescueTeamManageVO"> SELECT RM.*, arb."res_reg_code" as resRegCode,arb."eng_scal" as engScal, case when b."ad_grad" = 4 THEN b."ad_name" ELSE NULL END AS townName, case when b."ad_grad" = 3 THEN b."ad_name" when c."ad_grad" = 3 THEN c."ad_name" END AS countyName, case when b."ad_grad" = 2 THEN b."ad_name" when c."ad_grad" = 2 THEN c."ad_name" ELSE d."ad_name" END AS cityName case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS townCode, case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS townName, case when town."ad_grad" = 3 THEN town."ad_code" when county."ad_grad" = 3 THEN county."ad_code" END AS countyCode, case when town."ad_grad" = 3 THEN town."ad_name" when county."ad_grad" = 3 THEN county."ad_name" END AS countyName, case when town."ad_grad" = 2 THEN town."ad_code" when county."ad_grad" = 2 THEN county."ad_code" ELSE city."ad_code" END AS cityCode, case when town."ad_grad" = 2 THEN town."ad_name" when county."ad_grad" = 2 THEN county."ad_name" ELSE city."ad_name" END AS cityName FROM SM_RESCUETEAM_MANAGE RM LEFT JOIN SJZT_MD."att_res_base" arb ON RM.res_guid = arb."guid" LEFT JOIN SJZT_MD."att_ad_base" b ON arb."interior_ad_guid" = b."guid" LEFT JOIN SJZT_MD."att_ad_base" c ON b."p_ad_code" = c."guid" LEFT JOIN SJZT_MD."att_ad_base" d ON c."p_ad_code" = d."guid" LEFT JOIN SJZT_MD."att_ad_base"town ON arb."interior_ad_guid" = town."guid" LEFT JOIN SJZT_MD."att_ad_base" county ON town."p_ad_code" = county."guid" LEFT JOIN SJZT_MD."att_ad_base" city ON county."p_ad_code" = city."guid" LEFT JOIN SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code" WHERE RM.IS_DELETED = 0 <if test=" vo.adCode!= null and vo.adCode !='' "> AND CONCAT(province."ad_code",city."ad_code",county."ad_code",town."ad_code") LIKE CONCAT('%',#{vo.adCode},'%') </if> <if test="vo.resName !=null and vo.resName !=''"> AND RM.RES_NAME LIKE CONCAT('%',#{vo.resName},'%') </if> @@ -27,15 +38,6 @@ </if> <if test="vo.userPhone !=null and vo.userPhone !=''"> AND RM.USER_PHONE LIKE CONCAT('%',#{vo.userPhone},'%') </if> <if test="vo.city !=null and vo.city !=''"> AND RM.city = #{vo.city} </if> <if test="vo.county !=null and vo.county !=''"> AND RM.county = #{vo.county} </if> <if test="vo.town !=null and vo.town !=''"> AND RM.town = #{vo.town} </if> <if test="vo.resGuid !=null and vo.resGuid !=''"> AND RM.res_guid = #{vo.resGuid} skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/service/impl/MaterialsManageServiceImpl.java
@@ -18,6 +18,6 @@ public class MaterialsManageServiceImpl extends BaseServiceImpl<MaterialsManageMapper, MaterialsManage> implements IMaterialsManageService { @Override public IPage<MaterialsManageVO> selectPage(IPage<MaterialsManageVO> page, MaterialsManageVO materialsManage) { return page.setRecords(baseMapper.selectMyPage(materialsManage)); return page.setRecords(baseMapper.selectMyPage(page,materialsManage)); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/vo/MaterialsManageVO.java
@@ -20,16 +20,20 @@ * 市名 */ private String cityName; private String cityCode; /** * 区县名 */ private String countyName; private String countyCode; /** * 镇名 */ private String townName; private String townCode; /** * 物资类型名 @@ -39,4 +43,6 @@ * 年份 */ private String year; private String adCode; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/materials/vo/RescueTeamManageVO.java
@@ -21,19 +21,24 @@ * 市名 */ private String cityName; private String cityCode; /** * 区县名 */ private String countyName; private String countyCode; /** * 镇名 */ private String townName; private String townCode; /** * 年份 */ private String year; private String adCode; }
