Merge branch 'master' of http://8.137.121.180:10880/longping/subject_gxj

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

@@ -2,10 +2,20 @@ package com.rtrh.projects.modules.projects.mapper;
 
 import com.rtrh.core.repository.mybatis.MyBatisRepository;
 import com.rtrh.projects.modules.system.po.JUnit;
+import com.rtrh.projects.vo.projects.JUnitVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 @MyBatisRepository
 public interface JUnitMapper {
 
     JUnit findById(@Param("id") String subUnitId);
+
+    List<Map<String, Object>> getListById(@Param("id") String id, @Param("unitPropId") String unitPropId, @Param("unitKindId") String unitKindId, @Param("title") String title, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("status") String status);
+
+    List<Map<String, Object>> getListByIdStatusOne(@Param("unitPropId") String unitPropId, @Param("unitKindId") String unitKindId, @Param("title") String title, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("status") String status);
+
+    List<Map<String, Object>> getListByIdOtherStatus(@Param("id") String id, @Param("unitPropId") String unitPropId, @Param("unitKindId") String unitKindId, @Param("title") String title, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("status") String status);
 }

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

@@ -64,5 +64,102 @@
         FROM junit
         WHERE id = #{id}
     </select>
+    <select id="getListById" resultType="hashmap">
+        select a.id,a.reason,a.title,a.kind_unit  kindUnit,a.area,a.amt,a.date_found dateFound,a.group_code1,a.group_code2,a.trust_code trustCode,a.`status`,a.name_jur1 nameJur1,a.sim_code simCode ,b.title unitKindName,c.title unitPropName from j_unit a
+        left join j_unit_kind
+        LEFT JOIN t_systable b on a.unit_kind_id=b.id
+        LEFT JOIN t_systable c on a.unit_prop_id=c.id  where a.logic_delete_flag=0
+        <if test="id!=null and id!=''">
+            and id=#{id}
+        </if>
+        <if test="unitPropId!=null and unitPropId!=''">
+            and a.unit_prop_id=#{unitPropId}
+        </if>
+        <if test="unitKindId!=null and unitKindId!=''">
+            and a.unit_kind_id=#{unitKindId}
+        </if>
+        <if test="title!=null and title!=''">
+            and a.title like concat('%', #{title}, '%')
+        </if>
+        <if test="startDate!=null and startDate!=''">
+            and a.date_found >=#{startDate}
+        </if>
+        <if test="endDate!=null and endDate!=''">
+            and a.date_found &lt;=#{endDate}
+        </if>
+        <if test="status!=null and status!=''">
+            and a.status=#{status}
+        </if>
+    </select>
+
+    <sql id="baseSelect">
+        SELECT
+            a.id, a.title, a.kind_unit kindUnit, a.reason, a.area, a.amt, a.date_found dateFound,
+            a.group_code1, a.group_code2, a.trust_code trustCode, a.`status`, a.name_jur1 nameJur1,
+            a.sim_code simCode, b.title unitKindName, c.title unitPropName
+        FROM j_unit a
+                 LEFT JOIN t_systable b ON a.unit_kind_id = b.id
+                 LEFT JOIN t_systable c ON a.unit_prop_id = c.id
+        WHERE a.logic_delete_flag = 0 AND a.kind = 1
+    </sql>
+
+    <!-- Query for statusUnit=1 -->
+    <select id="getListByIdStatusOne" resultType="hashmap">
+        <include refid="baseSelect"/>
+        <where>
+            <if test="unitPropId != null and unitPropId != ''">
+                AND a.unit_prop_id = #{unitPropId}
+            </if>
+            <if test="unitKindId != null and unitKindId != ''">
+                AND a.unit_kind_id = #{unitKindId}
+            </if>
+            <if test="title != null and title != ''">
+                AND a.title LIKE '%' || #{title} || '%'
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND a.date_found &gt;= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND a.date_found &lt;= #{endDate}
+            </if>
+            <if test="status != null and status != ''">
+                AND a.status = #{status}
+            </if>
+        </where>
+    </select>
+
+    <!-- Query for other statusUnit values -->
+    <select id="getListByIdOtherStatus" resultType="hashmap">
+        <include refid="baseSelect"/>
+        <where>
+            <if test="id != null and id != ''">
+                AND (a.id IN (
+                SELECT d.unit_id FROM sub_info d WHERE d.main_id = #{id}
+                ) OR a.id IN (
+                SELECT f.unit_id FROM sub_info f
+                LEFT JOIN sub_manage e ON e.sub_id = f.id
+                WHERE e.manage_id = #{id}
+                ))
+            </if>
+            <if test="unitPropId != null and unitPropId != ''">
+                AND a.unit_prop_id = #{unitPropId}
+            </if>
+            <if test="unitKindId != null and unitKindId != ''">
+                AND a.unit_kind_id = #{unitKindId}
+            </if>
+            <if test="title != null and title != ''">
+                AND a.title LIKE '%' || #{title} || '%'
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND a.date_found &gt;= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND a.date_found &lt;= #{endDate}
+            </if>
+            <if test="status != null and status != ''">
+                AND a.status = #{status}
+            </if>
+        </where>
+    </select>
 
 </mapper>

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

@@ -1,12 +1,18 @@
 package com.rtrh.projects.modules.system.service.impl;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.rtrh.projects.modules.projects.mapper.JUnitMapper;
+import com.rtrh.projects.modules.projects.po.SubInfoGxj;
 import com.rtrh.projects.util.TargetDataSource;
+import com.rtrh.projects.vo.projects.JUnitVO;
+import org.apache.ibatis.annotations.Param;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.MatchMode;
@@ -73,50 +79,54 @@ public class JUnitServiceImpl implements JUnitService {
 	}
 
 	@Override
+	@TargetDataSource("secondary")
 	public Page getListById(Page page, String id, String unitPropId, String unitKindId, String title, String startDate, String endDate,String status) {
-		StringBuffer sql=new StringBuffer();
-		sql.append("select a.id,a.reason,a.title,a.kind_unit  kindUnit,a.area,a.amt,a.date_found dateFound,a.group_code1,a.group_code2,a.trust_code trustCode,a.`status`,a.name_jur1 nameJur1,a.sim_code simCode ,b.title unitKindName,c.title unitPropName from j_unit a  ");
-		sql.append("LEFT JOIN t_systable b on a.unit_kind_id=b.id  ");
-		sql.append("LEFT JOIN t_systable c on a.unit_prop_id=c.id  where a.logic_delete_flag=0 ");
-		if (StringUtil.isNotEmpty(id)){
-			sql.append(" and a.id='"+ id+"' ");
-		}
-		if (StringUtil.isNotEmpty(unitPropId)){
-			sql.append(" and a.unit_prop_id='"+ unitPropId+"' ");
-		}
-		if (StringUtil.isNotEmpty(unitKindId)){
-			sql.append(" and a.unit_kind_id='"+ unitKindId+"' ");
-		}
-		if (StringUtil.isNotEmpty(title)){
-			sql.append(" and a.title  like '%"+title+"%' ");
-		}
-		if (StringUtil.isNotEmpty(startDate)){
-			sql.append(" and a.date_found >='"+ startDate+"' ");
-		}
-		if (StringUtil.isNotEmpty(endDate)){
-			sql.append(" and a.date_found <='"+ endDate+"' ");
-		}
-		if (StringUtil.isNotEmpty(status)){
-			sql.append(" and a.status ='"+ status+"' ");
-		}
-
-		Page page1=jUnitDao.getListById(sql.toString(),page);
-
-		for (int i=0;i<page1.getList().size();i++){
-			Map<String,Object> map= (Map<String, Object>) page1.getList().get(i);
-			if ("2".equals(map.get("status"))){
-				map.put("status","已审核");
-			}else if ("3".equals(map.get("status"))){
-				map.put("status","不同意");
-			}else if ("0".equals(map.get("status"))){
-				map.put("status","暂存");
-			}else{
-				map.put("status","待审核");
+		// StringBuffer sql=new StringBuffer();
+		// sql.append("select a.id,a.reason,a.title,a.kind_unit  kindUnit,a.area,a.amt,a.date_found dateFound,a.group_code1,a.group_code2,a.trust_code trustCode,a.`status`,a.name_jur1 nameJur1,a.sim_code simCode ,b.title unitKindName,c.title unitPropName from j_unit a  ");
+		// sql.append("LEFT JOIN t_systable b on a.unit_kind_id=b.id  ");
+		// sql.append("LEFT JOIN t_systable c on a.unit_prop_id=c.id  where a.logic_delete_flag=0 ");
+		// if (StringUtil.isNotEmpty(id)){
+		// 	sql.append(" and a.id='"+ id+"' ");
+		// }
+		// if (StringUtil.isNotEmpty(unitPropId)){
+		// 	sql.append(" and a.unit_prop_id='"+ unitPropId+"' ");
+		// }
+		// if (StringUtil.isNotEmpty(unitKindId)){
+		// 	sql.append(" and a.unit_kind_id='"+ unitKindId+"' ");
+		// }
+		// if (StringUtil.isNotEmpty(title)){
+		// 	sql.append(" and a.title  like '%"+title+"%' ");
+		// }
+		// if (StringUtil.isNotEmpty(startDate)){
+		// 	sql.append(" and a.date_found >='"+ startDate+"' ");
+		// }
+		// if (StringUtil.isNotEmpty(endDate)){
+		// 	sql.append(" and a.date_found <='"+ endDate+"' ");
+		// }
+		// if (StringUtil.isNotEmpty(status)){
+		// 	sql.append(" and a.status ='"+ status+"' ");
+		// }
+		//
+		// Page page1=jUnitDao.getListById(sql.toString(),page);
+
+		PageHelper.startPage(page.getPageNo(), page.getPageSize());
+		List<Map<String, Object>>  data = jUnitMapper.getListById(id, unitPropId, unitKindId, title, startDate, endDate, status);
+		PageInfo<Map<String, Object>> pageInfo = new PageInfo<Map<String, Object>>(data);
+		page.setList(data);
+		page.setTotalCount(pageInfo.getTotal());
+		for (int i = 0; i < page.getList().size(); i++) {
+			Map<String, Object> map = (Map<String, Object>) page.getList().get(i);
+			if ("2".equals(map.get("status"))) {
+				map.put("status", "已审核");
+			} else if ("3".equals(map.get("status"))) {
+				map.put("status", "不同意");
+			} else if ("0".equals(map.get("status"))) {
+				map.put("status", "暂存");
+			} else {
+				map.put("status", "待审核");
 			}
-
 		}
-//		getListById(page,teamShiroUser.getUnitId(),unitPropId,unitKindId,title,startDate,endDate);
-		return page1;
+		return page;
 	}
 
 	@Override
@@ -182,64 +192,77 @@ public class JUnitServiceImpl implements JUnitService {
 	}
 
 	@Override
+	@TargetDataSource("secondary")
 	public Page getListBySubInfoId(Page page, String id, String unitPropId, String unitKindId, String title, String startDate, String endDate,String status,String statusUnit) {
-		StringBuffer sql=new StringBuffer();
-		//stautsUnit=1  查看所有信息
-		if ("1".equals(statusUnit)){
-			sql.append("select a.id,a.title,a.kind_unit  kindUnit,a.reason,a.area,a.amt,a.date_found dateFound,a.group_code1,a.group_code2,a.trust_code trustCode,a.`status`,a.name_jur1 nameJur1,a.sim_code simCode ,b.title unitKindName,c.title unitPropName from j_unit a  ");
-			sql.append("LEFT JOIN t_systable b on a.unit_kind_id=b.id  ");
-			sql.append("LEFT JOIN t_systable c on a.unit_prop_id=c.id  where a.logic_delete_flag=0 and a.kind=1 ");
-
-			if (StringUtil.isNotEmpty(unitPropId)){
-				sql.append(" and a.unit_prop_id='"+ unitPropId+"' ");
-			}
-			if (StringUtil.isNotEmpty(unitKindId)){
-				sql.append(" and a.unit_kind_id='"+ unitKindId+"' ");
-			}
-			if (StringUtil.isNotEmpty(title)){
-				sql.append(" and a.title  like '%"+title+"%' ");
-			}
-			if (StringUtil.isNotEmpty(startDate)){
-				sql.append(" and a.date_found >='"+ startDate+"' ");
-			}
-			if (StringUtil.isNotEmpty(endDate)){
-				sql.append(" and a.date_found <='"+ endDate+"' ");
-			}
-			if (StringUtil.isNotEmpty(status)){
-				sql.append(" and a.status ='"+ status+"' ");
-			}
-		}else{
-			sql.append("select a.id,a.title ,a.reason,a.kind_unit  kindUnit,a.area,a.amt,a.date_found dateFound,a.group_code1,a.group_code2,a.trust_code trustCode,a.`status`,a.name_jur1 nameJur1,a.sim_code simCode ,b.title unitKindName,c.title unitPropName from j_unit a  ");
-			sql.append("LEFT JOIN t_systable b on a.unit_kind_id=b.id  ");
-			sql.append("LEFT JOIN t_systable c on a.unit_prop_id=c.id  where a.logic_delete_flag=0 and a.kind=1 ");
-			if (StringUtil.isNotEmpty(id)){
-				sql.append(" and (a.id in(select d.unit_id from sub_info d where d.main_id='"+ id+"' )  ");
-				sql.append(" OR a.id in( SELECT f.unit_id  FROM sub_info f LEFT JOIN sub_manage e ON e.sub_id = f.id WHERE e.manage_id ='"+id+"' ))");
-			}
-			if (StringUtil.isNotEmpty(unitPropId)){
-				sql.append(" and a.unit_prop_id='"+ unitPropId+"' ");
-			}
-			if (StringUtil.isNotEmpty(unitKindId)){
-				sql.append(" and a.unit_kind_id='"+ unitKindId+"' ");
-			}
-			if (StringUtil.isNotEmpty(title)){
-				sql.append(" and a.title  like '%"+title+"%' ");
-			}
-			if (StringUtil.isNotEmpty(startDate)){
-				sql.append(" and a.date_found >='"+ startDate+"' ");
-			}
-			if (StringUtil.isNotEmpty(endDate)){
-				sql.append(" and a.date_found <='"+ endDate+"' ");
-			}
-			if (StringUtil.isNotEmpty(status)){
-				sql.append(" and a.status ='"+ status+"' ");
-			}
+		// StringBuffer sql=new StringBuffer();
+		// //stautsUnit=1  查看所有信息
+		// if ("1".equals(statusUnit)){
+		// 	sql.append("select a.id,a.title,a.kind_unit  kindUnit,a.reason,a.area,a.amt,a.date_found dateFound,a.group_code1,a.group_code2,a.trust_code trustCode,a.`status`,a.name_jur1 nameJur1,a.sim_code simCode ,b.title unitKindName,c.title unitPropName from j_unit a  ");
+		// 	sql.append("LEFT JOIN t_systable b on a.unit_kind_id=b.id  ");
+		// 	sql.append("LEFT JOIN t_systable c on a.unit_prop_id=c.id  where a.logic_delete_flag=0 and a.kind=1 ");
+		//
+		// 	if (StringUtil.isNotEmpty(unitPropId)){
+		// 		sql.append(" and a.unit_prop_id='"+ unitPropId+"' ");
+		// 	}
+		// 	if (StringUtil.isNotEmpty(unitKindId)){
+		// 		sql.append(" and a.unit_kind_id='"+ unitKindId+"' ");
+		// 	}
+		// 	if (StringUtil.isNotEmpty(title)){
+		// 		sql.append(" and a.title  like '%"+title+"%' ");
+		// 	}
+		// 	if (StringUtil.isNotEmpty(startDate)){
+		// 		sql.append(" and a.date_found >='"+ startDate+"' ");
+		// 	}
+		// 	if (StringUtil.isNotEmpty(endDate)){
+		// 		sql.append(" and a.date_found <='"+ endDate+"' ");
+		// 	}
+		// 	if (StringUtil.isNotEmpty(status)){
+		// 		sql.append(" and a.status ='"+ status+"' ");
+		// 	}
+		// }else{
+		// 	sql.append("select a.id,a.title ,a.reason,a.kind_unit  kindUnit,a.area,a.amt,a.date_found dateFound,a.group_code1,a.group_code2,a.trust_code trustCode,a.`status`,a.name_jur1 nameJur1,a.sim_code simCode ,b.title unitKindName,c.title unitPropName from j_unit a  ");
+		// 	sql.append("LEFT JOIN t_systable b on a.unit_kind_id=b.id  ");
+		// 	sql.append("LEFT JOIN t_systable c on a.unit_prop_id=c.id  where a.logic_delete_flag=0 and a.kind=1 ");
+		// 	if (StringUtil.isNotEmpty(id)){
+		// 		sql.append(" and (a.id in(select d.unit_id from sub_info d where d.main_id='"+ id+"' )  ");
+		// 		sql.append(" OR a.id in( SELECT f.unit_id  FROM sub_info f LEFT JOIN sub_manage e ON e.sub_id = f.id WHERE e.manage_id ='"+id+"' ))");
+		// 	}
+		// 	if (StringUtil.isNotEmpty(unitPropId)){
+		// 		sql.append(" and a.unit_prop_id='"+ unitPropId+"' ");
+		// 	}
+		// 	if (StringUtil.isNotEmpty(unitKindId)){
+		// 		sql.append(" and a.unit_kind_id='"+ unitKindId+"' ");
+		// 	}
+		// 	if (StringUtil.isNotEmpty(title)){
+		// 		sql.append(" and a.title  like '%"+title+"%' ");
+		// 	}
+		// 	if (StringUtil.isNotEmpty(startDate)){
+		// 		sql.append(" and a.date_found >='"+ startDate+"' ");
+		// 	}
+		// 	if (StringUtil.isNotEmpty(endDate)){
+		// 		sql.append(" and a.date_found <='"+ endDate+"' ");
+		// 	}
+		// 	if (StringUtil.isNotEmpty(status)){
+		// 		sql.append(" and a.status ='"+ status+"' ");
+		// 	}
+		// }
+		// Page page1=jUnitDao.getListById(sql.toString(),page);
+
+
+		PageHelper.startPage(page.getPageNo(), page.getPageSize());
+		List<Map<String, Object>> data;
+		if ("1".equals(statusUnit)) {
+			data = jUnitMapper.getListByIdStatusOne( unitPropId, unitKindId, title, startDate,endDate,status);
+		} else {
+			data = jUnitMapper.getListByIdOtherStatus(id, unitPropId, unitKindId, title, startDate, endDate, status);
 		}
+		PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(data);
+		page.setList(data);
+		page.setTotalCount(pageInfo.getTotal());
 
-		Page page1=jUnitDao.getListById(sql.toString(),page);
 
-		for (int i=0;i<page1.getList().size();i++){
-			Map<String,Object> map= (Map<String, Object>) page1.getList().get(i);
+		for (int i=0;i<page.getList().size();i++){
+			Map<String,Object> map= (Map<String, Object>) page.getList().get(i);
 			if ("2".equals(map.get("status"))){
 				map.put("status","已审核");
 			}else if ("3".equals(map.get("status"))){
@@ -251,7 +274,7 @@ public class JUnitServiceImpl implements JUnitService {
 			}
 		}
 //		getListById(page,teamShiroUser.getUnitId(),unitPropId,unitKindId,title,startDate,endDate);
-		return page1;
+		return page;
 	}
 
 	@Override

projects-service/src/main/java/com/rtrh/projects/vo/projects/JUnitVO.java

@@ -0,0 +1,24 @@
+package com.rtrh.projects.vo.projects;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class JUnitVO {
+    private String id;
+    private String reason;
+    private String title;
+    private String kindUnit;
+    private String area;
+    private String amt;
+    private String dateFound;
+    private String group_code1;
+    private String group_code2;
+    private String trustCode;
+    private String status;
+    private String nameJur1;
+    private String simCode;
+    private String unitKindName;
+    private String unitPropName;
+}

projects/src/main/java/com/rtrh/projects/web/controller/passport/api/RegisterApiController.java

@@ -133,7 +133,7 @@ public class RegisterApiController extends BaseController{
 			else{
 				//查询管理项目下的数据
 				if(StringUtil.isNotEmpty(teamShiroUser.getUnitId())){
-					SecUser secUser= secUserService.getById(teamShiroUser.getId());
+					SecUser secUser= secUserService.getByFgwId(teamShiroUser.getId());
 					Page page1=jUnitService.getListBySubInfoId(page,teamShiroUser.getUnitId(),vo.getUnitPropId(),vo.getUnitKindId(),vo.getTitle(),vo.getStartDate(),vo.getEndDate(),vo.getStatus(),secUser.getStatusUnit());
 					message.add(page1.getList(),page1.getTotalCount());
 					message.setData("2");

projects/src/main/webapp/asset/css/style_new.css

@@ -175,8 +175,10 @@
 
 .table_box { padding: 0 20px; box-sizing: border-box; }
 .table_box .table_process { max-height: 100% !important; }
-.table_box .layui-laypage { margin: 15px 0; }
-.table_box .layui-laypage > a, .table_box .layui-laypage .layui-laypage-btn { margin-right: 5px; color: #fff; border: 1px solid #BAC8E0; border-radius: 4px; }
+.table_box .layui-laypage { margin: 15px 0 20px; }
+.table_box .layui-laypage > a, .table_box .layui-laypage .layui-laypage-btn { margin-right: 5px; color: #15294C; border: 1px solid #BAC8E0; border-radius: 4px; }
+.table_box .txt_white .layui-laypage { margin: 15px 0; }
+.table_box .txt_white .layui-laypage > a, .table_box .txt_white .layui-laypage .layui-laypage-btn { color: #fff; }
 .table_box .layui-btn-normal { color: #fff; background-color: #007EFF; }
 .table_box .table1 .label { background: #F4FAFF; border: 1px solid #E0EBF7; }
 

projects/src/main/webapp/asset/sass/style_new.scss

@@ -761,14 +761,22 @@
     max-height: 100% !important;
   }
   .layui-laypage {
-    margin: 15px 0;
+    margin: 15px 0 20px;
     & > a, .layui-laypage-btn {
       margin-right: 5px;
-      color: #fff;
+      color: #15294C;
       border: 1px solid #BAC8E0;
       border-radius: 4px;
     }
   }
+  .txt_white {
+    .layui-laypage {
+      margin: 15px 0;
+      & > a, .layui-laypage-btn {
+        color: #fff;
+      }
+    }
+  }
   .layui-btn-normal {
     color: #fff;
     background-color: #007EFF;

projects/src/main/webapp/vmodules/statics/analysisScreen_four.jsp

@@ -750,12 +750,15 @@
                 type: 'liquidFill',
                 data: [checkRate|0], // 水滴的填充进度，0到1之间
                 radius: '94%',
-                color: ['#A50107'], // 蓝色
+                // color: ['#A50107'], // 蓝色
+                // color: ['#7100C3'],
+                color: ['#6A0DAD'],
                 outline: {
                     borderDistance: 2, // 外边框距离
                     itemStyle: {
                         borderWidth: 4, // 外边框宽度
-                        borderColor: '#A50107' // 外边框颜色
+                        // borderColor: '#A50107' // 外边框颜色
+                        borderColor: '#6A0DAD'
                     }
                 },
                 backgroundStyle: {
@@ -796,22 +799,22 @@
             }]
         };
         var liquidFillOption2 = JSON.parse(JSON.stringify(liquidFillOption));
-        liquidFillOption2.series[0].color = ['#BA3C00']; // 绿色
-        liquidFillOption2.series[0].outline.itemStyle.borderColor = '#BA3C00'; // 边框颜色也为绿色
+        // liquidFillOption2.series[0].color = ['#BA3C00']; // 绿色
+        // liquidFillOption2.series[0].outline.itemStyle.borderColor = '#BA3C00'; // 边框颜色也为绿色
         liquidFillOption2.series[0].data=[openRate];
         liquidFillOption2.series[0].label.formatter = (param) => {
             return (param.value * 100).toFixed(2) + '%'; // 显示为百分比格式
         };
         var liquidFillOption3 = JSON.parse(JSON.stringify(liquidFillOption));
-        liquidFillOption3.series[0].color = ['#00939A']; // 红色
-        liquidFillOption3.series[0].outline.itemStyle.borderColor = '#00939A'; // 边框颜色也为红色
+        // liquidFillOption3.series[0].color = ['#00939A']; // 红色
+        // liquidFillOption3.series[0].outline.itemStyle.borderColor = '#00939A'; // 边框颜色也为红色
         liquidFillOption3.series[0].data=[workRate];
         liquidFillOption3.series[0].label.formatter = (param) => {
             return (param.value * 100).toFixed(2) + '%'; // 显示为百分比格式
         };
         var liquidFillOption4 = JSON.parse(JSON.stringify(liquidFillOption));
-        liquidFillOption4.series[0].color = ['#7100C3']; // 黄色
-        liquidFillOption4.series[0].outline.itemStyle.borderColor = '#7100C3'; // 边框颜色也为黄色
+        // liquidFillOption4.series[0].color = ['#7100C3']; // 黄色
+        // liquidFillOption4.series[0].outline.itemStyle.borderColor = '#7100C3'; // 边框颜色也为黄色
         liquidFillOption4.series[0].data=[stockRate];
         liquidFillOption4.series[0].label.formatter = (param) => {
             return (param.value * 100).toFixed(2) + '%'; // 显示为百分比格式

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

@@ -158,7 +158,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="layui-col-xs3 layui-col-sm3 layui-col-md3 hiddenParam">
+                                <div class="layui-col-xs6 layui-col-sm6 layui-col-md6 hiddenParam">
                                     <div class="layui-form-item">
                                         <label class="layui-form-label required label-longers" style="width: 100px;">项目总投资(亿元)</label>
                                         <div class="layui-input-block time_box">
@@ -593,10 +593,9 @@
                                 return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
                             }},
                         {
-                            field: 'amtTotal',
-                            title: '计划总投资（亿元）',
-                            width: 80,
-                            templet: d => (d.amtTotal / 10000).toFixed(2) + "亿元"
+                            field: 'amtTotal', title: '计划总投资（亿元）', width: 80, templet: function (d) {
+                                return `<span class="new-roman">` + (d.amtTotal / 10000).toFixed(2) + `</span>` + "亿元";
+                            }
                         },
                         {field: 'progress', title: '进展情况', minWidth: 300,
                             templet: function (row) {

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

@@ -1088,10 +1088,9 @@
                                 return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
                             }},
                         {
-                            field: 'amtTotal',
-                            title: '计划总投资（亿元）',
-                            width: 80,
-                            templet: d => (d.amtTotal / 10000).toFixed(2) + "亿元"
+                            field: 'amtTotal', title: '计划总投资（亿元）', width: 80, templet: function (d) {
+                                return `<span class="new-roman">` + (d.amtTotal / 10000).toFixed(2) + `</span>` + "亿元";
+                            }
                         },
                         {field: 'progress', title: '进展情况', minWidth: 300,templet: function (row) {
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';

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

@@ -496,10 +496,10 @@
 </script>
 <script type="text/html" id="date">
     <div title="">
-        <div class="line"><span class="qianse">计划入规时间：</span><span class="shense">{{d.rtDate?d.rtDate:''}}</span>
+        <div class="line"><span class="qianse">计划入规时间：</span><span class="shense new-roman">{{d.rtDate?d.rtDate:''}}</span>
 
         </div>
-        <div class="line"><span class="qianse">实际入规时间：</span><span class="shense">{{d.rgDate?d.rgDate:''}}</span>
+        <div class="line"><span class="qianse">实际入规时间：</span><span class="shense new-roman">{{d.rgDate?d.rgDate:''}}</span>
 
         </div>
     </div>

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

@@ -558,10 +558,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 new-roman">{{d.beginDate}}</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 new-roman">{{d.endDate}}</span>
 
         </div>
     </div>

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

@@ -675,7 +675,7 @@
 
 <script type="text/html" id="date">
     <div title="">
-        <div class="line"><span class="shense">{{d.endDate?d.endDate:"--"}}</span>
+        <div class="line"><span class="shense new-roman">{{d.endDate?d.endDate:"--"}}</span>
 
         </div>
 <%--        <div class="line"><span class="qianse">计划开工：</span><span class="shense">{{d.beginDate}}</span>--%>
@@ -1154,12 +1154,14 @@
                                 return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
                             }},
                         {
-                            field: 'amtTotal',  title: '计划总投资（亿元）', width: 80, templet: function (d) {
-                                return (d.amtTotal / 10000).toFixed(2) + "亿元";
+                            field: 'amtTotal', title: '计划总投资（亿元）', width: 80, templet: function (d) {
+                                return `<span class="new-roman">` + (d.amtTotal / 10000).toFixed(2) + `</span>` + "亿元";
                             }
                         },
                         {field: 'endDate',  title: '建成投产时间', width: 100,templet: '#date'},
-                        {field: 'yearPlanAmt', title: '年度投资(万元)', width: 100},
+                        {field: 'yearPlanAmt', title: '年度投资(万元)', width: 100, templet: function (d) {
+                                return d.yearPlanAmt ? `<span class="new-roman">` +  d.yearPlanAmt + `</span>万元` : '';
+                            }},
                         {field: 'progress',  title: '进展情况', width: 300,
                             templet: function (row) {
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';

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

@@ -673,12 +673,15 @@
 
 <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="shense new-roman">{{d.endDate?d.endDate:"--"}}</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.beginDate}}</span>--%>
 
-        </div>
+<%--        </div>--%>
+<%--        <div class="line"><span class="qianse">计划竣工：</span><span class="shense">{{d.endDate}}</span>--%>
+
+<%--        </div>--%>
     </div>
 </script>
 <script type="text/html" id="toolBar">
@@ -1137,12 +1140,14 @@
                                 return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
                             }},
                         {
-                            field: 'amtTotal',  title: '计划总投资（亿元）', minWidth: 80, templet: function (d) {
-                                return (d.amtTotal / 10000).toFixed(2) + "亿元";
+                            field: 'amtTotal', title: '计划总投资（亿元）', width: 80, templet: function (d) {
+                                return `<span class="new-roman">` + (d.amtTotal / 10000).toFixed(2) + `</span>` + "亿元";
                             }
                         },
-                        {field: 'tcDate',  title: '建成投产时间', minWidth: 160,templet: '#date'},
-                        {field: 'amtTotal', title: '年度投资', minWidth: 100},
+                        {field: 'tcDate',  title: '建成投产时间', minWidth: 100,templet: '#date'},
+                        {field: 'yearPlanAmt', title: '年度投资(万元)', width: 100, templet: function (d) {
+                            return d.yearPlanAmt ? `<span class="new-roman">` +  d.yearPlanAmt + `</span>万元` : '';
+                        }},
                         {field: 'progress',  title: '进展情况', minWidth: 200,
                             templet: function (row) {
                                 return row.progress ? '<span class="cut" title="' + row.progress + '">' + row.progress + '</span>' : '';

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

@@ -558,7 +558,7 @@
 <script type="text/html" id="date">
 
     <div title="">
-        <div class="line"><span class="shense">{{d.beginDate}}</span>
+        <div class="line"><span class="shense new-roman">{{d.beginDate}}</span>
 
         </div>
 <%--        <div class="line"><span class="qianse">计划竣工：</span> <span class="shense">{{d.endDate}}</span>--%>
@@ -623,10 +623,10 @@
 <%--        <div class="line"><span class="qianse">无需办理的手续：</span> <span class="shense">{{d.preNoNum}}</span>个--%>
 
 <%--        </div>--%>
-        <div class="line"><span class="qianse">办理中的手续：</span> <span class="shense">{{d.preProceNum}}</span>个
+        <div class="line"><span class="qianse">办理中的手续：</span> <span class="shense new-roman">{{d.preProceNum}}</span>个
 
         </div>
-        <div class="line"><span class="qianse">已办理完成手续：</span> <span class="shense">{{d.preEndNum}}</span>个
+        <div class="line"><span class="qianse">已办理完成手续：</span> <span class="shense new-roman">{{d.preEndNum}}</span>个
 
         </div>
     </div>
@@ -1134,7 +1134,7 @@
                             }},
                         {
                             field: 'amtTotal', title: '计划总投资（亿元）', width: 80, templet: function (d) {
-                                return (d.amtTotal / 10000).toFixed(2) + "亿元";
+                                return `<span class="new-roman">` + (d.amtTotal / 10000).toFixed(2) + `</span>` + "亿元";
                             }
                         },
                         {field: 'preProceNum', title: '预计开工时间', width: 100, templet: '#date'},

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

@@ -954,11 +954,15 @@
                             field: 'amtTotal',
                             title: '总投资',
                             width: 100,
-                            templet: d => (d.amtTotal / 10000).toFixed(2) + "亿元"
+                            templet: d => `<span class="new-roman">` + (d.amtTotal / 10000).toFixed(2) + `</span>` + "亿元",
                         },
                         {field: 'statusName', title: '状态', width: 60},
-                        {field: 'beginDate', title: '计划开工日期', minWidth: 100},
-                        {field: 'endDate', title: '计划完工日期', minWidth: 100},
+                        {field: 'beginDate', title: '计划开工日期', minWidth: 100,
+                            templet: (d)=> `<span class="new-roman">` +  d.beginDate + `</span>`
+                        },
+                        {field: 'endDate', title: '计划完工日期', minWidth: 100,
+                            templet: (d)=> `<span class="new-roman">` +  d.endDate + `</span>`
+                        },
                         {title: '操作', minWidth: 150, toolbar: '#toolBar', fixed: 'right'},
                     ]],
                     fixed: true,

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

@@ -929,8 +929,12 @@
                             {field: 'subName', title: '项目名称', minWidth: 200},
                             {field: 'subjectId', title: '项目所在地', minWidth: 200},
                             {field: 'content', title: '项目建设内容', minWidth: 200},
-                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 200},
-                            {field: 'beginDate', title: '预计开工时间', minWidth: 200},
+                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 200,
+                                templet: d => `<span class="new-roman">` + d.amtTotal + `</span>`
+                            },
+                            {field: 'beginDate', title: '预计开工时间', minWidth: 200,
+                                templet: d => `<span class="new-roman">` + d.beginDate + `</span>`
+                            },
                             {field: 'qqsxblqk', title: '前期手续办理情况', minWidth: 200},
                             {field: 'remark', title: '备注', minWidth: 200},
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},

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

@@ -983,8 +983,12 @@
                             {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
                             {field: 'subjectId', fixed: 'left', title: '项目所在地', minWidth: 200, templet: '#subjectId'},
                             {field: 'content', fixed: 'left', title: '项目建设内容', minWidth: 200, templet: '#content'},
-                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 250},
-                            {field: 'beginDate', title: '预计开工时间', minWidth: 200},
+                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 250,
+                                templet: d => `<span class="new-roman">` + d.amtTotal + `</span>`
+                            },
+                            {field: 'beginDate', title: '预计开工时间', minWidth: 200,
+                                templet: d => `<span class="new-roman">` + d.beginDate + `</span>`
+                            },
                             {field: 'qqsxblqk', title: '前期手续办理情况', minWidth: 200},
                             {field: 'remark', title: '备注', minWidth: 200},
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},

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

@@ -933,7 +933,9 @@
                             {field: 'subName', title: '项目名称', minWidth: 200},
                             {field: 'subjectId', title: '项目所在地', minWidth: 200},
                             {field: 'content', title: '项目建设内容', minWidth: 300,},
-                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 200},
+                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 200,
+                                templet: d => `<span class="new-roman">` + d.amtTotal + `</span>` + "亿元"
+                            },
                             {field: 'progress', title: '进展情况', minWidth: 200},
                             {field: 'remark', title: '备注', minWidth: 200},
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},

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

@@ -360,7 +360,7 @@
         };
         }}
         <span title="">
-        <span class="qianse">总投资：</span><strong class="lanse">{{d.amtTotal}}</strong> 万元 <br/>
+        <span class="qianse">总投资：</span><strong class="lanse new-roman">{{d.amtTotal}}</strong> 万元 <br/>
     </span>
     </script>
 

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

@@ -945,7 +945,9 @@
                             {field: 'subName', title: '项目名称', minWidth: 200},
                             {field: 'subjectId', title: '项目所在地', minWidth: 200},
                             {field: 'content', title: '项目基本情况', minWidth: 200},
-                            {field: 'rgDate', title: '升规入统时间', minWidth: 200},
+                            {field: 'rgDate', title: '升规入统时间', minWidth: 200,
+                                templet: d => `<span class="new-roman">` + d.rgDate + `</span>`
+                            },
                             {field: 'progress', title: '进展情况', minWidth: 200},
                             {field: 'remark', title: '备注', minWidth: 200},
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},