工程

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<Map<String, String>>
+     * @return List<Map < String, String>>
      * @description
      * @author cwchen
      * @date 2024/3/20 9:40
      */
     @MapKey("planId")
     List<Map<String, String>> getGxWeight(String bidCode);
+
+    /**
+     * 获取工程状态
+     * @return Map<String, Map<String, String>>
+     * @description
+     * @author cwchen
+     * @date 2024/3/27 11:05
+     */
+    @MapKey("name")
+    Map<String, Map<String, String>> getProStatus();
 }

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<String, Map<String, String>> proStatusList = new HashMap<>(16);
+
 
     @Override
     public List<ProVo> 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<String, String> 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"));

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
         <where>
             tp.del_flag = 0
             <if test="keyWord !=null and keyWord!=''">
@@ -314,4 +315,13 @@
         FROM tb_gx_plan
         WHERE bid_code = #{bidCode}
     </select>
+    <!--获取工程状态-->
+    <select id="getProStatus" resultType="java.util.Map">
+        SELECT sd2.dict_code AS id,
+               sd2.dict_name AS name
+        FROM sys_dict sd
+        LEFT JOIN sys_dict sd2 ON sd.dict_code = sd2.p_code AND sd2.del_flag = 0
+        WHERE sd.dict_code = 1200 AND sd.del_flag = 0
+        ORDER BY sd2.dict_sort
+    </select>
 </mapper>

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
         <where>
             tp.del_flag = 0
             <if test="keyWord !=null and keyWord!=''">