Procházet zdrojové kódy

问题督办-项目详情查看bug修复

Perperon před 3 měsíci
rodič
revize
797775eadd

+ 3 - 0
projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.java

@@ -1,6 +1,7 @@
 package com.rtrh.projects.modules.projects.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import com.rtrh.projects.modules.projects.dto.SubFixCbSearch;
 import com.rtrh.projects.modules.projects.po.RptCont;
@@ -102,4 +103,6 @@ public interface SubInfoMapper {
 
     List<WorkBenchVO> queryExceedMonthly(@Param("lastMonth") String lastMonth);
 
+    Map<String,Object> getSubInfoByFgwId(@Param("id") String id,@Param("queryYear") String queryYear);
+
 }

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

@@ -1121,4 +1121,66 @@
         GROUP BY
             a.id
     </select>
+
+    <select id="getSubInfoByFgwId" resultType="map" parameterType="string">
+        SELECT
+            sa.yearAmt,
+            src.yearAmtSj,
+            src.yearAmtRt,
+            IF
+            ( sa.yearAmt != 0, ROUND(( src.yearAmtSj - sa.yearAmt ) * 100 / sa.yearAmt, 2 ), NULL ) AS `offset`,
+            sqi.title problemReason,
+            IF
+            ( us.id IS NULL, 0, 1 ) AS isBl,
+            a.*,
+            b.title AS unitName,
+            f.title AS mainName,
+            c.title AS indusName,
+            d.title AS manageName,
+            e.title subjectId
+        FROM
+        sub_info a
+        LEFT JOIN j_unit b ON a.unit_id = b.id
+        LEFT JOIN j_unit d ON a.manage_id = d.id
+        LEFT JOIN j_unit f ON a.main_id = f.id
+        LEFT JOIN t_systable c ON a.indus_kind = c.id
+        LEFT JOIN t_systable e ON a.subject_id = e.id
+        LEFT JOIN sec_user_sub us ON a.id = us.sub_id
+        AND us.logic_delete_flag = 0
+        LEFT JOIN sub_q_info sqi ON sqi.sub_id = a.id
+        AND sqi.logic_delete_flag = 0
+        AND sqi.`status` = '0'
+        AND sqi.kind = 2
+        LEFT JOIN (
+        SELECT
+        sum( amt ) yearAmt,
+        sa.sub_id
+        FROM
+        sub_amtplan sa
+        WHERE
+        sa.logic_delete_flag = 0
+        AND sa.y_month >= #{queryYear}
+        AND sa.y_month &lt;= #{queryYear}
+        GROUP BY
+        sa.sub_id
+        ) sa ON sa.sub_id = a.id
+        LEFT JOIN (
+        SELECT
+        sum( amt ) yearAmtSj,
+        sum( amt_rt ) yearAmtRt,
+        src.sub_id
+        FROM
+        sub_rpt_cont src
+        WHERE
+        src.logic_delete_flag = 0
+        AND src.kj_month >= #{queryYear}
+        AND src.kj_month &lt;= #{queryYear}
+        GROUP BY
+        src.sub_id
+        ) src ON src.sub_id = a.id
+        WHERE
+        a.id = #{id}
+        GROUP BY
+        a.id
+    </select>
 </mapper>

+ 18 - 0
projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubPreNewMapper.xml

@@ -5,6 +5,7 @@
     <select id="pageQueryCbToXjData" resultType="map" parameterType="map">
         SELECT
         a.id as id,
+        a.sub_code as subCode,
         a.sub_name as subName,
         a.begin_date as beginDate,
         a.end_date as endDate,
@@ -12,11 +13,13 @@
         c.title as mainTitle,
         a.qy_date as qyDate,
         a.cb_num as cbNum,
+        ts.title as indusName,
         concat(a.name_lead,':',a.tel_lead) as datePlan
         FROM
         sub_info a
         LEFT JOIN j_unit d ON a.unit_id = d.id
         LEFT JOIN j_unit c ON a.main_id = c.id
+        LEFT JOIN t_systable ts ON ts.id = a.indus_kind
         WHERE
         a.STATUS = '1'
         AND ( a.cb_status = '3' OR a.cb_status = '4' OR a.cb_status = '5' )
@@ -72,16 +75,20 @@
 
     <select id="pageQueryXjToZjData" resultType="map" parameterType="map">
         SELECT
