2.26bug

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

@@ -885,9 +885,20 @@
             b.remark as remark,
             b.begin_date as beginDate,
             b.end_date as endDate,
-            b.rt_date as rtDate
+            b.rt_date as rtDate,
+            b.status_red as statusRed
         from sub_fix a left join sub_info b on a.sub_id = b.id
         where a.cat = #{queryVO.stateFix} and a.year = #{queryVO.year} and b.logic_delete_flag = 0
+        <if test="queryVO.statusRed!=null and queryVO.statusRed!=''">
+            <choose>
+                <when test="queryVO.statusRed==0">
+                    and (b.status_red = '0' or b.status_red is null)
+                </when>
+                <otherwise>
+                    and b.status_red = #{queryVO.statusRed}
+                </otherwise>
+            </choose>
+        </if>
         <if test="queryVO.subName != null and queryVO.subName != ''">
             AND b.sub_name LIKE CONCAT('%', #{queryVO.subName}, '%')
         </if>

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

@@ -34,4 +34,6 @@ public class SubFixListVo {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date rtDate;    //入统时间
 
+    private String statusRed;
+
 }

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

@@ -15,6 +15,7 @@
         WHERE
             a.logic_delete_flag = 0
           AND u.status_subject = '0'
+          AND a.cat = '1'
           AND u.id = a.user_id
           AND u.id = #{userId}
     </select>

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

@@ -428,11 +428,15 @@
         methods: {
             // 红黄灯
             toEditLight(obj){
+                let self = this;
                 App.openLayer({
                     title: "红黄灯设置",
                     content: App.getUrl("/subject/subInfo/light?subId=" + obj.data.id),
                     width: 500,
-                    height: 400
+                    height: 400,
+                    end: function() {
+                        self.getData();
+                    }
                 })
                 layui.layer.full(index);
             },

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

@@ -595,11 +595,15 @@
         methods: {
             // 红黄灯
             toEditLight(obj){
+                let self = this;
                 App.openLayer({
                     title: "红黄灯设置",
                     content: App.getUrl("/subject/subInfo/light?subId=" + obj.data.id),
                     width: 500,
-                    height: 400
+                    height: 400,
+                    end: function() {
+                        self.getData();
+                    }
                 })
             },
             closeAllLayers() {

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

@@ -831,11 +831,15 @@
             },
             // 红黄灯
             toEditLight(obj){
+                let self = this;
                 App.openLayer({
                     title: "红黄灯设置",
                     content: App.getUrl("/subject/subInfo/light?subId=" + obj.data.id),
                     width: 500,
-                    height: 400
+                    height: 400,
+                    end: function() {
+                        self.getData();
+                    }
                 })
             },
             init: function () {

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

@@ -642,11 +642,15 @@
         methods: {
             // 红黄灯
             toEditLight(obj){
+                let self = this;
                 App.openLayer({
                     title: "红黄灯设置",
                     content: App.getUrl("/subject/subInfo/light?subId=" + obj.data.id),
                     width: 500,
-                    height: 400
+                    height: 400,
+                    end: function() {
+                        self.getData();
+                    }
                 })
             },
             closeAllLayers() {

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

@@ -570,11 +570,15 @@
         methods: {
             // 红黄灯
             toEditLight(obj){
+                let self = this;
                 App.openLayer({
                     title: "红黄灯设置",
                     content: App.getUrl("/subject/subInfo/light?subId=" + obj.data.id),
                     width: 500,
-                    height: 400
+                    height: 400,
+                    end: function() {
+                        self.getData();
+                    }
                 })
             },
             closeAllLayers() {

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

@@ -266,6 +266,11 @@
                                v-for="(item, index) in beginRate.subjectIdList" :key="index">
                             {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
+                        <label class="juli"
+                               @click="levelList('statusRed',item.title,item.code)"
+                               v-for="(item, index) in beginRate.lightList" :key="index">
+                            {{item.title}} <span class="lanse-first">{{item.total}}</span>
+                        </label>
                     </div>
                     <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"

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

@@ -375,6 +375,11 @@
                                v-for="(item, index) in beginRate.subjectIdList" :key="index">
                             {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
+                        <label class="juli"
+                               @click="levelList('statusRed',item.title,item.code)"
+                               v-for="(item, index) in beginRate.lightList" :key="index">
+                            {{item.title}} <span class="lanse-first">{{item.total}}</span>
+                        </label>
                     </div>
                     <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"

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

@@ -263,6 +263,11 @@
                                v-for="(item, index) in beginRate.subjectIdList" :key="index">
                             {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
+                        <label class="juli"
+                               @click="levelList('statusRed',item.title,item.code)"
+                               v-for="(item, index) in beginRate.lightList" :key="index">
+                            {{item.title}} <span class="lanse-first">{{item.total}}</span>
+                        </label>
                     </div>
                     <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"

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

@@ -374,6 +374,11 @@
                                v-for="(item, index) in beginRate.subjectIdList" :key="index">
                             {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
+                        <label class="juli"
+                               @click="levelList('statusRed',item.title,item.code)"
+                               v-for="(item, index) in beginRate.lightList" :key="index">
+                            {{item.title}} <span class="lanse-first">{{item.total}}</span>
+                        </label>
                     </div>
                     <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"

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

@@ -171,6 +171,11 @@
                                v-for="(item, index) in beginRate.subjectIdList" :key="index">
                             {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
+                        <label class="juli"
+                               @click="levelList('statusRed',item.title,item.code)"
+                               v-for="(item, index) in beginRate.lightList" :key="index">
+                            {{item.title}} <span class="lanse-first">{{item.total}}</span>
+                        </label>
                     </div>
 
                     <div style="margin-bottom: 3px" class="second_line">

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

@@ -280,6 +280,11 @@
                                v-for="(item, index) in beginRate.subjectIdList" :key="index">
                             {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
+                        <label class="juli"
+                               @click="levelList('statusRed',item.title,item.code)"
+                               v-for="(item, index) in beginRate.lightList" :key="index">
+                            {{item.title}} <span class="lanse-first">{{item.total}}</span>
+                        </label>
                     </div>
                     <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"