Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/ruralprojectrecords/dao/RuralProjectMessageAllDao.java

@@ -19,6 +19,12 @@ import java.util.List;
  */
 @MyBatisDao
 public interface RuralProjectMessageAllDao extends CrudDao<RuralProjectRecords> {
+    /**
+     * 查询归档（未归档）导出数据信息
+     * @param ruralProjectRecords
+     * @return
+     */
+    List<DownloadProjectRecords> findListOnUndocumentedRecordDownload(RuralProjectRecords ruralProjectRecords);
 
     /**
      * 查询归档导出数据信息
@@ -49,6 +55,13 @@ public interface RuralProjectMessageAllDao extends CrudDao<RuralProjectRecords>
     List<RuralProjectRecords> getProjectMaterialList(@Param("projectIdList") List<String> projectIdList);
 
     /**
+     * 查询归档（未上报）导出数据信息
+     * @param ruralProjectRecords
+     * @return
+     */
+    List<DownloadProjectReporteds> findListOnUndocumentedReportedDownload(RuralProjectRecords ruralProjectRecords);
+
+    /**
      * 查询上报导出数据信息
      * @param ruralProjectRecords
      * @return

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageAllService.java

@@ -622,12 +622,6 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
             }
             projectRecords.setRecordTypeList(list);
         }
-        //查询项目信息
-        List<DownloadProjectRecords> recordsList = Lists.newArrayList();
-        //查询正常的筛选项项目信息
-        if(projectRecords.getRecordTypeList().size()>0){
-            recordsList = dao.findListOnRecordDownload(projectRecords);
-        }
         //查询归档超期时间天数
         List<MainDictDetail> adventCount = DictUtils.getMainDictListOnProjectAdvent("advent_record_count");
         if(adventCount.size()>0){
@@ -635,32 +629,113 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
             Integer endingCount = Integer.parseInt(adventCount.get(0).getLabel());
             projectRecords.setEndingCount(endingCount);
         }
+        //查询项目信息
+        List<DownloadProjectRecords> recordsList = Lists.newArrayList();
+        //查询未归档数据
+        if(null != projectRecords.getProjectRecordStatus() && 0 == projectRecords.getProjectRecordStatus()){
+            List<DownloadProjectRecords> undocumentedRecordsList  = dao.findListOnUndocumentedRecordDownload(projectRecords);
+            if(undocumentedRecordsList.size()>0){
+                recordsList.addAll(undocumentedRecordsList);
+            }
+            //B类紧急项目
+            projectRecords.setEmergencyProject("1");
+            undocumentedRecordsList = dao.findListOnUndocumentedRecordDownload(projectRecords);
+            if(undocumentedRecordsList.size()>0){
+                recordsList.addAll(undocumentedRecordsList);
+            }
+            if(recordsList.size()>0){
+                for (int i = 0; i < recordsList.size() - 1; i++) {
+                    for (int j = recordsList.size() - 1; j > i; j--) {
+                        if (recordsList.get(j).getId().equals(recordsList.get(i).getId())) {
+                            recordsList.remove(j);
+                        }
+                    }
+                }
+            }
+        }
+
+        //查询正常的筛选项项目信息
+        if(projectRecords.getRecordTypeList().size()>0){
+            List<DownloadProjectRecords> recordsListOnType = Lists.newArrayList();
+            projectRecords.setEmergencyProject("0");
+            List<DownloadProjectRecords> instancyRecordsList = dao.findListOnRecordDownload(projectRecords);
+            if(instancyRecordsList.size()>0){
+                recordsListOnType.addAll(instancyRecordsList);
+            }
+            //B类紧急项目
+            projectRecords.setEmergencyProject("1");
+            instancyRecordsList = dao.findListOnRecordDownload(projectRecords);
+            if(instancyRecordsList.size()>0){
+                recordsListOnType.addAll(instancyRecordsList);
+            }
+            if(recordsListOnType.size()>0){
+                for (int i = 0; i < recordsListOnType.size() - 1; i++) {
+                    for (int j = recordsListOnType.size() - 1; j > i; j--) {
+                        if (recordsListOnType.get(j).getId().equals(recordsListOnType.get(i).getId())) {
+                            recordsListOnType.remove(j);
+                        }
+                    }
+                }
+            }
+            recordsList.addAll(recordsListOnType);
+        }
         //查询未超期的筛选项项目信息
         if(null != projectRecords.getProjectRecordElseStatus() && 1 == projectRecords.getProjectRecordElseStatus()){
+            List<DownloadProjectRecords> recordsListOnType = Lists.newArrayList();
+            projectRecords.setEmergencyProject("0");
             List<DownloadProjectRecords> elseRecordsList = dao.getElseRecordList(projectRecords);
             if(elseRecordsList.size()>0){
-                recordsList.addAll(elseRecordsList);
+                recordsListOnType.addAll(elseRecordsList);
             }
             //B类紧急项目
             projectRecords.setEmergencyProject("1");
             elseRecordsList = dao.getElseRecordList(projectRecords);
             if(elseRecordsList.size()>0){
-                recordsList.addAll(elseRecordsList);
+                recordsListOnType.addAll(elseRecordsList);
+            }
+            if(recordsListOnType.size()>0){
+                for (int i = 0; i < recordsListOnType.size() - 1; i++) {
+                    for (int j = recordsListOnType.size() - 1; j > i; j--) {
+                        if (recordsListOnType.get(j).getId().equals(recordsListOnType.get(i).getId())) {
+                            recordsListOnType.remove(j);
+                        }
+                    }
+                }
             }
+            recordsList.addAll(recordsListOnType);
         }
         //查询超期的筛选项项目信息
         if(null != projectRecords.getProjectRecordExceedStatus() && 1 == projectRecords.getProjectRecordExceedStatus()){
+            List<DownloadProjectRecords> recordsListOnType = Lists.newArrayList();
             projectRecords.setEmergencyProject("0");
             List<DownloadProjectRecords> exceedRecordsList = dao.getExeedRecordList(projectRecords);
             if(exceedRecordsList.size()>0){
-                recordsList.addAll(exceedRecordsList);
+                recordsListOnType.addAll(exceedRecordsList);
             }
             //B类紧急项目
             projectRecords.setEmergencyProject("1");
             exceedRecordsList = dao.getExeedRecordList(projectRecords);
             if(exceedRecordsList.size()>0){
-                recordsList.addAll(exceedRecordsList);
+                recordsListOnType.addAll(exceedRecordsList);
+            }
+
+            if(recordsListOnType.size()>0){
+                for (int i = 0; i < recordsListOnType.size() - 1; i++) {
+                    for (int j = recordsListOnType.size() - 1; j > i; j--) {
+                        if (recordsListOnType.get(j).getId().equals(recordsListOnType.get(i).getId())) {
+                            recordsListOnType.remove(j);
+                        }
+                    }
+                }
+            }
+
+
+            for (DownloadProjectRecords info: recordsListOnType) {
+                if(null != info.getProjectReportRecordStatus() && 5 == info.getProjectReportRecordStatus()){
+                    info.setProjectReportRecordStatus(7);
+                }
             }
+            recordsList.addAll(recordsListOnType);
         }
 
         //查询资料缺失审批完成信息
@@ -684,6 +759,15 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
                 }
             }
         }
+        if(recordsList.size()>0){
+            for (int i = 0; i < recordsList.size() - 1; i++) {
+                for (int j = recordsList.size() - 1; j > i; j--) {
+                    if (recordsList.get(j).getId().equals(recordsList.get(i).getId())) {
+                        recordsList.remove(j);
+                    }
+                }
+            }
+        }
         page.setList(recordsList);
         return page;
     }
@@ -743,54 +827,139 @@ public class RuralProjectMessageAllService extends CrudService<RuralProjectMessa
             projectRecords.setEndingCount(endingCount);
         }
 
-        //查询项目信息
+        //查询未上报项目信息
         List<DownloadProjectReporteds> recordsList = Lists.newArrayList();
+        //查询未归档数据
+        if(StringUtils.isNotBlank(projectRecords.getReportedState()) && "0".equals(projectRecords.getReportedState())){
+            List<DownloadProjectReporteds> undocumentedRecordsList  = dao.findListOnUndocumentedReportedDownload(projectRecords);
+            if(undocumentedRecordsList.size()>0){
+                recordsList.addAll(undocumentedRecordsList);
+            }
+            //B类紧急项目
+            projectRecords.setEmergencyProject("1");
+            undocumentedRecordsList = dao.findListOnUndocumentedReportedDownload(projectRecords);
+            if(undocumentedRecordsList.size()>0){
+                recordsList.addAll(undocumentedRecordsList);
+            }
+            if(recordsList.size()>0){
+                for (int i = 0; i < recordsList.size() - 1; i++) {
+                    for (int j = recordsList.size() - 1; j > i; j--) {
+                        if (recordsList.get(j).getId().equals(recordsList.get(i).getId())) {
+                            recordsList.remove(j);
+                        }
+                    }
+                }
+            }
+        }
+
+        //查询项目信息
         if(projectRecords.getReportedTypeList().size()>0){
-            recordsList = dao.findListOnReportedDownload(projectRecords);
+            List<DownloadProjectReporteds> recordsListOnType = Lists.newArrayList();
+            projectRecords.setEmergencyProject("0");
+            List<DownloadProjectReporteds> reportedDownload = dao.findListOnReportedDownload(projectRecords);
+            if(reportedDownload.size()>0){
+                recordsListOnType.addAll(reportedDownload);
+            }
+            //B类紧急项目
+            projectRecords.setEmergencyProject("1");
+            reportedDownload = dao.findListOnReportedDownload(projectRecords);
+            if(reportedDownload.size()>0){
+                recordsListOnType.addAll(reportedDownload);
+            }
+            if(recordsListOnType.size()>0){
+                for (int i = 0; i < recordsListOnType.size() - 1; i++) {
+                    for (int j = recordsListOnType.size() - 1; j > i; j--) {
+                        if (recordsListOnType.get(j).getId().equals(recordsListOnType.get(i).getId())) {
+                            recordsListOnType.remove(j);
+                        }
+                    }
+                }
+            }
+            recordsList.addAll(recordsListOnType);
         }
 
         //查询未超期的筛选项项目信息
         if(null != projectRecords.getProjectRecordElseStatus() && 1 == projectRecords.getProjectRecordElseStatus()){
+            List<DownloadProjectReporteds> recordsListOnType = Lists.newArrayList();
+            projectRecords.setEmergencyProject("0");
             List<DownloadProjectReporteds> elseRecordsList = dao.getElseReportedList(projectRecords);
             if(elseRecordsList.size()>0){
-                recordsList.addAll(elseRecordsList);
+                recordsListOnType.addAll(elseRecordsList);
             }
             //B类紧急项目
             projectRecords.setEmergencyProject("1");
             elseRecordsList = dao.getElseReportedList(projectRecords);
             if(elseRecordsList.size()>0){
-                recordsList.addAll(elseRecordsList);
+                recordsListOnType.addAll(elseRecordsList);
+            }
+            if(recordsListOnType.size()>0){
+                for (int i = 0; i < recordsListOnType.size() - 1; i++) {
+                    for (int j = recordsListOnType.size() - 1; j > i; j--) {
+                        if (recordsListOnType.get(j).getId().equals(recordsListOnType.get(i).getId())) {
+                            recordsListOnType.remove(j);
+                        }
+                    }
+                }
             }
+            recordsList.addAll(recordsListOnType);
         }
         //查询超期的筛选项项目信息
         if(null != projectRecords.getProjectRecordExceedStatus() && 1 == projectRecords.getProjectRecordExceedStatus()){
+            List<DownloadProjectReporteds> recordsListOnType = Lists.newArrayList();
             projectRecords.setEmergencyProject("0");
             List<DownloadProjectReporteds> exceedRecordsList = dao.getExeedReportedList(projectRecords);
             if(exceedRecordsList.size()>0){
-                recordsList.addAll(exceedRecordsList);
+                recordsListOnType.addAll(exceedRecordsList);
             }
             //B类紧急项目
             projectRecords.setEmergencyProject("1");
             exceedRecordsList = dao.getExeedReportedList(projectRecords);
             if(exceedRecordsList.size()>0){
-                recordsList.addAll(exceedRecordsList);
+                recordsListOnType.addAll(exceedRecordsList);
             }
+
+            if(recordsListOnType.size()>0){
+                for (int i = 0; i < recordsListOnType.size() - 1; i++) {
+                    for (int j = recordsListOnType.size() - 1; j > i; j--) {
+                        if (recordsListOnType.get(j).getId().equals(recordsListOnType.get(i).getId())) {
+                            recordsListOnType.remove(j);
+                        }
+                    }
+                }
+            }
+            for (DownloadProjectReporteds info: recordsListOnType) {
+                if(null != info.getProjectReportRecordStatus() && 5 == info.getProjectReportRecordStatus()){
+                    info.setProjectReportRecordStatus(7);
+                }
+            }
+            recordsList.addAll(recordsListOnType);
         }
         //查询超期的无需上报项目信息
         if(null != projectRecords.getProjectRecordDispenseStatus() && 1 == projectRecords.getProjectRecordDispenseStatus()){
+            List<DownloadProjectReporteds> recordsListOnType = Lists.newArrayList();
             projectRecords.setEmergencyProject("0");
             List<DownloadProjectReporteds> exceedRecordsList = dao.getDispenseReportedList(projectRecords);
             if(exceedRecordsList.size()>0){
-                recordsList.addAll(exceedRecordsList);
+                recordsListOnType.addAll(exceedRecordsList);
             }
             //B类紧急项目
             projectRecords.setEmergencyProject("1");
             exceedRecordsList = dao.getDispenseReportedList(projectRecords);
             if(exceedRecordsList.size()>0){
-                recordsList.addAll(exceedRecordsList);
+                recordsListOnType.addAll(exceedRecordsList);
             }
-        }
 
+            if(recordsListOnType.size()>0){
+                for (int i = 0; i < recordsListOnType.size() - 1; i++) {
+                    for (int j = recordsListOnType.size() - 1; j > i; j--) {
+                        if (recordsListOnType.get(j).getId().equals(recordsListOnType.get(i).getId())) {
+                            recordsListOnType.remove(j);
+                        }
+                    }
+                }
+            }
+            recordsList.addAll(recordsListOnType);
+        }
         page.setList(recordsList);
         return page;
     }

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -394,7 +394,14 @@
 				<when test="projectReportRecordStatus != null and projectReportRecordStatus != '' and projectReportRecordStatus != 0">
 					<choose>
 						<when test="projectReportRecordStatus == 6 or projectReportRecordStatus == 7">
-							AND a.record_state= #{projectReportRecordStatus}
+							<choose>
+								<when test="projectReportRecordStatus == 6">
+									AND a.record_state= #{projectReportRecordStatus} and prr.status is null
+								</when>
+								<otherwise>
+									AND prr.status = #{projectReportRecordStatus}
+								</otherwise>
+							</choose>
 						</when>
 						<otherwise>
 							AND prr.status = #{projectReportRecordStatus}
@@ -585,7 +592,14 @@
 				<when test="projectReportRecordStatus != null and projectReportRecordStatus != '' and projectReportRecordStatus != 0">
 					<choose>
 						<when test="projectReportRecordStatus == 6 or projectReportRecordStatus == 7">
-							AND a.record_state= #{projectReportRecordStatus}
+							<choose>
+								<when test="projectReportRecordStatus == 6">
+									AND a.record_state= #{projectReportRecordStatus} and prr.status is null
+								</when>
+								<otherwise>
+									AND prr.status = #{projectReportRecordStatus}
+								</otherwise>
+							</choose>
 						</when>
 						<otherwise>
 							AND prr.status = #{projectReportRecordStatus}
@@ -623,6 +637,35 @@
 		</where>
     </select>
 
+	<select id="findListOnUndocumentedRecordDownload" resultType="DownloadProjectRecords" >
+		SELECT
+		<include refid="recordDownloadSql"/>
+		,ifnull(prr.status,0) as "projectReportRecordStatus"
+		FROM rural_project_records a
+		<include refid="recordDownloadLeftSql"/>
+		<where>
+			a.status = 5
+			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="beginDate !=null">
+				AND a.create_date >= #{beginDate}
+			</if>
+			<if test="endDate !=null">
+				AND a.create_date &lt; #{endDate}
+			</if>
+			<if test="projectRecordStatus !=null and projectRecordStatus == 0">
+				and prr.status is null
+			</if>
+			<choose>
+				<when test="emergencyProject != null and emergencyProject != '' and emergencyProject == 1">
+					/*B类紧急*/
+					and (timestampdiff(day,prd.audit_pass_date,now()) &lt;#{endingCount} or prd.audit_pass_date is null)
+				</when>
+				<otherwise>
+					and (timestampdiff(day,prdt.audit_pass_date,now())&lt;#{endingCount} or prdt.audit_pass_date is null)
+				</otherwise>
+			</choose>
+		</where>
+	</select>
 
 
 	<select id="findListOnRecordDownload" resultType="DownloadProjectRecords" >
@@ -641,18 +684,20 @@
 				AND a.create_date &lt; #{endDate}
 			</if>
 			<if test="recordTypeList !=null and recordTypeList !=''">
-				and (prr.status in
+				and prr.status in
 				<foreach collection="recordTypeList" item="status" index="index" open="(" close=")" separator=",">
 					#{status}
 				</foreach>
-				<if test="projectRecordStatus == 0">
-					or prr.status is null)
-				</if>
-				<if test="projectRecordStatus == 1">
-					)
-				</if>
 			</if>
-
+			<choose>
+				<when test="emergencyProject != null and emergencyProject != '' and emergencyProject == 1">
+					/*B类紧急*/
+					and timestampdiff(day,prd.audit_pass_date,prr.record_date) &lt; #{endingCount}
+				</when>
+				<otherwise>
+					and timestampdiff(day,prdt.audit_pass_date,prr.record_date) &lt; #{endingCount}
+				</otherwise>
+			</choose>
 		</where>
 	</select>
 
@@ -699,7 +744,7 @@
 	<select id="getExeedRecordList" resultType="DownloadProjectRecords" >
 		SELECT
 		<include refid="recordDownloadSql"/>
-		,"7" as  "projectReportRecordStatus"
+		,ifnull(prr.status,0) as  "projectReportRecordStatus"
 		,prr.record_date as  "recordStartAuditDate"
 		<choose>
 			<when test="emergencyProject != null and emergencyProject != '' and emergencyProject == 1">
@@ -754,6 +799,37 @@
 
 
 
+	<select id="findListOnUndocumentedReportedDownload" resultType="DownloadProjectReporteds" >
+		SELECT
+		<include refid="recordDownloadSql"/>
+		,ifnull(rprr.report_status,0) as "projectReportRecordStatus"
+		FROM rural_project_records a
+		<include refid="recordDownloadLeftSql"/>
+		<where>
+			a.status = 5
+			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="beginDate !=null">
+				AND a.create_date >= #{beginDate}
+			</if>
+			<if test="endDate !=null">
+				AND a.create_date &lt; #{endDate}
+			</if>
+			<if test="reportedState !=null and reportedState == 0 ">
+				and a.reported_state is null
+			</if>
+			<choose>
+				<when test="emergencyProject != null and emergencyProject != '' and emergencyProject == 1">
+					/*B类紧急*/
+					and (timestampdiff(day,prd.audit_pass_date,now()) &lt;#{endingCount} or prd.audit_pass_date is null)
+				</when>
+				<otherwise>
+					and (timestampdiff(day,prdt.audit_pass_date,now())&lt;#{endingCount} or prdt.audit_pass_date is null)
+				</otherwise>
+			</choose>
+		</where>
+	</select>
+
+
 	<select id="findListOnReportedDownload" resultType="DownloadProjectReporteds" >
 		SELECT
 		<include refid="recordDownloadSql"/>
@@ -770,22 +846,28 @@
 				AND a.create_date &lt; #{endDate}
 			</if>
 			<if test="reportedTypeList !=null and reportedTypeList !=''">
-				and (a.reported_state in
+				and a.reported_state in
 				<foreach collection="reportedTypeList" item="status" index="index" open="(" close=")" separator=",">
 					#{status}
 				</foreach>
-				<if test="reportedState == 0">
-					or a.reported_state is null)
-				</if>
-				<if test="reportedState == 1">
-					)
-				</if>
 			</if>
-
+			<choose>
+				<when test="emergencyProject != null and emergencyProject != '' and emergencyProject == 1">
+					/*B类紧急*/
+					and timestampdiff(day,prd.audit_pass_date,(select create_date from work_activity_process wap where wap.process_instance_id = rprr.process_instance_id
+					order by create_date
+					limit 1))&lt;#{endingCount}
+				</when>
+				<otherwise>
+					and timestampdiff(day,prdt.audit_pass_date,(select create_date from work_activity_process wap where wap.process_instance_id = rprr.process_instance_id
+					order by create_date
+					limit 1))&lt;#{endingCount}
+				</otherwise>
+			</choose>
 		</where>
 	</select>
 
-	<select id="getElseReportedList" resultType="DownloadProjectRecords" >
+	<select id="getElseReportedList" resultType="DownloadProjectReporteds" >
 		SELECT
 		<include refid="recordDownloadSql"/>
 		,"6" as  "projectReportRecordStatus"
@@ -827,10 +909,10 @@
 		</where>
 	</select>
 
-	<select id="getExeedReportedList" resultType="DownloadProjectRecords" >
+	<select id="getExeedReportedList" resultType="DownloadProjectReporteds" >
 		SELECT
 		<include refid="recordDownloadSql"/>
-		,"7" as  "projectReportRecordStatus"
+		,ifnull(rprr.report_status,0) as  "projectReportRecordStatus"
 		,(select create_date from work_activity_process wap where wap.process_instance_id = rprr.process_instance_id
 		order by create_date
 		limit 1) as "recordStartAuditDate"
@@ -877,7 +959,7 @@
 		</where>
 	</select>
 
-	<select id="getDispenseReportedList" resultType="DownloadProjectRecords" >
+	<select id="getDispenseReportedList" resultType="DownloadProjectReporteds" >
 		SELECT
 		<include refid="recordDownloadSql"/>
 		,"11" as  "projectReportRecordStatus"

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -498,7 +498,21 @@
 			</if>
 			<choose>
 				<when test="projectReportRecordStatus != null and projectReportRecordStatus != '' and projectReportRecordStatus != 0">
-					AND prr.status = #{projectReportRecordStatus}
+					<choose>
+						<when test="projectReportRecordStatus == 6 or projectReportRecordStatus == 7">
+							<choose>
+								<when test="projectReportRecordStatus == 6">
+									AND a.record_state= #{projectReportRecordStatus} and prr.status is null
+								</when>
+								<otherwise>
+									AND prr.status = #{projectReportRecordStatus}
+								</otherwise>
+							</choose>
+						</when>
+						<otherwise>
+							AND prr.status = #{projectReportRecordStatus}
+						</otherwise>
+					</choose>
 				</when>
 				<otherwise>
 					<choose>
@@ -678,7 +692,21 @@
 			</if>
 			<choose>
 				<when test="projectReportRecordStatus != null and projectReportRecordStatus != '' and projectReportRecordStatus != 0">
-					AND prr.status = #{projectReportRecordStatus}
+					<choose>
+						<when test="projectReportRecordStatus == 6 or projectReportRecordStatus == 7">
+							<choose>
+								<when test="projectReportRecordStatus == 6">
+									AND a.record_state= #{projectReportRecordStatus} and prr.status is null
+								</when>
+								<otherwise>
+									AND prr.status = #{projectReportRecordStatus}
+								</otherwise>
+							</choose>
+						</when>
+						<otherwise>
+							AND prr.status = #{projectReportRecordStatus}
+						</otherwise>
+					</choose>
 				</when>
 				<otherwise>
 					<choose>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -704,13 +704,13 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{align:'center', title: '电子',  width:120,templet:function(d){
+                ,{align:'center', title: '电子',  width:140,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						if(st.action){
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
 						} else{
-							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if (d.defectRecordStatus>0){
 							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -813,12 +813,12 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-                ,{align:'center', title: '电子',  width:120,templet:function(d){
+                ,{align:'center', title: '电子',  width:140,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
                         if(st.action){
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportRecordProcessOne?processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}else{
-							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						if (d.defectRecordStatus>0){

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -706,9 +706,9 @@
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						if(st.action){
-							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getReportRecordProcessOne?id="+d.prrId+"&processInstanceId=" + d.prrProcessInstanceId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}else{
-							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
+							var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
 						if (d.defectRecordStatus>0){
 							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?processInstanceId=" + d.pmdrProcessInstanceId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">缺</span>";