+        a.id as id,
+        a.sub_code as subCode,
         a.sub_name as subName,
         a.begin_date as beginDate,
         a.end_date as endDate,
         d.title as unitTitle,
         c.title as mainTitle,
+        ts.title as indusName,
         concat(a.name_lead,':',a.tel_lead) as datePlan
         FROM
         sub_info a
         LEFT JOIN j_unit d ON a.unit_id = d.id
         LEFT JOIN j_unit c ON a.main_id = c.id
+        LEFT JOIN t_systable ts ON ts.id = a.indus_kind
         WHERE
         a.begin_date &lt;= NOW()
         AND a.`status` = 2
@@ -136,16 +143,20 @@
 
     <select id="pageQueryZjToTcData" resultType="map" parameterType="map">
         SELECT
+            a.id,
+            a.sub_code as subCode,
             a.sub_name as subName,
             a.begin_date as beginDate,
             a.end_date as endDate,
             d.title as unitTitle,
             c.title as mainTitle,
+            ts.title as indusName,
             concat(a.name_lead,':',a.tel_lead) as datePlan
         FROM
         sub_info a
         LEFT JOIN j_unit d ON a.unit_id = d.id
         LEFT JOIN j_unit c ON a.main_id = c.id
+        LEFT JOIN t_systable ts ON ts.id = a.indus_kind
         WHERE
         a.end_date &lt;= NOW()
         AND a.`status` = 3
@@ -200,17 +211,21 @@
 
     <select id="pageQueryTcToRgData" resultType="map" parameterType="map">
         SELECT
+            a.id,
+            a.sub_code as subCode,
             a.sub_name as subName,
             a.begin_date as beginDate,
             a.end_date as endDate,
             d.title as unitTitle,
             c.title as mainTitle,
             a.rt_date as rtDate,
+            ts.title as indusName,
             concat(a.name_lead,':',a.tel_lead) as datePlan
         FROM
         sub_info a
         LEFT JOIN j_unit d ON a.unit_id = d.id
         LEFT JOIN j_unit c ON a.main_id = c.id
+        LEFT JOIN t_systable ts ON ts.id = a.indus_kind
         WHERE
         a.rt_date &lt;= NOW()
         AND (a.is_rg = 0 or a.is_rg is null)
@@ -284,6 +299,8 @@
     <select id="pageQueryPreWarnData" resultType="map" parameterType="map">
         SELECT
             c.id subId,
+            ts.title as indusName,
+            c.sub_code as subCode,
             c.sub_name subName,
             d.title unitName,
             a.unit_desc unitDesc,
@@ -304,6 +321,7 @@
         LEFT JOIN j_unit d ON c.unit_id = d.id
         LEFT JOIN j_depart jd ON jd.id = a.sub_depart_id
         LEFT JOIN j_unit ju ON ju.id = a.sub_unit_id
+        LEFT JOIN t_systable ts ON ts.id = c.indus_kind
         LEFT JOIN sub_manage e ON c.id = e.sub_id
         AND e.logic_delete_flag = 0
         LEFT JOIN sub_verify f ON f.sub_id = c.id

+ 2 - 0
projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SubInfoService.java

