Commit f83136b0 authored by wzp's avatar wzp

修改bug

parent 1bfb1ded
...@@ -23,4 +23,6 @@ public interface TOrganMapper extends BaseMapper<TOrgan> { ...@@ -23,4 +23,6 @@ public interface TOrganMapper extends BaseMapper<TOrgan> {
TOrgan selectCodeMax(String parentId); TOrgan selectCodeMax(String parentId);
List<TOrgan> getAllList(@Param("org") TOrgan org); List<TOrgan> getAllList(@Param("org") TOrgan org);
String getArea(String name);
} }
...@@ -172,7 +172,12 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe ...@@ -172,7 +172,12 @@ public class TBoardStatisticServiceImpl extends ServiceImpl<TBoardStatisticMappe
areaCode=areaCode.substring(0,2)+"0100"; areaCode=areaCode.substring(0,2)+"0100";
} }
QueryWrapper qw = new QueryWrapper(); QueryWrapper qw = new QueryWrapper();
if (areaCode.endsWith("00")) {
qw.eq("parent_id", areaCode); qw.eq("parent_id", areaCode);
}else {
qw.eq("code", areaCode);
}
List<TArea> provlist = areaService.list(qw); List<TArea> provlist = areaService.list(qw);
TBoardSurvey survey = new TBoardSurvey(); TBoardSurvey survey = new TBoardSurvey();
String dateStr = DateUtil.getCurrentDate("yyyyMM"); String dateStr = DateUtil.getCurrentDate("yyyyMM");
......
...@@ -70,10 +70,9 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme ...@@ -70,10 +70,9 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
HashMap<String, TOrgan> map1 = new HashMap<>(); HashMap<String, TOrgan> map1 = new HashMap<>();
list1.stream().forEach(o-> map1.put(o.getName(),o)); list1.stream().forEach(o-> map1.put(o.getName(),o));
HashMap<String, String> area = new HashMap<>(); // HashMap<String, String> area = new HashMap<>();
// List<Map<String, Object>> mapList = organMapper.selectArea();
List<Map<String, Object>> mapList = organMapper.selectArea(); // mapList.stream().forEach(m->area.put(m.get("name").toString(),m.get("id").toString()));
mapList.stream().forEach(m->area.put(m.get("name").toString(),m.get("id").toString()));
for (int i = 0; i < excelList.size(); i++) { for (int i = 0; i < excelList.size(); i++) {
Map<String, String> map = null; Map<String, String> map = null;
...@@ -108,7 +107,7 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme ...@@ -108,7 +107,7 @@ public class TOrganServiceImpl extends ServiceImpl<TOrganMapper, TOrgan> impleme
} }
String organCode = getOrganCode(organ.getParentId()); String organCode = getOrganCode(organ.getParentId());
organ.setCode(organCode); organ.setCode(organCode);
organ.setAreaId(area.get(map.get("区域"))); organ.setAreaId(organMapper.getArea(map.get("区域")));
organ.setRemarks(map.get("备注")); organ.setRemarks(map.get("备注"));
organ.setIsDeleted(false); organ.setIsDeleted(false);
organ.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis())); organ.setCreateTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
......
...@@ -51,7 +51,11 @@ where 1=1 ...@@ -51,7 +51,11 @@ where 1=1
</select> </select>
<select id="selectCodeMax" resultMap="BaseResultMap"> <select id="selectCodeMax" resultMap="BaseResultMap">
select * from t_organ where parent_id = #{parentId} order by code desc limit 1 select * from t_organ where parent_id = #{parentId} order by code desc limit 1
</select>
<select id="getArea" resultType="string">
select id from t_area where full_name LIKE concat('%', #{name}, '%') order by code desc limit 1
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment