项目4库bug修改

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -153,7 +153,7 @@
         s.name_lead AS nameLead,
         s.tel_lead AS telLead,
         s.status AS status,
-        s.is_rg AS isRg,
+        s.is_rg AS boolRg,
         s.rg_date AS rgDate,
         s.create_user_id AS createUserId,
         s.create_user_name AS createUserName,
@@ -165,12 +165,12 @@
         s.status_lamp AS statusLamp,
         s.kind_nature AS kindNature
         <if test="vo.status!=null and vo.status==3 and vo.month!=null and vo.month!=''">
-            ,src.yearAmtSj
+            ,src.yearPlanAmt
         </if>
         from sub_info s
         <if test="vo.status!=null and vo.status==3 and vo.month!=null and vo.month!=''">
             LEFT JOIN
-            (SELECT sub_id,sum(amt) AS yearAmtSj FROM sub_rpt_cont WHERE logic_delete_flag = 0 AND kj_month >= #{vo.month} GROUP BY sub_id) src
+            (SELECT SUM(amt) yearPlanAmt,sub_id FROM sub_amtplan WHERE y_month RLIKE #{vo.month} AND NOT ISNULL(amt) GROUP BY sub_id) src
             ON s.id=src.sub_id
         </if>
         <where>
@@ -188,14 +188,14 @@
                 and s.subject_id = #{vo.subjectId}
             </if>
             <if test="vo.indusKind!=null and vo.indusKind!=''">
-                and s.indus_kind like CONCAT(#{vo.indusKind}, '%')
-            </if>
-            <if test="vo.iks!=null">
-                and s.indus_kind IN
-                <foreach collection="vo.iks" open="(" close=")" separator="," item="item">
-                    (#{item})
-                </foreach>
+                <if test='vo.indusKind != "."'>
+                    and s.indus_kind like CONCAT(#{vo.indusKind}, '%')
+                </if>
+                <if test='vo.indusKind.toString() == "."'>
+                    AND ISNULL(s.indus_kind)
+                </if>
             </if>
+
             <if test="vo.startAmt!=null and vo.startAmt!=''">
                 and s.amt_total >= #{vo.startAmt}
             </if>
@@ -212,10 +212,10 @@
                 and s.status = #{vo.status}
                 <if test="vo.status==3">
                     <if test="vo.yearMixAmt!=null and vo.yearMixAmt!=''">
-                        and src.yearAmtSj >=#{vo.yearMixAmt}
+                        and src.yearPlanAmt >=#{vo.yearMixAmt}
                     </if>
-                    <if test="vo.yearMixAmt!=null and vo.yearMixAmt!=''">
-                        and src.yearAmtSj &lt;=#{vo.yearMaxAmt}
+                    <if test="vo.yearMaxAmt!=null and vo.yearMaxAmt!=''">
+                        and src.yearPlanAmt &lt;=#{vo.yearMaxAmt}
                     </if>
                     <if test="vo.beginDate!=null and vo.beginDate!=''">
                         and s.end_date >= #{vo.beginDate}
@@ -224,7 +224,7 @@
                         and s.end_date &lt;= #{vo.endDate}
                     </if>
                 </if>
-                <if test="vo.status=='2'">
+                <if test='vo.status==2'>
                     <if test="vo.beginDate!=null and vo.beginDate!=''">
                         and s.begin_date >= #{vo.beginDate}
                     </if>
@@ -232,12 +232,12 @@
                         and s.begin_date &lt;= #{vo.endDate}
                     </if>
                 </if>
-                <if test="vo.status=='9'">
+                <if test='vo.status==9'>
                     <if test="vo.beginDate!=null and vo.beginDate!=''">
-                        and s.rg_date >= #{vo.beginDate}
+                        and s.rt_date >= #{vo.beginDate}
                     </if>
                     <if test="vo.endDate!=null and vo.endDate!=''">
-                        and s.rg_date &lt;= #{vo.endDate}
+                        and s.rt_date &lt;= #{vo.endDate}
                     </if>
                 </if>
             </if>
@@ -245,7 +245,7 @@
     </select>
     <select id="queryStatistics" resultType="com.rtrh.projects.modules.projects.po.SubInfoGxj">
         select
-            status,abc,subject_id subjectId,indus_kind indusKind
+            status,abc,subject_id subjectId,indus_kind indusKind,is_rg AS boolRg
         from sub_info
         <where>
             logic_delete_flag = 0

projects-service/src/main/java/com/rtrh/projects/modules/projects/po/SubInfoGxj.java

@@ -2,9 +2,7 @@ package com.rtrh.projects.modules.projects.po;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.rtrh.projects.modules.system.po.TableBaseColomn;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -17,8 +15,8 @@ import java.util.Date;
  * @author jiangpengli
  * @since 2024-12-17
  */
-@Getter
-@Setter
+@Data
+@EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class SubInfoGxj extends TableBaseColomn implements Serializable {
 
@@ -122,7 +120,7 @@ public class SubInfoGxj extends TableBaseColomn implements Serializable {
     private String statusName;
 
     // 1-入规 0未入规
-    private Boolean isRg;
+    private Boolean boolRg;
 
     // 实际入轨日期
     @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
@@ -159,6 +157,7 @@ public class SubInfoGxj extends TableBaseColomn implements Serializable {
     private Long preProceNum;
     private Long preEndNum;
     private String yearAmtSj;
+    private String yearPlanAmt;
 
     private String preContent;
 }

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoQueryServiceImpl.java

@@ -26,6 +26,7 @@ import com.rtrh.projects.modules.system.dao.JUnitDao;
 import com.rtrh.projects.modules.system.enums.SysTableKind;
 import com.rtrh.projects.modules.system.po.JUnit;
 import com.rtrh.projects.modules.system.po.TSystable;
+import com.rtrh.projects.modules.system.service.ISubInduService;
 import com.rtrh.projects.modules.system.service.TSysTableService;
 import com.rtrh.projects.modules.utils.DateUtils;
 import com.rtrh.projects.vo.projects.SubFixGetBeginRateVo;
@@ -88,6 +89,9 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
     @Autowired
     private SubPreNewService subPreNewService;
 
+    @Autowired
+    private ISubInduService subInduService;
+
     @Override
     public Map<String, Integer> getWarningBySubId(String subId) {
 
@@ -165,7 +169,7 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
 
     @Override
     public List<SubInfoGxj> queryAll(LoginUserVO loginUser, SubInfoQueryTzVO queryVO) {
-        queryVO.setMonth(DateUtil.thisYear() + "01");
+        queryVO.setMonth(DateUtil.thisYear() +"");
         List<SubInfoGxj> data = subInfoMapper.queryPage(queryVO);
         if (CollectionUtil.isEmpty(data)) {
             return new ArrayList<>();
@@ -247,10 +251,13 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         if (StringUtils.isNotBlank(queryVO.getEndAmt())) {
             queryVO.setEndAmt(new BigDecimal(queryVO.getEndAmt()).multiply(new BigDecimal("10000")).toString());
         }
-        Optional.ofNullable(queryVO.getIndusKinds()).ifPresent(s -> {
-            String[] split = s.split(",");
-            queryVO.setIks(Arrays.asList(split));
-        });
+        if (StringUtils.isNotBlank(queryVO.getIndusKinds())){
+            queryVO.setIndusKind(queryVO.getIndusKinds());
+        }
+        // Optional.ofNullable(queryVO.getIndusKinds()).ifPresent(s -> {
+        //     String[] split = s.split(",");
+        //     queryVO.setIks(Arrays.asList(split));
+        // });
 
 
         PageHelper.startPage(page.getPageNo(), page.getPageSize());
@@ -292,10 +299,16 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
                     .setNum(v));
         });
         // 行业统计
-        List<TSystable> hyflDict = tSysTableService.getByKind(SysTableKind.HYFL);
-        Map<String, String> hyflNameMap = hyflDict.stream().collect(Collectors.toMap(TSystable::getCode, TSystable::getTitle));
+        List<SubIndu> hyflDict = subInduService.queryParentAll();
+        Map<String, String> hyflNameMap = hyflDict.stream().collect(Collectors.toMap(SubIndu::getCode, SubIndu::getTitle));
         Map<String, Long> indusKind = list.stream()
-                .collect(Collectors.groupingBy(e -> StringUtils.defaultIfBlank(e.getIndusKind(), "."), Collectors.counting()));
+                .collect(Collectors.groupingBy(e -> {
+                            if (StringUtils.isNotBlank(e.getIndusKind()) && e.getIndusKind().length() >= 2) {
+                                return e.getIndusKind().substring(0, 2);
+                            }
+                            return StringUtils.defaultIfBlank(e.getIndusKind(), ".");
+                        },
+                        Collectors.counting()));
         List<StatisticsVO.KvNum> hyflList = new ArrayList<>();
         indusKind.forEach((k, v) -> {
             hyflList.add(new StatisticsVO.KvNum()
@@ -303,7 +316,7 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
                     .setName(hyflNameMap.getOrDefault(k, ""))
                     .setNum(v));
         });
-        return new StatisticsVO()
+        StatisticsVO vo = new StatisticsVO()
                 .setNum(num)
                 .setANum(abc.getOrDefault("A", 0L))
                 .setBNum(abc.getOrDefault("B", 0L))
@@ -311,6 +324,30 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
                 .setNNum(abc.getOrDefault(".", 0L))
                 .setJsddData(jsddList)
                 .setHyflData(hyflList);
+
+        // 查询所有状态统计 开工数、开复工率、投产率 等
+        queryVO.setStatus(null);
+        List<SubInfoGxj> listTotal = subInfoMapper.queryStatistics(queryVO);
+        Map<String, Long> collect1 = listTotal.stream().collect(Collectors.groupingBy(SubInfoGxj::getStatus, Collectors.counting()));
+        Long zjNum1 = collect1.getOrDefault(SubInfoStatusEnum.ZJ.getCode(), 0L);
+        Long tcNum1 = collect1.getOrDefault(SubInfoStatusEnum.TC.getCode(), 0L);
+        Long xjNum1 = collect1.getOrDefault(SubInfoStatusEnum.XJ.getCode(), 0L);
+        // 开工数、开复工率、投产率
+        Long kgNum = zjNum1 + tcNum1;
+        vo.setYkgNum(kgNum);
+        BigDecimal total = BigDecimal.valueOf(zjNum1 + tcNum1 + xjNum1);
+        BigDecimal kfgRate = BigDecimal.ZERO;
+        if (total.compareTo(BigDecimal.ZERO) != 0) {
+            kfgRate = BigDecimal.valueOf(zjNum1 + tcNum1).divide(total, 2, RoundingMode.HALF_UP);
+        }
+        vo.setKfgRate(kfgRate);
+        vo.setTcRate(BigDecimal.valueOf(tcNum1).divide(BigDecimal.valueOf(zjNum1 + tcNum1 + xjNum1), 2, RoundingMode.HALF_UP));
+        // 已入规、未入规、入规率
+        long rgNum = listTotal.stream().filter(SubInfoGxj::getBoolRg).count();
+        vo.setYrgNum(rgNum);
+        vo.setWrgNum(listTotal.size() - rgNum);
+        vo.setRgRate(listTotal.size() == 0 ? new BigDecimal("0") : BigDecimal.valueOf(rgNum).divide(BigDecimal.valueOf(xjNum1 + zjNum1 + tcNum1), 2, RoundingMode.HALF_UP));
+        return vo;
     }
 
     @Override

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.stream.Collectors;
 
 import com.rtrh.core.vo.Message;
 import com.rtrh.projects.modules.projects.dao.*;
+import com.rtrh.projects.modules.projects.enums.*;
 import com.rtrh.projects.modules.projects.mapper.SubInfoMapper;
 import com.rtrh.projects.modules.projects.po.*;
 import com.rtrh.projects.modules.projects.service.*;
@@ -56,6 +57,7 @@ import com.rtrh.projects.modules.projects.enums.StatusEnum;
 import com.rtrh.projects.modules.projects.enums.SubIsHideStatusEnum;
 import com.rtrh.projects.modules.projects.enums.SubPlanStatusEnum;
 import com.rtrh.projects.modules.projects.enums.SubqestionStatus;
+import com.rtrh.projects.modules.projects.vo.export.SubInfoExportVO;
 import com.rtrh.projects.modules.system.SysConstant;
 import com.rtrh.projects.modules.system.dao.JDepartDao;
 import com.rtrh.projects.modules.system.dao.JUnitDao;
@@ -4750,7 +4752,7 @@ public class SubInfoServiceImpl implements SubInfoService {
     @Override
     public boolean rg(MoveDbParamVo vo){
         return subInfoDao.updateBySql(
-                "update sub_info set rg_date = ? where id = ?",
+                "update sub_info set rg_date = ?,is_rg=1 where id = ?",
                 vo.getRgDate(),
                 vo.getId()
         ) > 0;
@@ -5043,10 +5045,17 @@ public class SubInfoServiceImpl implements SubInfoService {
     public boolean moveDb(MoveDbParamVo vo) {
         SubInfo subinfo = subInfoDao.findById(vo.getId());
         if (StringUtils.isNotBlank(subinfo.getStatus())){
-            // todo 移库时间
             if (Integer.parseInt(vo.getStatus()) > Integer.parseInt(subinfo.getStatus())){
-                int i = subInfoDao.updateBySql("update sub_info set status='" + vo.getStatus() + "' where id='" + vo.getId() + "'");
-                return i > 0;
+                Map<String,String> map = new HashMap<String,String>(){{
+                    put(SubInfoStatusEnum.XJ.getCode(),"xj_date");
+                    put(SubInfoStatusEnum.ZJ.getCode(),"zj_date");
+                    put(SubInfoStatusEnum.TC.getCode(),"tc_date");
+                }};
+                if (SubInfoStatusEnum.CB.getCode().equals(subinfo.getStatus())){
+                    String sql = String.format("update sub_info set status='%s',%s=now() where id='%s'", vo.getStatus(), map.get(vo.getStatus()), vo.getId());
+                    int i = subInfoDao.updateBySql(sql);
+                    return i > 0;
+                }
             }else {
                 return false;
             }

projects-service/src/main/java/com/rtrh/projects/modules/projects/vo/StatisticsVO.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Setter
@@ -32,8 +33,34 @@ public class StatisticsVO {
      * C类数量
      */
     private Long cNum;
+    /**
+     * abc 类为空
+     */
     private Long nNum;
-
+    /**
+     * 已开工
+     */
+    private Long ykgNum;
+    /**
+     * 开复工率
+     */
+    private BigDecimal kfgRate;
+    /**
+     * 已入规
+     */
+    private Long yrgNum;
+    /**
+     * 未入规
+     */
+    private Long wrgNum;
+    /**
+     * 入规率
+     */
+    private BigDecimal rgRate;
+    /**
+     * 投产率
+     */
+    private BigDecimal tcRate;
     /**
      * 行业分类数据
      */

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoExportController.java

@@ -1321,7 +1321,8 @@ public class SubInfoExportController extends BaseController {
             List<Object> list1 = new ArrayList<>();
             Map<String,Object> columnMap = new LinkedHashMap<>();
             columnMap.put("count", value.size());
-            columnMap.put("amt", value.stream().map(SubInfoTotalExcel::getAmtTotal).reduce(BigDecimal.ZERO, BigDecimal::add));
+            BigDecimal reduce = value.stream().map(SubInfoTotalExcel::getAmtTotal).reduce(BigDecimal.ZERO, BigDecimal::add);
+            columnMap.put("amt", name.equals(SubInfoStatusEnum.TC.getDesc() + "项目") ? "/" : reduce.divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP));
             list1.add(columnMap);
             map.put(key, list1);
         });
@@ -1337,7 +1338,7 @@ public class SubInfoExportController extends BaseController {
         List<Object> list = new ArrayList<>();
         Map<String, Object> hjMap = new LinkedHashMap<>();
         hjMap.put("count", cb.size());
-        hjMap.put("amt", cbAmtSum);
+        hjMap.put("amt", name.equals(SubInfoStatusEnum.TC.getDesc() + "项目") ? "/" : cbAmtSum.divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP));
         list.add(hjMap);
 
         rowMap.put("hj", list);

projects/src/main/webapp/vmodules/subject/subInfo/tz/end.jsp

@@ -419,6 +419,38 @@
                             </div>
                         </div>--%>
                     </label>
+                        <label class="juli">
+                            已入规<span class="lanse-first">{{beginRate.yrgNum}}</span>
+                            <div class="progress-div">
+                                <div class="layui-progress">
+                                    <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
+                                </div>
+                            </div>
+                        </label>
+                        <label class="juli">
+                            未入规<span class="lanse-first">{{beginRate.wrgNum}}</span>
+                            <div class="progress-div">
+                                <div class="layui-progress">
+                                    <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
+                                </div>
+                            </div>
+                        </label>
+                        <label class="juli">
+                            入规率<span class="lanse-first">{{beginRate.rgRate}}</span>
+                            <div class="progress-div">
+                                <div class="layui-progress">
+                                    <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
+                                </div>
+                            </div>
+                        </label>
+                        <label class="juli">
+                            投产率<span class="lanse-first">{{beginRate.tcRate}}</span>
+                            <div class="progress-div">
+                                <div class="layui-progress">
+                                    <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
+                                </div>
+                            </div>
+                        </label>
 <%--                    <label class="juli" style="display: none">
                         投资进度<span class="lanse-first">{{beginRate.amtRate}}%</span>
                         <div class="progress-div">
@@ -647,10 +679,10 @@
 </script>
 <script type="text/html" id="date">
     <div title="">
-        <div class="line"><span class="qianse">计划开工：</span><span class="shense">{{d.beginDate}}</span>
+        <div class="line"><span class="qianse">计划入规时间：</span><span class="shense">{{d.rtDate?d.rtDate:''}}</span>
 
         </div>
-        <div class="line"><span class="qianse">计划竣工：</span><span class="shense">{{d.endDate}}</span>
+        <div class="line"><span class="qianse">实际入规时间：</span><span class="shense">{{d.rgDate?d.rgDate:''}}</span>
 
         </div>
     </div>
@@ -780,9 +812,8 @@
                 var formatwdate = y + '-' + m + '-' + d;
                 layui.laydate.render({
                     elem: '#startTime',
-                    range: '~',
                     theme: layDateTheme,
-                    value: "2018" + "-01-01 ~ " + y + "-12-31"
+                    range: '~'
                 });
                 layui.laydate.render({
                     elem: '#dateConfirm',
@@ -1037,7 +1068,7 @@
                         {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
                         {field: 'subjectName', title: '项目所在地', width: 100},
                         {field: 'content', title: '项目基本情况', minWidth: 300},
-                        {field: 'rgDate', title: '升规入统时间', minWidth: 100},
+                        {field: 'rtDate', title: '升规入统时间', minWidth: 160,templet: '#date'},
                         {field: 'progress', title: '进展情况', minWidth: 300},
                         {field: 'remark', title: '备注', minWidth: 150},
                         {title: '操作', width: 200, toolbar: '#toolBar', fixed: 'right'},

projects/src/main/webapp/vmodules/subject/subInfo/tz/main.jsp

@@ -222,6 +222,22 @@
                                             </div>
                                         </div>
                                     </label>
+                                    <label class="juli">
+                                        已开工<span class="lanse-first">{{beginRate.ykgNum}}</span>
+                                        <div class="progress-div">
+                                            <div class="layui-progress">
+                                                <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
+                                            </div>
+                                        </div>
+                                    </label>
+                                    <label class="juli">
+                                        开（复）工率<span class="lanse-first">{{beginRate.kfgRate}}</span>
+                                        <div class="progress-div">
+                                            <div class="layui-progress">
+                                                <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
+                                            </div>
+                                        </div>
+                                    </label>
                                 </div>
                 <%--         &lt;%&ndash;           <label class="juli">--%>
                 <%--                        未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>--%>
@@ -339,7 +355,7 @@
                     <label class="juli"
                            @click="levelList('indusKinds',item.name?item.name:item.code,item.code)"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
             </div>
@@ -667,7 +683,7 @@
 
 <script type="text/html" id="date">
     <div title="">
-        <div class="line"><span class="shense">{{d.tcDate?d.tcDate:"--"}}</span>
+        <div class="line"><span class="shense">{{d.endDate?d.endDate:"--"}}</span>
 
         </div>
 <%--        <div class="line"><span class="qianse">计划开工：</span><span class="shense">{{d.beginDate}}</span>--%>
@@ -1137,8 +1153,8 @@
                                 return (d.amtTotal / 10000).toFixed(2) + "亿元";
                             }
                         },
-                        {field: 'tcDate',  title: '建成投产时间', width: 100,templet: '#date'},
-                        {field: 'yearAmtSj', title: '年度投资', width: 100},
+                        {field: 'endDate',  title: '建成投产时间', width: 100,templet: '#date'},
+                        {field: 'yearPlanAmt', title: '年度投资(万元)', width: 100},
                         {field: 'progress',  title: '进展情况', width: 300},
                         {field: 'remark', title: '备注', width: 200},
                         {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right'},

projects/src/main/webapp/vmodules/subject/subInfo/tz/new.jsp

@@ -225,15 +225,22 @@
                             </div>
                         </div>
                     </label>
-                    <%--                    <label class="juli">--%>
-                    <%--                        未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>--%>
-                    <%--                        <div class="progress-div">--%>
-                    <%--                            <div class="layui-progress">--%>
-                    <%--                                <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>--%>
-                    <%--                            </div>--%>
-                    <%--                        </div>--%>
-                    <%--                    </label>--%>
-
+                    <label class="juli">
+                        已开工<span class="lanse-first">{{beginRate.ykgNum}}</span>
+                        <div class="progress-div">
+                            <div class="layui-progress">
+                                <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
+                            </div>
+                        </div>
+                    </label>
+                    <label class="juli">
+                        开（复）工率<span class="lanse-first">{{beginRate.kfgRate}}</span>
+                        <div class="progress-div">
+                            <div class="layui-progress">
+                                <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
+                            </div>
+                        </div>
+                    </label>
   <%--                  <label class="juli" onclick="levelList('abcs','A类','A')">
                         A类项目数
                         <span class="lanse-first" >{{beginRate.aNum}}</span>

projects/src/main/webapp/vmodules/subject/subInfo/tz/xmzk.jsp

@@ -811,7 +811,6 @@
                 // });
 
                 // 表格分页数据
-                param.status = 1;
                 App.postJson("/api/subInfo/query/queryPage", param, function (res) {
                     self.dataList = res.rows;
                     self.loadPage(res.total);
@@ -870,12 +869,10 @@
             },
             getStatusName: function (status) {
                 const statusMap = {
-                    '0': '暂存',
-                    '1': '项目前期',
-                    '6': '待开工',
-                    '7': '施工中',
-                    '8': '暂停施工',
-                    'A': '已竣工'
+                    '1': '储备',
+                    '2': '新建',
+                    '3': '在建',
+                    '9': '投产'
                 };
                 return statusMap[status] || '未知状态';
             },
@@ -886,7 +883,6 @@
                 });
             },
             loadTable: function () {
-                // 状态名称映射
                 this.dataList.forEach(item => {
                     item.statusName = this.getStatusName(item.status);
                 });