diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java index a7ffda1..381c7c4 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProMapper.java @@ -201,12 +201,23 @@ public interface IProMapper { /** * 获取工序计划作业权重占比 + * * @param bidCode - * @return List> + * @return List> * @description * @author cwchen * @date 2024/3/20 9:40 */ @MapKey("planId") List> getGxWeight(String bidCode); + + /** + * 获取工程状态 + * @return Map> + * @description + * @author cwchen + * @date 2024/3/27 11:05 + */ + @MapKey("name") + Map> getProStatus(); } diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java index 03d784c..cd04251 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java @@ -63,6 +63,8 @@ public class ProServiceImpl implements IProService { @Autowired private RemoteFileService remoteFileService; + private Map> proStatusList = new HashMap<>(16); + @Override public List getProLists(ProDto dto) { @@ -274,6 +276,7 @@ public class ProServiceImpl implements IProService { if (CollectionUtils.isNotEmpty(lstError)) { return AjaxResult.error("excel数据有误,请仔细检查", lstError); } + proStatusList = mapper.getProStatus(); for (JSONObject obj : lstObj) { ProImportVo vo = new ProImportVo(); ProVo proVo = new ProVo(); @@ -451,7 +454,10 @@ public class ProServiceImpl implements IProService { vo.setProScale(obj.getString("proScale")); vo.setManager(obj.getString("manager")); vo.setProBrief(obj.getString("proBrief")); - vo.setStatus(obj.getString("status")); + Map map = proStatusList.get(obj.getString("status")); + if(map !=null){ + vo.setStatus(String.valueOf(map.get("id"))); + } vo.setPlanStartTime(obj.getString("planStartTime")); vo.setPlanEndTime(obj.getString("planEndTime")); vo.setStartTime(obj.getString("startTime")); diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml index ae0025b..54f5cd5 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml @@ -189,12 +189,13 @@ tp.end_time AS endTime, tp.pro_cost AS proCost, tp.pro_brief AS proBrief, - tp.status, + sd.dict_name AS status, tp.bid_code AS bidCode, tp.sign_code AS signCode, tp.pro_code AS proCode FROM tb_project tp LEFT JOIN sys_build sb ON tp.org = sb.org_id + LEFT JOIN sys_dict sd ON sd.dict_code = tp.status AND sd.del_flag = 0 tp.del_flag = 0 @@ -314,4 +315,13 @@ FROM tb_gx_plan WHERE bid_code = #{bidCode} + + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml index b621d53..2b3fc34 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml @@ -57,12 +57,13 @@ tp.end_time AS endTime, tp.pro_cost AS proCost, tp.pro_brief AS proBrief, - tp.status, + sd.dict_name AS status, tp.bid_code AS bidCode, tp.sign_code AS signCode, tp.pro_code AS proCode FROM tb_project tp LEFT JOIN sys_build sb ON tp.org = sb.org_id + LEFT JOIN sys_dict sd ON sd.dict_code = tp.status AND sd.del_flag = 0 tp.del_flag = 0