@@ -38,6 +38,8 @@ public interface SubInfoService {
 	 */
 	Map<String,Object> getSubInfoById(String id, String queryYear);
 
+	Map<String,Object> getSubInfoByFgwId(String id, String queryYear);
+
 	/**
 	 * 查询申报项目
 	 * @param page

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

@@ -541,6 +541,152 @@ public class SubInfoServiceImpl implements SubInfoService {
         return old;
     }
 
+    @Override
+    @TargetDataSource(value="secondary")
+    public Map<String, Object> getSubInfoByFgwId(String id, String queryYear) {
+        Map<String, Object> data = subInfoMapper.getSubInfoByFgwId(id, queryYear);
+        String kindName = "";
+        //后续需替换数据源,请使用mybatis方式
+        if (data.get("kind") != null) {
+            String[] kind = data.get("kind").toString().split(",");
+            for (String item : kind) {
+                String oneKineName = tSysTableService.getTitleByKindAndCode(SysTableKind.XMLX, item);
+                if (StringUtil.isNotEmpty(oneKineName)) {
+                    kindName += oneKineName + " ";
+                }
+            }
+        }
+        data.put("kindName", kindName);
+        String propKindName = tSysTableService.getTitleByKindAndCode(SysTableKind.JSXZ, data.get("prop_kind") == null ? "" : String.valueOf(data.get("prop_kind")));
+        data.put("propKindName", propKindName);
+        //建设地点
+        String subjectName = tSysTableService.getTitleByKindAndCode(SysTableKind.JSDD, data.get("subject_id") == null ? "" : String.valueOf(data.get("subject_id")));
+        data.put("subjectName", subjectName);
+        String kindNature = tSysTableService.getTitleByKindAndCode(SysTableKind.TZXZ, data.get("kind_nature") == null ? "0" : data.get("kind_nature").toString());
+        data.put("kindNature", kindNature);
+        String approve_id = data.get("approve_id") == null ? null : String.valueOf(data.get("approve_id"));
+        if (StringUtil.isNotEmpty(approve_id)) {
+            JUnit unit = jUnitDao.findById(approve_id);
+            data.put("approveName", unit == null ? "" : unit.getTitle());
+        }
+        String departId = data.get("approve_departid") == null ? null : String.valueOf(data.get("approve_departid"));
+        if (StringUtil.isNotEmpty(departId)) {
+            JDepart depart = jDepartDao.findById(departId);
+            data.put("approveDepartName", depart == null ? "" : depart.getTitle());
+        }
+        String departId2 = data.get("approve_departid2") == null ? null : String.valueOf(data.get("approve_departid2"));
+        if (StringUtil.isNotEmpty(departId2)) {
+            //市发改委
+            JDepart depart = jDepartDao.findById(departId2);
+            data.put("approveDepartName2", depart == null ? "" : depart.getTitle());
+        }
+
+        BigDecimal zero = new BigDecimal(0);
+        BigDecimal amtComp = (BigDecimal) data.get("amt_comp");
+        BigDecimal amtYear = (BigDecimal) data.get("amt_year");
+        if (amtComp == null || amtYear == null
+                || amtYear.compareTo(zero) == 0
+                || amtComp.compareTo(zero) == 0) {
+            data.put("amtPercent", 0);
+        } else {
+            data.put("amtPercent", amtComp.multiply(new BigDecimal(100)).divide(amtYear, 2, RoundingMode.HALF_UP).setScale(0, RoundingMode.HALF_UP).intValue());
+        }
+        if (data.get("amt_year") == null) {
+            data.put("amt_year", 0);
+        }
+
+        //到位资金
+        if (data.get("amt_comptotal") == null) {
+            data.put("amt_comptotal", 0);
+        }
+
+        //创建人
+        if (data.get("create_user_id") != null) {
+            SecUser user = secUserDao.findById(String.valueOf(data.get("create_user_id")));
+            if (null != user) {
+                data.put("createUserName", user.getLogin());
+            }
+        }
+
+        BigDecimal numTotal = (BigDecimal) data.get("num_total");
+        BigDecimal numComp = (BigDecimal) data.get("num_comp");
+        if (numComp == null || numTotal == null
+                || numTotal.compareTo(zero) == 0
+                || numComp.compareTo(zero) == 0) {
+            data.put("numPercent", 0);
+        } else {
+            data.put("numPercent", numComp.multiply(new BigDecimal(100)).divide(numTotal, 2, RoundingMode.HALF_UP).setScale(0, RoundingMode.HALF_UP).intValue());
+        }
+
+        String is_rk = (String) data.get("is_rk");
+        if (is_rk == null) {
+            data.put("is_rk", 0);
+        }
+
+        //项目是否隐藏
+        //是否隐藏
+        SubIsHideStatusEnum subIsHideStatusEnum = SubIsHideStatusEnum.getEnumByKey(String.valueOf(data.get("is_hide") == null ? "0" : data.get("is_hide")));
+        if (subIsHideStatusEnum != null) {
+            data.put("isHideName", subIsHideStatusEnum.getDesc());
+        }
+
+
+        //20231219 增加偏离度
+        BigDecimal yearAmt = data.get("yearAmt") == null ? BigDecimal.ZERO : (BigDecimal) data.get("yearAmt");
+        BigDecimal yearAmtSj = data.get("yearAmtSj") == null ? BigDecimal.ZERO : (BigDecimal) data.get("yearAmtSj");
+
+
+        if (yearAmt.compareTo(BigDecimal.ZERO) != 0) {
+            data.put("pld", (yearAmtSj.subtract(yearAmt)).multiply(new BigDecimal(100)).divide(yearAmt, BigDecimal.ROUND_HALF_UP, 2));
+
+        } else {
+            data.put("pld", BigDecimal.ZERO);
+        }
+
+
+        //当前项目状态
+        String status = String.valueOf(data.get("status"));
+        ProjectStatusEnum statusEnum = ProjectStatusEnum.getEnumByKey(status);
+        switch (statusEnum) {
+            case DKG:
+                //待开工
+                String startQueryHql = "FROM SubStart WHERE logicDeleteFlag = ? AND subId = ? ";
+                Long startCount = subInfoDao.getCount(startQueryHql, 0, id);
+                if (startCount == 0) {
+                    data.put("statusName", ProjectStatusEnum.DKG.getDesc() + ":未提交审核");
+                } else {
+                    data.put("statusName", ProjectStatusEnum.DKG.getDesc() + ":待审核");
+                }
+                break;
+            case YKG:
+                //已开工
+                String completedQueryHql = "FROM SubCompleted WHERE logicDeleteFlag = ? AND subId = ? ";
+                Long completedCount = subInfoDao.getCount(completedQueryHql, 0, id);
+                if (completedCount == 0) {
+                    data.put("statusName", ProjectStatusEnum.YKG.getDesc() + ":无竣工申请");
+                } else {
+                    if (data.get("status_sp") == null || Objects.equals(data.get("status_sp"), ApprovalStatusEnum.DSP.getKey())) {
+                        data.put("statusName", ProjectStatusEnum.YKG.getDesc() + ":待审核");
+                    } else if (Objects.equals(data.get("status_sp"), ApprovalStatusEnum.YSP.getKey())) {
+                        data.put("statusName", ProjectStatusEnum.YKG.getDesc() + ":竣工申请已审核");
+                    }
+                }
+                break;
+            default:
+                data.put("statusName", statusEnum.getDesc());
+                break;
+        }
+
+        if (!Objects.equals("0", data.get("status_fgw"))) {
+            //显示红绿灯,且不是绿灯
+            SubquestionInfo subquestionInfo = subquestioninfoservice.findByColor(String.valueOf(data.get("id")), (Date) data.get("date_fgw"));
+            if (subquestionInfo != null) {
+                data.put("colorReason", subquestionInfo.getTitle());
+            }
+        }
+        return data;
+    }
+
     @Override
     public Map<String, Object> getSubInfoById(String id, String queryYear) {
         Map<String, Object> data = subInfoDao.getSubInfoById(id, queryYear);

+ 167 - 0
projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoController.java

@@ -1404,6 +1404,173 @@ public class SubInfoController extends BaseController {
 
     }
 
+    @GetMapping("detailFgwView")
+    public ModelAndView detailFgwView(Model model, String subId, String lastUrl, Boolean layer, String queryYear, Boolean isCt) {
+
+
+        Map<String, Object> subInfo = subInfoService.getSubInfoByFgwId(subId, queryYear);
+
+
+        final String[] light = {""};
+
+
+        if ((subInfo.get("status") == null ? "0" : subInfo.get("status") + "").equals(ProjectStatusEnum.PRE.getKey())) {
+            //判断灯色
+            //判断项目前期问题
+
+            //获取项目前期资料
+            List<SubPreNewResultVO> list = subPreNewService.listBySubId(subId);
+            //判断前期是否有问题
+            list.stream().forEach(v -> {
+                String status = checkPreLigth(v);
+                if ("yellow".equals(status)) {
+                    if (!"red".equals(status)) {
+                        light[0] = "yellow";
+                    }
+                } else if ("red".equals(status)) {
+                    light[0] = "red";
+                }
+
+            });
+        } else {
+            //判断偏离度问题
+            BigDecimal pld = subInfo.get("pld") == null ? BigDecimal.ZERO : (BigDecimal) subInfo.get("pld");
+            //-30到-10  为黄色
+            if (new BigDecimal(-30).compareTo(pld) <= 0 && new BigDecimal(-10).compareTo(pld) >= 0) {
+                light[0] = "yellow";
+            }//小于 -30   为红色
+            else if (new BigDecimal(-30).compareTo(pld) > 0) {
+                light[0] = "red";
+            }
+
+            //判断 月报红黄灯
+            PreWarnDataQueryVO queryVO = new PreWarnDataQueryVO();
+            queryVO.setSubId(subId);
+            Page pageData = subRptContService.pageMonthWarnData(new Page(), getCurUser().getLoginUser(), queryVO);
+            if (pageData.getList().size() > 0) {
+                List<Map<String, Object>> list = pageData.getList();
+                list.stream().forEach(v -> {
+                    Calendar calendar = Calendar.getInstance();
+                    Date newDate = calendar.getTime();
+                    calendar.set(Calendar.DAY_OF_MONTH, 5);
+
+                    if (v.get("monthId") != null) {
+                        if (v.get("create_time") != null) {
+                            //填写了月报   但是超过3天为  红色
+                            if ((((Date) v.get("create_time")).getTime() - calendar.getTime().getTime()) > (86400 * 3)) {
+                                light[0] = "red";
+                            } else {
+                                if (!"red".equals(light[0])) {
+                                    light[0] = "yellow";
+                                }
+                            }
+                        }
+                    } else {
+                        //未填写  月报 超过下月5号 3天   为红色
+                        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                        String time = format.format(calendar.getTime());
+                        if (newDate.getTime() - calendar.getTime().getTime() > (86400 * 3)) {
+                            light[0] = "red";
+                        } else {
+                            if (!"red".equals(light[0])) {
+                                light[0] = "yellow";
+                            }
+                        }
+                    }
+                });
+            }
+        }
+
+
+        //项目前期,月报 ,偏离度  都没有灯色
+        if ("yellow".equals(light[0])) {
+            subInfo.put("status_fgw", "1");
+        } else if ("red".equals(light[0])) {
+            subInfo.put("status_fgw", "2");
+        } else {
+            subInfo.put("status_fgw", "0");
+        }
+
+
+        //判断是否  是项目单位, 并且项目处于 项目前期过程中。 能直接进入项目前期
+        String status = String.valueOf(subInfo.get("status"));
+        if (ProjectStatusEnum.PRE.getKey().equals(status) && "2".equals(getCurUser().getKindUnit())) {
+            subInfo.put("preCheck", true);
+        }
+        //判断是否项目已经竣工
+        model.addAttribute("completeCheck", ProjectStatusEnum.END.getKey().equals(status));
+
+        model.addAttribute("sunInfo", subInfo);
+
+        int currYear = DateUtil.thisYear();
+        model.addAttribute("currYear", currYear);
+        model.addAttribute("lastUrl", lastUrl);
+
+        model.addAttribute("layer", Boolean.TRUE.equals(layer));
+        model.addAttribute("canPrint", false);
+        model.addAttribute("queryYear", queryYear);
+
+        //当前状态
+        if (Boolean.TRUE.equals(isCt)) {
+            return new ModelAndView("/vmodules/statics/layer/subInfo/projectInfo.jsp");
+        }
+
+        //总完成投资
+        BigDecimal allEndAmt = BigDecimal.ZERO;
+        BigDecimal totalAmt = (BigDecimal) (subInfo.get("amt_total"));    //这个原始用法出现问题,类型错误报错
+//        BigDecimal totalAmt = new BigDecimal(((Float) subInfo.get("amt_total")).toString());
+        List<RptCont> allRpt = subRptContService.getListBySub(subId, null, RptContKindEnum.MONTH);
+        if (CollectionUtil.isNotEmpty(allRpt)) {
+            double sum = allRpt.stream().mapToDouble(new ToDoubleFunction<RptCont>() {
+                @Override
+                public double applyAsDouble(RptCont value) {
+                    if (value.getAmt() != null) {
+                        return value.getAmt().doubleValue();
+                    }
+                    return 0;
+                }
+            }).sum();
+            allEndAmt = BigDecimal.valueOf(sum);
+        }
+        if (totalAmt == null) {
+            totalAmt = BigDecimal.ZERO;
+        }
+        model.addAttribute("totalAmt", totalAmt.divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_UP));
+        model.addAttribute("allEndAmt", allEndAmt.divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_UP));
+        if (BigDecimal.ZERO.compareTo(totalAmt) != 0) {
+            model.addAttribute("allEndAmtRate", allEndAmt.divide(totalAmt, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP));
+        } else {
+            model.addAttribute("allEndAmtRate", "0");
+        }
+        BigDecimal yearAmt = BigDecimal.ZERO;
+        List<SubAmtPlan> currYearAmtPlanList = subAmtPlanDao.getBySubId(subId, String.valueOf(currYear));
+        if (CollectionUtil.isNotEmpty(currYearAmtPlanList)) {
+            for (SubAmtPlan amt : currYearAmtPlanList) {
+                if (amt.getAmt() != null) {
+                    yearAmt = yearAmt.add(amt.getAmt());
+                }
+            }
+        }
+
+        BigDecimal yearAmtSj = (BigDecimal) subInfo.get("yearAmtSj");
+        if (yearAmtSj == null) {
+            yearAmtSj = BigDecimal.ZERO;
+        }
+
+
+        model.addAttribute("yearPlanAmt", (yearAmt).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));
+        model.addAttribute("yearAmt", yearAmt.divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));
+        model.addAttribute("yearAmtSj", yearAmtSj.divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP));
+        if (BigDecimal.ZERO.compareTo(yearAmt) != 0) {
+            model.addAttribute("yearEndAmtRate", yearAmtSj.divide(yearAmt, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP));
+        } else {
+            model.addAttribute("yearEndAmtRate", 0);
+        }
+
+        return new ModelAndView("/vmodules/subject/subInfo/oldDetailView.jsp");
+
+    }
+
 
     @GetMapping("detailViewOut")
     public ModelAndView detailViewOut(Model model, String subId, String lastUrl, Boolean layer, String queryYear, Boolean isCt) {

+ 1 - 1
projects/src/main/webapp/vmodules/problem/info/cbToXjWarn.jsp

@@ -868,7 +868,7 @@
                 var index = layer.open({
                     type: 2,
                     area: ['1000px', '800px'],
-                    content: App.getUrl("/subject/subInfo/detailView?layer=true&subId="+ obj.data.subId + "&lastUrl=" + window.location.href),
+                    content: App.getUrl("/subject/subInfo/detailView?layer=true&subId="+ obj.data.id + "&lastUrl=" + window.location.href),
                 });
                 layui.layer.full(index);
             },

+ 3 - 3
projects/src/main/webapp/vmodules/project/projectInfo.jsp

@@ -128,9 +128,9 @@
             <table class="table1 page-table">
                 <tr>
                     <td class="label" style="width: 10%">项目代码</td>
-                    <td style="width: 40%">${sunInfo.subCode }</td>
+                    <td style="width: 40%">${sunInfo.sub_code }</td>
                     <td class="label" style="width: 10%">项目名称</td>
-                    <td style="width: 40%">${sunInfo.subName }</td>
+                    <td style="width: 40%">${sunInfo.sub_name }</td>
                 </tr>
                 <tr>
                     <td class="label" style="width: 10%">建设性质</td>
@@ -152,7 +152,7 @@
                 </tr>
                 <tr>
                     <td class="label">项目单位</td>
-                    <td>${sunInfo.unitDesc }</td>
+                    <td>${sunInfo.unitName }</td>
                 </tr>
                 <tr>
                     <td class="label">创建用户</td>

+ 3 - 3
projects/src/main/webapp/vmodules/subject/subInfo/oldDetailView.jsp

@@ -229,8 +229,8 @@
 						<img v-if="warningLight.jg === 2" class="light-rgb-red" src="${WebSite.asset}/css/images/light-red.png" />
 						<div class="light-name">竣工警示灯</div>
 					</div>
-					<div class="light-item" @click="onChangeActive(2)">
-						<%-- 偏离度显示 --%>
+					<%--<div class="light-item" @click="onChangeActive(2)">
+						&lt;%&ndash; 偏离度显示 &ndash;%&gt;
 						<c:choose>
 							<c:when test="${sunInfo.status_fgw == '2'}">
 								<img class="light-rgb-red"   src="${WebSite.asset}/css/images/light-red.png" title="${not empty sunInfo.problemReason ? sunInfo.problemReason : '暂无描述'}"></img>
@@ -243,7 +243,7 @@
 							</c:otherwise>
 						</c:choose>
 						<div class="light-name">偏离度警示灯</div>
-					</div>
+					</div>--%>
 				</div>
 
 			</div>