第一次工信局大屏代码上传

projects-service/pom.xml

@@ -32,6 +32,12 @@
 		    <artifactId>hibernate-validator</artifactId>
 		    <version>5.2.4.Final</version>
 		</dependency>
+	  <!-- mybatis框架 -->
+	  <dependency>
+		  <groupId>org.mybatis.spring.boot</groupId>
+		  <artifactId>mybatis-spring-boot-starter</artifactId>
+		  <version>2.2.0</version>
+	  </dependency>
 
 <!--	  pdf模板-->
 	  <dependency>

projects-service/src/main/java/com/rtrh/projects/modules/projects/dao/SubInfoDao.java

@@ -458,7 +458,7 @@ public class SubInfoDao extends EntityServiceImpl<SubInfo> {
 
 		sql.append(" select if(us.id is NULL,0,1) as usersub,a.id,a.sub_name as subName,a.kind,a.prop_kind as propKind,a.amt_total as amtTotal,a.amt_year as amtYear, a.reason, ");
 		sql.append(" IFNULL(a.amt_comp,0) as amtComp, IFNULL(num_total,0) as numTotal, IFNULL(a.num_comp,0) as numComp, ");
-		sql.append(" DATE_FORMAT(a.end_date,'%Y-%m-%d') as endDate,b.title as unitName, c.title as manageName,DATE_FORMAT(a.begin_date,'%Y-%m-%d') as beginDate,a.status,a.status_jh statusJh,a.status_tg statusTg ");
+		sql.append(" DATE_FORMAT(a.end_date,'%Y-%m-%d') as endDate,b.title as unitName, c.title as manageName,DATE_FORMAT(a.begin_date,'%Y-%m-%d') as beginDate,a.status,a.status_jh statusJh ");
 		sql.append(" ,(select src.num_bl FROM sub_rpt_cont as src where src.sub_id =a.id and src.logic_delete_flag = 0 and src.kind = '1' and not isnull(src.num_bl) order by kj_month desc limit 1) as numBl ");
 		sql.append(" from sub_info a ");
 		sql.append(" left join j_unit b on a.unit_id = b.id ");
@@ -612,10 +612,10 @@ public class SubInfoDao extends EntityServiceImpl<SubInfo> {
 
 
 		//20230816  增加联系人，负责人信息。  用于导出。
-		sql.append(" select if(us.id is NULL,0,1) as usersub,sum(sa.amt) yearAmt,sum(src.amt) yearAmtSj,sum(src.amt_rt) yearAmtRt,a.id,a.status_fgw, a.date_fgw,a.indus_kind indusKind,a.subject_id,a.name_lead,a.tel_lead,a.name_zrr,a.tel,a.sub_name as subName,a.kind,a.prop_kind as propKind,a.amt_total as amtTotal, a.reason, a.unit_id as unitId, ");
-		sql.append(" a.reason_no_rk as reasonNoRk,a.reason_no_amt as reasonNoAmt,a.reason_no_kg as reasonNoKg,a.reason_q as reasonq,a.reason_jd as reasonJd, a.is_rk as isRk, a.kind_nature, ");
+		sql.append(" select if(us.id is NULL,0,1) as usersub,sum(sa.amt) yearAmt,sum(src.amt) yearAmtSj,sum(src.amt_rt) yearAmtRt,a.id,a.status_fgw, a.date_fgw,a.indus_kind indusKind,a.name_lead,a.tel_lead,a.name_zrr,a.tel,a.sub_name as subName,a.kind,a.prop_kind as propKind,a.amt_total as amtTotal, a.reason, a.unit_id as unitId, ");
+		sql.append(" a.reason_no_rk as reasonNoRk,a.reason_no_amt as reasonNoAmt,a.reason_no_kg as reasonNoKg,a.reason_q as reasonq,a.reason_jd as reasonJd, a.is_rk as isRk, a.kind_nature,a.subject_id, a.content,");
 		sql.append(" IFNULL(a.amt_comp,0) as amtComp, IFNULL(num_total,0) as numTotal, IFNULL(a.num_comp,0) as numComp, ");
-		sql.append(" DATE_FORMAT(a.end_date,'%Y-%m-%d') as endDate,b.title as unitName, c.title as mainName,DATE_FORMAT(a.begin_date,'%Y-%m-%d') as beginDate,a.status,a.status_jh statusJh,a.status_sp statusSp,a.status_tg statusTg ");
+		sql.append(" DATE_FORMAT(a.end_date,'%Y-%m-%d') as endDate,b.title as unitName, c.title as mainName,DATE_FORMAT(a.begin_date,'%Y-%m-%d') as beginDate,a.status,a.status_jh statusJh,a.status_sp statusSp");
 		if(StringUtil.isNotEmpty(queryVO.getZjly())) {
 			sql.append(", g.amt amtSource, t.title amtSourceName ");
 
@@ -674,6 +674,12 @@ public class SubInfoDao extends EntityServiceImpl<SubInfo> {
 
 
 		sql.append(" where a.logic_delete_flag = 0 ");
+		// 在原有的SQL拼接部分中，找到合适的位置插入新的条件判断逻辑。
+// 假设你已经在构建SQL字符串的过程中定义了sql.append(" select ... ")等语句，
+// 下面是在原有基础上新增的部分：
+
+
+
 		//2024-01-05修改该查询为大屏穿透专用，强制限定只能查询is_hide = 1的项目
 
 		//2024-05-08 添加参数用于查询储备项目。
@@ -717,6 +723,10 @@ public class SubInfoDao extends EntityServiceImpl<SubInfo> {
 		if(StringUtil.isNotEmpty(queryVO.getKindNature())) {
 			sql.append(" AND a.kind_nature  = '"+ queryVO.getKindNature()+"' ");
 		}
+		if(StringUtil.isNotEmpty(queryVO.getContent())) {
+			sql.append(" AND a.content  = '"+ queryVO.getContent()+"' ");
+		}
+
 		//是否在建
 		if(Objects.equals("1", queryVO.getIsZj())) {
 			//2024/6/3 在建包含 停工项目
@@ -912,6 +922,29 @@ public class SubInfoDao extends EntityServiceImpl<SubInfo> {
 					break;
 			}
 		}
+		// 新增：根据amtTo参数设置不同的金额范围过滤条件
+		if (StringUtil.isNotEmpty(queryVO.getAmtTo())) {
+			switch (queryVO.getAmtTo()) {
+				case "1":
+					sql.append(" AND a.amt_total >= 1000000 ");
+					break;
+				case "2":
+					sql.append(" AND a.amt_total >= 500000 AND a.amt_total < 1000000 ");
+					break;
+				case "3":
+					sql.append(" AND a.amt_total >= 100000 AND a.amt_total < 500000 ");
+					break;
+				case "4":
+					sql.append(" AND a.amt_total < 100000 ");
+					break;
+				default:
+					// 如果没有匹配到任何情况，则不做额外处理
+					break;
+			}
+		}
+
+// 将上述代码块插入到现有SQL构建逻辑中合适的位置，例如在其他WHERE条件之后，GROUP BY之前。
+// 确保这个条件是作为WHERE子句的一部分加入的，以保证查询结果符合预期。
 		if(StringUtil.isNotEmpty(queryVO.getStartAmt())) {
 			sql.append(" and a.amt_total >= '" + queryVO.getStartAmt() + "' ");
 		}
@@ -1053,7 +1086,7 @@ public class SubInfoDao extends EntityServiceImpl<SubInfo> {
 		sql.append(" select a.id,a.status_fgw, a.date_fgw,a.indus_kind indusKind,a.subject_id,a.name_lead,a.tel_lead,a.name_zrr,a.tel,a.sub_name as subName,a.kind,a.prop_kind as propKind,a.amt_total as amtTotal, a.reason, a.unit_id as unitId, ");
 		sql.append(" a.reason_no_rk as reasonNoRk,a.reason_no_amt as reasonNoAmt,a.reason_no_kg as reasonNoKg,a.reason_q as reasonq,a.reason_jd as reasonJd, a.is_rk as isRk, a.kind_nature, ");
 		sql.append(" IFNULL(a.amt_comp,0) as amtComp, IFNULL(num_total,0) as numTotal, IFNULL(a.num_comp,0) as numComp, ");
-		sql.append(" DATE_FORMAT(a.end_date,'%Y-%m-%d') as endDate,b.title as unitName, c.title as mainName,DATE_FORMAT(a.begin_date,'%Y-%m-%d') as beginDate,a.status,a.status_jh statusJh,a.status_sp statusSp,a.status_tg statusTg ");
+		sql.append(" DATE_FORMAT(a.end_date,'%Y-%m-%d') as endDate,b.title as unitName, c.title as mainName,DATE_FORMAT(a.begin_date,'%Y-%m-%d') as beginDate,a.status,a.status_jh statusJh,a.status_sp statusSp");
 
 		//20231205  增加项目 今年  年度计划投资，年度实际投资
 		SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy");

projects-service/src/main/java/com/rtrh/projects/modules/projects/dto/QTDTO.java

@@ -0,0 +1,20 @@
+package com.rtrh.projects.modules.projects.dto;
+
+import lombok.Data;
+
+/**
+ * @param
+ * @author 86136
+ * @description: TODO
+ * @date 2024/12/27 13:57
+ */
+@Data
+public class QTDTO {
+    private String varlx;
+    private String varyear;
+    private String varqx;
+    private String var4k;
+    private String vargm;
+    private String varhy;
+    private String varlogin;
+}

projects-service/src/main/java/com/rtrh/projects/modules/projects/enums/ProjectStatusEnum.java

@@ -3,18 +3,18 @@ package com.rtrh.projects.modules.projects.enums;
 public enum ProjectStatusEnum {
 
 	TEMPSAVE("0","暂存"),
-	PRE("1","项目前期"),
+	PRE("1","储备中"),
 	/*WAIT_APPROVAL("2", "待审核"), //去除
 	APPROVAL("3","审核中"), //去除
 	HZBA("4", "核准备案中"),//去除
 	JHBZ("5", "计划编制"),//去除
-*/	DKG("6", "待开工"),
+*/	DKG("2", "新建中"),
 
-	YKG("7", "已开工"),
+	YKG("3", "在建中"),
 	STOP("8","暂时停工"),
 	//用于其他地方的使用
 	UNPASS("8", "不通过"),
-	NDWG("9","年度竣工"),
+	NDWG("9","投产中"),
 	END("A","已竣工");
 
 	private final String key;

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

@@ -0,0 +1,32 @@
+package com.rtrh.projects.modules.projects.mapper;
+
+import com.rtrh.core.repository.mybatis.MyBatisRepository;
+import com.rtrh.projects.modules.projects.dto.QTDTO;
+import com.rtrh.projects.modules.projects.vo.QTVO;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.mapping.StatementType;
+
+import java.util.List;
+import java.util.Map;
+
+@MyBatisRepository
+public interface QtMapper {
+
+    @Select("{call dp_gxj_qt(#{varlx}, #{varyear}, #{varqx}, #{var4k}, #{vargm}, #{varhy}, #{varlogin})}")
+    @Options(statementType = StatementType.CALLABLE)
+    List<Map<String, Object>> getDPGxjQtData(QTDTO qtdto);
+
+    @Select("{call dp_gxj_addre(#{varlx}, #{varyear}, #{varqx}, #{var4k}, #{vargm}, #{varhy}, #{varlogin})}")
+    @Options(statementType = StatementType.CALLABLE)
+    List<Map<String, Object>> getDPGxjAddreData(QTDTO qtdto);
+
+    @Select("{call dp_gxj_gm(#{varlx}, #{varyear}, #{varqx}, #{var4k}, #{vargm}, #{varhy}, #{varlogin})}")
+    @Options(statementType = StatementType.CALLABLE)
+    List<Map<String, Object>> getDPGxjGmData(QTDTO qtdto);
+
+    @Select("{call dp_gxj_hy(#{varlx}, #{varyear}, #{varqx}, #{var4k}, #{vargm}, #{varhy}, #{varlogin})}")
+    @Options(statementType = StatementType.CALLABLE)
+    List<Map<String, Object>> getDPGxjHyData(QTDTO qtdto);
+}
+

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.QtMapper">
+
+    <select id="getQTData" statementType="CALLABLE" resultType="com.rtrh.projects.modules.projects.vo.QTVO">
+        {call dp_gxj_qt(
+                #{varlx, mode=IN, jdbcType=VARCHAR},
+                #{varyear, mode=IN, jdbcType=VARCHAR},
+                #{varqx, mode=IN, jdbcType=VARCHAR},
+                #{var4k, mode=IN, jdbcType=VARCHAR},
+                #{vargm, mode=IN, jdbcType=VARCHAR},
+                #{varhy, mode=IN, jdbcType=VARCHAR},
+                #{varlogin, mode=IN, jdbcType=VARCHAR}
+              )}
+    </select>
+
+</mapper>
+

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/QtService.java

@@ -0,0 +1,17 @@
+package com.rtrh.projects.modules.projects.service;
+
+import com.rtrh.projects.modules.projects.dto.QTDTO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface QtService {
+
+
+
+    List<Map<String, Object>> getDPGxjQtData(QTDTO qtdto);
+    List<Map<String, Object>> getDPGxjAddreData(QTDTO qtdto);
+    List<Map<String, Object>> getDPGxjGmData(QTDTO qtdto);
+    List<Map<String, Object>> getDPGxjHyData(QTDTO qtdto);
+}
+

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/StaticsService.java

@@ -332,4 +332,6 @@ public interface StaticsService {
 	 * @return
 	 */
 	 Map<String, Object> FindMonthRpt(String month) throws Exception;
+
+
 }

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

@@ -0,0 +1,45 @@
+package com.rtrh.projects.modules.projects.service.impl;
+
+import com.rtrh.projects.modules.projects.dto.QTDTO;
+import com.rtrh.projects.modules.projects.mapper.QtMapper;
+import com.rtrh.projects.modules.projects.service.QtService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @param
+ * @author 86136
+ * @description: TODO
+ * @date 2024/12/27 14:43
+ */
+@Service
+public class QtServiceImpl implements QtService {
+
+    @Autowired
+    private QtMapper qtMapper;
+
+
+    @Override
+    public List<Map<String, Object>> getDPGxjQtData(QTDTO qtdto) {
+        return qtMapper.getDPGxjQtData(qtdto);
+    }
+
+    @Override
+    public List<Map<String, Object>> getDPGxjAddreData(QTDTO qtdto) {
+        return qtMapper.getDPGxjAddreData(qtdto);
+    }
+
+    @Override
+    public List<Map<String, Object>> getDPGxjGmData(QTDTO qtdto) {
+        return qtMapper.getDPGxjGmData(qtdto);
+    }
+
+    @Override
+    public List<Map<String, Object>> getDPGxjHyData(QTDTO qtdto) {
+        return qtMapper.getDPGxjHyData(qtdto);
+    }
+}
+

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

@@ -0,0 +1,30 @@
+package com.rtrh.projects.modules.projects.vo;
+
+import lombok.Data;
+
+/**
+ * @param
+ * @author 86136
+ * @description: TODO
+ * @date 2024/12/27 14:28
+ */
+@Data
+public class QTVO {
+    private int id;
+    private int numYearKgl; // 年度开工率
+    private int numYearTcl; // 年度投产率
+    private int numYearRgl; // 年度入规率
+    private int numTotal;   // 项目总量
+    private int numCb;      // 储备数量
+    private double amtCb;   // 储备总金额
+    private int numXj;      // 新建数量
+    private double amtXj;   // 新建总金额
+    private int numZj;      // 在建数量
+    private double amtZj;   // 在建总金额
+    private int numTc;      // 投产数量
+    private int numCq1;     // 前期手续超期数量
+    private int numCq2;     // 储备转新建超期
+    private int numCq3;     // 新建转在建超期
+    private int numCq4;     // 在建转投产超期
+    private int numCq5;     // 投产转入轨超期
+}

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

@@ -28,6 +28,10 @@ public class SubInfoQueryTzVO {
 	 */
 	private String subjectId;
 
+	/**
+	 * 项目编号
+	 */
+	private String amtTo;
 	/**
 	 * 申请投向
 	 */
@@ -115,6 +119,10 @@ public class SubInfoQueryTzVO {
 	 * 灯色
 	 */
 	private String light;
+	/**
+	 * 建设内容
+	 */
+	private String content;
 
 	/**
 	 * 是否分管项目

projects/src/main/java/com/rtrh/projects/web/controller/statics/AnalysisScreenController.java

@@ -10,6 +10,7 @@ import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.afterturn.easypoi.excel.export.ExcelExportService;
 import cn.hutool.core.net.URLEncodeUtil;
+import com.rtrh.common.util.DateUtil;
 import com.rtrh.core.repository.Page;
 import com.rtrh.projects.modules.projects.enums.ProjectStatusEnum;
 import com.rtrh.projects.modules.projects.enums.SubqestionStatus;
@@ -324,7 +325,150 @@ public class AnalysisScreenController extends BaseController {
 		return new ModelAndView("/vmodules/statics/layer/projInfo_tz.jsp");
 	}
 
+	/**
+	 * 项目台账穿透页面
+	 * @param model
+	 * @param proType
+	 * @param unitName
+	 * @param rangeDate
+	 * @param indusKind
+	 * @param projStatus
+	 * @param kind
+	 * @param neTemp
+	 * @param isZj
+	 * @param subjectId
+	 * @param minAmt
+	 * @param maxAmt
+	 * @param isCt
+	 * @return
+	 */
+	@GetMapping("subjectGx")
+	public ModelAndView sujectGx(ModelMap model, String proType,String unitName,String rangeDate, String indusKind,String projStatus,String kind,
+								 Boolean neTemp,String isZj,String subjectId, BigDecimal minAmt, BigDecimal maxAmt, Boolean isCt,Boolean blSub,String light,
+								 String isYq,String zjly,String year,String endMonth,String beginMonth,String propKind,String ABC,Boolean isCb,String allTime,String isFix,String fixCat) {
+//		if(StringUtil.isEmpty(rangeDate)) {
+//			int year = DateUtil.getYear();
+//			rangeDate = year + "-01-01 ~ " + year + "-12-31";
+//		}
+//		rangeDate="";
+		//allTime 是否查询 全年。   1 查询月份   "" 查询全年
+		if (StringUtil.isNotEmpty(beginMonth)&&"1".equals(allTime)) {
+			rangeDate=year+"-"+beginMonth+"-01 ~ ";
+		}else{
+			rangeDate=year+"-01-01 ~ ";
+		}
+
+		if (StringUtil.isNotEmpty(endMonth)&&"1".equals(allTime)){
+			rangeDate=rangeDate+year+"-"+endMonth+"-31";
+		}else{
+			rangeDate=rangeDate+year+"-12-31";
+		}
+
 
+		model.put("rangeDate", rangeDate);
+		model.put("neTemp", neTemp);
+		model.put("isZj", isZj);
+		model.put("proType", proType);
+		model.put("unitName", unitName);
+		model.put("indusKind", indusKind);
+		model.put("projStatus", projStatus);
+		model.put("subjectId", subjectId);
+		model.put("zjly", zjly);
+		model.put("minAmt", minAmt);
+		model.put("maxAmt", maxAmt);
+		model.put("abc", ABC);
+		//是否穿透
+		model.put("isCt", Boolean.TRUE.equals(isCt));
+		//是否分管
+		model.put("blSub", Boolean.TRUE.equals(blSub));
+
+		model.put("isCb", Boolean.TRUE.equals(isCb));
+
+		//是否逾期
+		model.put("isYq", isYq);
+		model.put("kind", kind);
+		model.put("propKind", propKind);
+		model.put("isFix", isFix);
+		model.put("fixCat", fixCat);
+		model.put("light", light);
+		String kindUnit= getCurUser().getKindUnit();
+		Boolean isHydw = false;
+		if(StringUtil.isNotEmpty(kindUnit)) {
+			if("1".equals(kindUnit)) {
+				isHydw=true;
+			}
+		}
+		model.put("year", year);
+		model.put("isHydw", isHydw);
+		String currUserUnitId = getCurUser().getUnitId();
+		model.put("currUser", getCurUser().getLoginUser());
+		model.put("currUnitId", currUserUnitId);
+		return new ModelAndView("/vmodules/statics/layer/projInfo_gx.jsp");
+	}
+	@GetMapping("subjectZj")
+	public ModelAndView subjectZj(ModelMap model, String proType,String unitName,String rangeDate, String indusKind,String projStatus,String kind,
+								 Boolean neTemp,String isZj,String subjectId, BigDecimal minAmt, BigDecimal maxAmt, Boolean isCt,Boolean blSub,String light,
+								 String isYq,String zjly,String year,String endMonth,String beginMonth,String propKind,String ABC,Boolean isCb,String allTime,String isFix,String fixCat,String amtTo) {
+//		if(StringUtil.isEmpty(rangeDate)) {
+//			int year = DateUtil.getYear();
+//			rangeDate = year + "-01-01 ~ " + year + "-12-31";
+//		}
+//		rangeDate="";
+		//allTime 是否查询 全年。   1 查询月份   "" 查询全年
+		if (StringUtil.isNotEmpty(beginMonth)&&"1".equals(allTime)) {
+			rangeDate=year+"-"+beginMonth+"-01 ~ ";
+		}else{
+			rangeDate=year+"-01-01 ~ ";
+		}
+
+		if (StringUtil.isNotEmpty(endMonth)&&"1".equals(allTime)){
+			rangeDate=rangeDate+year+"-"+endMonth+"-31";
+		}else{
+			rangeDate=rangeDate+year+"-12-31";
+		}
+
+
+		model.put("rangeDate", rangeDate);
+		model.put("neTemp", neTemp);
+		model.put("isZj", isZj);
+		model.put("proType", proType);
+		model.put("unitName", unitName);
+		model.put("indusKind", indusKind);
+		model.put("projStatus", projStatus);
+		model.put("subjectId", subjectId);
+		model.put("zjly", zjly);
+		model.put("minAmt", minAmt);
+		model.put("maxAmt", maxAmt);
+		model.put("abc", ABC);
+		//是否穿透
+		model.put("isCt", Boolean.TRUE.equals(isCt));
+		//是否分管
+		model.put("blSub", Boolean.TRUE.equals(blSub));
+
+		model.put("isCb", Boolean.TRUE.equals(isCb));
+
+		//是否逾期
+		model.put("isYq", isYq);
+		model.put("kind", kind);
+		model.put("propKind", propKind);
+		model.put("isFix", isFix);
+		model.put("fixCat", fixCat);
+		model.put("amtTo", amtTo);
+		model.put("light", light);
+		String kindUnit= getCurUser().getKindUnit();
+		Boolean isHydw = false;
+		if(StringUtil.isNotEmpty(kindUnit)) {
+			if("1".equals(kindUnit)) {
+				isHydw=true;
+			}
+		}
+		model.put("year", year);
+		model.put("isHydw", isHydw);
+		String currUserUnitId = getCurUser().getUnitId();
+		model.put("currUser", getCurUser().getLoginUser());
+		model.put("currUnitId", currUserUnitId);
+		return new ModelAndView("/vmodules/statics/layer/projInfo_zj.jsp");
+	}
 	/**
 	 * 项目台账穿透页面
 	 * @param model

projects/src/main/java/com/rtrh/projects/web/controller/statics/api/AnalysisScreenApiController.java

@@ -9,11 +9,13 @@ import com.rtrh.common.util.CollectionUtil;
 import com.rtrh.common.util.StringUtil;
 import com.rtrh.projects.modules.projects.dao.SubAmtPlanDao;
 import com.rtrh.projects.modules.projects.dao.SubSourceDao;
+import com.rtrh.projects.modules.projects.dto.QTDTO;
 import com.rtrh.projects.modules.projects.enums.ProjectStatusEnum;
 import com.rtrh.projects.modules.projects.enums.RptContKindEnum;
 import com.rtrh.projects.modules.projects.po.RptCont;
 import com.rtrh.projects.modules.projects.po.SubAmtPlan;
 import com.rtrh.projects.modules.projects.service.*;
+import com.rtrh.projects.modules.projects.vo.QTVO;
 import com.rtrh.projects.modules.projects.vo.SubSourceVO;
 import com.rtrh.projects.modules.system.po.JUnit;
 import com.rtrh.projects.modules.system.service.JUnitService;
@@ -21,6 +23,7 @@ import com.rtrh.projects.vo.statics.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import com.rtrh.core.repository.Page;
@@ -35,6 +38,7 @@ import com.rtrh.projects.web.controller.BaseController;
  * @author PENG
  *
  */
+@CrossOrigin(origins = "http://localhost:8080")
 @RestController
 @RequestMapping("/api/statics")
 public class AnalysisScreenApiController extends BaseController {
@@ -55,7 +59,8 @@ public class AnalysisScreenApiController extends BaseController {
 	private SubAmtPlanDao subAmtPlanDao;
 	@Autowired
 	private SubRptContService subRptContService;
-
+	@Autowired
+	private QtService qtService;
 	@Autowired
 	private SubSourceDao subSourceDao;
 	/**
@@ -551,4 +556,56 @@ public class AnalysisScreenApiController extends BaseController {
 	}
 
 
+	@PostMapping("/dp_gxj_qt")
+	public Message getDPGxjQtData(@RequestBody QTDTO qtdto) {
+		Message message = new Message();
+		try {
+			System.out.println("getDPGxjQtData"+qtdto);
+			List<Map<String, Object>> data = qtService.getDPGxjQtData(qtdto);
+			message.setData(data);
+		} catch (Exception e) {
+			logger.error("", e);
+			message.add("查询失败");
+		}
+		return message;
+	}
+
+	@PostMapping("/dp_gxj_addre")
+	public Message getDPGxjAddreData(@RequestBody QTDTO qtdto) {
+		Message message = new Message();
+		try {
+			List<Map<String, Object>> data = qtService.getDPGxjAddreData(qtdto);
+			message.setData(data);
+		} catch (Exception e) {
+			logger.error("", e);
+			message.add("查询失败");
+		}
+		return message;
+	}
+
+	@PostMapping("/dp_gxj_gm")
+	public Message getDPGxjGmData(@RequestBody QTDTO qtdto) {
+		Message message = new Message();
+		try {
+			List<Map<String, Object>> data = qtService.getDPGxjGmData(qtdto);
+			message.setData(data);
+		} catch (Exception e) {
+			logger.error("", e);
+			message.add("查询失败");
+		}
+		return message;
+	}
+
+	@PostMapping("/dp_gxj_hy")
+	public Message getDPGxjHyData(@RequestBody QTDTO qtdto) {
+		Message message = new Message();
+		try {
+			List<Map<String, Object>> data = qtService.getDPGxjHyData(qtdto);
+			message.setData(data);
+		} catch (Exception e) {
+			logger.error("", e);
+			message.add("查询失败");
+		}
+		return message;
+	}
 }

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

@@ -617,15 +617,13 @@ public class SubInfoController extends BaseController {
             for (int i = 0; i < list.size(); i++) {
                 Map<String, Object> map = list.get(i);
                 if ("1".equals(map.get("status"))) {
-                    map.put("statusName", "项目前期");
-                } else if ("6".equals(map.get("status"))) {
-                    map.put("statusName", "待开工");
-                } else if ("7".equals(map.get("status"))) {
-                    map.put("statusName", "施工中");
-                } else if ("8".equals(map.get("status"))) {
-                    map.put("statusName", "暂停施工");
-                } else if ("A".equals(map.get("status"))) {
-                    map.put("statusName", "已竣工");
+                    map.put("statusName", "储备中");
+                } else if ("2".equals(map.get("status"))) {
+                    map.put("statusName", "新建中");
+                } else if ("3".equals(map.get("status"))) {
+                    map.put("statusName", "在建中");
+                } else if ("9".equals(map.get("status"))) {
+                    map.put("statusName", "投产中");
                 }
             }
 

projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoApiController.java

@@ -331,7 +331,23 @@ public class SubInfoApiController extends BaseController {
         }
         return message;
     }
-
+    @PostMapping(value = "/pageQueryZJ")
+    public ListMessage pageQueryZJ(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
+        ListMessage message = new ListMessage();
+        try {
+            Page pageData = subInfoService.pageQueryTZ(page, getCurUser().getLoginUser(), queryVO);
+			/*for(Map<String, Object> map : (List<Map<String, Object>>) pageData.getList()) {
+				if(map.get("subject_id") != null) {
+					map.put("subject_id", tSysTableService.getTitleByKindAndCode(SysTableKind.JSDD, String.valueOf(map.get("subject_id"))));
+				}
+			}*/
+            message.add(pageData.getList(), pageData.getTotalCount());
+        } catch (Exception e) {
+            logger.error("", e);
+            message.add("获取失败");
+        }
+        return message;
+    }
 
     /**
      * 项目删除

projects/src/main/resources/template/ScreenMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.rtrh.projects.modules.projects.mapper.QtMapper">
+    <select id="getQTData" statementType="CALLABLE">
+        {call dp_gxj_qt(
+                #{varlx, mode=IN, jdbcType=VARCHAR},
+                #{varyear, mode=IN, jdbcType=VARCHAR},
+                #{varqx, mode=IN, jdbcType=VARCHAR},
+                #{var4k, mode=IN, jdbcType=VARCHAR},
+                #{vargm, mode=IN, jdbcType=VARCHAR},
+                #{varhy, mode=IN, jdbcType=VARCHAR},
+                #{varlogin, mode=IN, jdbcType=VARCHAR},
+                #{result, mode=OUT, jdbcType=CURSOR, javaType=java.util.List, resultSetType=FORWARD_ONLY, resultMap=qtResultMap}
+              )}
+    </select>
+
+    <resultMap id="qtResultMap" type="com.rtrh.projects.modules.projects.vo.QTVO">
+        <result property="id" column="id"/>
+        <result property="numYearKgl" column="num_year_kgl"/>
+        <result property="numYearTcl" column="num_year_tcl"/>
+        <result property="numYearRgl" column="num_year_rgl"/>
+        <result property="numTotal" column="num_total"/>
+        <result property="numCb" column="num_cb"/>
+        <result property="amtCb" column="amt_cb"/>
+        <result property="numXj" column="num_xj"/>
+        <result property="amtXj" column="amt_xj"/>
+        <result property="numZj" column="num_zj"/>
+        <result property="amtZj" column="amt_zj"/>
+        <result property="numTc" column="num_tc"/>
+        <result property="numCq1" column="num_cq_1"/>
+        <result property="numCq2" column="num_cq_2"/>
+        <result property="numCq3" column="num_cq_3"/>
+        <result property="numCq4" column="num_cq_4"/>
+        <result property="numCq5" column="num_cq_5"/>
+    </resultMap>
+</mapper>

projects/src/main/webapp/Screenpicture/gxj/rectangle.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 177.46 60"><defs><style>.e{fill:url(#b);fill-rule:evenodd;stroke:url(#c);}</style><linearGradient id="b" x1="-206.32" y1="443.76" x2="-207.32" y2="443.76" gradientTransform="translate(36584.58 26212.01) scale(176.46 -59)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0d85c8"/><stop offset="1" stop-color="#0d2757" stop-opacity="0"/></linearGradient><linearGradient id="c" x1="-206.32" y1="443.76" x2="-207.32" y2="443.76" gradientTransform="translate(36584.58 26212.01) scale(176.46 -59)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#269dd5"/><stop offset=".66" stop-color="#7ed8ed" stop-opacity="0"/></linearGradient></defs><path id="d" class="e" d="M171.79,.5c2.01,0,3.56,.79,4.41,2.12,.87,1.34,1.01,3.19,.3,5.22l-15.49,44c-.75,2.12-2.28,4.03-4.16,5.42-1.87,1.38-4.07,2.25-6.18,2.25H5.67c-2.01,0-3.56-.79-4.41-2.12-.87-1.34-1.01-3.19-.3-5.22L16.45,8.17c.75-2.12,2.28-4.03,4.16-5.42,1.87-1.38,4.07-2.25,6.18-2.25H171.79Z"/></svg>

projects/src/main/webapp/Screenpicture/gxj/screen.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.f{fill:#2ccfff;}</style></defs><path id="e" class="f" d="M2,8v-3c0-1.7,1.3-3,3-3h3c.6,0,1-.4,1-1s-.4-1-1-1h-3C2.2,0,0,2.2,0,5v3c0,.6,.4,1,1,1s1-.4,1-1ZM0,16v3c0,2.8,2.2,5,5,5h3c.6,0,1-.4,1-1s-.4-1-1-1h-3c-1.7,0-3-1.3-3-3v-3c0-.6-.4-1-1-1s-1,.4-1,1ZM24,8v-3c0-2.8-2.2-5-5-5h-3c-.6,0-1,.4-1,1s.4,1,1,1h3c1.7,0,3,1.3,3,3v3c0,.6,.4,1,1,1s1-.4,1-1Zm-2,8v3c0,1.7-1.3,3-3,3h-3c-.6,0-1,.4-1,1s.4,1,1,1h3c2.8,0,5-2.2,5-5v-3c0-.6-.4-1-1-1s-1,.4-1,1Z"/></svg>

projects/src/main/webapp/Screenpicture/gxj/search.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40.02 40.01"><defs><style>.c{fill:#2ccfff;}</style></defs><path id="b" class="c" d="M28.89,32.41c-7.94,6-19.25,4.42-25.25-3.52C-2.36,20.95-.78,9.64,7.16,3.64,15.11-2.36,26.41-.78,32.41,7.16c4.86,6.43,4.86,15.3,0,21.73l6.92,6.92c.95,.99,.91,2.57-.08,3.52-.96,.92-2.47,.92-3.44,0l-6.92-6.92Zm-10.86-.36c7.74,0,14.02-6.28,14.02-14.02s-6.28-14.02-14.02-14.02S4.01,10.28,4.01,18.03h0c0,7.74,6.27,14.02,14.01,14.02h0Z"/></svg>

projects/src/main/webapp/Screenpicture/gxj/title.svg

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="652px" height="64px" viewBox="0 0 652 64" style="enable-background:new 0 0 652 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{enable-background:new    ;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g class="st0">
+	<path class="st1" d="M27,11.8v35.5c0,3.2-1.5,4.8-4.5,4.8H11.3V11.8H27z M20.9,44.7V17.5h-3.4v29.1h2.1
+		C20.4,46.6,20.9,45.9,20.9,44.7z M49.1,10.4l2.4,4.6c0.4,1.1,0.9,1.6,1.4,1.6h0.9v5.6h-3.8c-1,0-1.7-0.5-2.4-1.4l-3.2-5.1h-6.5
+		l-3.3,5.1c-0.7,1-1.5,1.4-2.4,1.4h-4.2v-5.6h1.2c0.5,0,1-0.5,1.4-1.6l2.5-4.6H49.1z M52.5,29.8H29v-5.6h23.4V29.8z M51.7,32v16.6
+		c0,3.1-1.6,4.6-4.7,4.6H29.7V32H51.7z M45.3,45.9v-8.5h-9.2v10.3H44C44.8,47.8,45.3,47.2,45.3,45.9z"/>
+	<path class="st1" d="M88.6,10.2v2.3h18v8.8h-6.2v-3.6H69.5v3.6h-6.2v-8.8h18v-2.3H88.6z M73.9,22.2c-0.9,3.1-1.7,5-2.4,5.8
+		c-0.9,0.9-1.8,1.3-2.9,1.3H64v-4.5h2c0.8,0,1.5-0.9,2-2.6H73.9z M71.1,39v7.8h10.1v-9.5H88v9.5h9.6c0.9,0,1.3-0.3,1.3-1.1V39h6.8
+		v7.8c0,3.9-2.3,5.9-6.8,5.9H64.4V39H71.1z M80.7,20.8v9.1c0,0.4,0.1,0.7,0.3,0.8h1.9c0.5,0,1-0.3,1.6-1.1l1.9-2.2h-1.2
+		c-2.1,0-3.1-0.8-3.1-2.4v-5.2h5.2v2.9c0,0.5,0.3,0.8,1,0.8h0.5v1.3l1.7-2h6.2L96.4,22h6.4l1.7,6.5c0.2,0.8,0.5,1.2,1,1.2h0.9v5.2
+		h-3.5c-1.9,0-3.2-1-3.8-3.1l-2-7.3L90.3,31h6.5v4.7H65.5v-5h9.2v-9.9H80.7z"/>
+	<path class="st1" d="M139.8,10.2l1.9,3.8h17.9v5.4h-18.1v4.7h16.6v24.3c0,2.2-1.4,3.3-4.1,3.3h-8.7v-5.6h5c0.6,0,1-0.4,1-1.2V29.6
+		h-9.8v24.1h-6.9V29.6h-9.6v22h-6.8V24.1h16.4v-4.7H117V14h16.6l-1.9-3.8H139.8z"/>
+	<path class="st1" d="M210.7,17.3h-15.9v29.3h17.4v6h-42.3v-6h17.8V17.3h-16.7v-6h39.7V17.3z"/>
+	<path class="st1" d="M234.2,10.2L230.6,21v32.5h-6.2V26.6h-2.5V20h1.2c0.7,0,1.2-0.5,1.5-1.6l2.9-8.3H234.2z M254,10v3.2h11.7v5.3
+		h-31.9v-5.3h12.9V10H254z M264.4,26.1h-28.9v-5.3h28.9V26.1z M264.4,34h-28.9v-5.2h28.9V34z M264.6,36.8v12c0,2.6-1.2,4-3.4,4
+		h-25.7v-16H264.6z M257.8,46.7V42h-15.6v5.4h14.9C257.6,47.5,257.8,47.2,257.8,46.7z"/>
+	<path class="st1" d="M318.4,10.6v8.9c0,3.2-2,4.7-5.9,4.7h-28.8v2H318v21.9c0,3.2-2,4.8-6,4.8h-15.4v-5.4h13.1c1,0,1.5-0.3,1.5-1.1
+		V31.6h-27.5v15c0,4.3-2.2,6.5-6.6,6.5h-2v-5.4h0.5c1,0,1.4-0.5,1.4-1.6V10.6h17.7H318.4z M310.4,18.9c1,0,1.5-0.3,1.5-1v-1.9h-28.1
+		v2.9H310.4z M308.5,33.6v9.3c0,2.5-1.1,3.7-3.1,3.7H286v-13H308.5z M302.3,41.2v-2.7h-10.1v3.2h9.6
+		C302.1,41.7,302.3,41.5,302.3,41.2z"/>
+	<path class="st1" d="M339.3,9.6l-0.8,1.7h12.2v5.3h-7.2V19h7.8v5.1h-6.1l1.4,1.7c0.3,0.3,0.8,0.4,1.3,0.4h3v5.4h-5.2
+		c-1.4,0-2.4-0.3-3-1l-2.3-2.7l-2.6,2.7c-0.6,0.7-1.4,1-2.6,1h-6v-5.4h3.7c0.5,0,1-0.1,1.3-0.4l1.4-1.7h-6.7V19h8.4v-2.5h-1.5
+		c-0.7,0.9-1.6,1.3-2.8,1.3h-4.2v-5.2h1.4c0.5,0,0.8-0.2,1.1-0.7l1.2-2.3H339.3z M370,32.9v16.2c0,2.7-1.6,4.1-4.8,4.1h-35.5V32.9
+		H370z M363.6,40.5v-2.1h-27.6v2.1H363.6z M363.6,46.4v-0.9h-27.6v2.3h26C363.1,47.8,363.6,47.3,363.6,46.4z M371.2,11.4v16.1
+		c0,2.5-1.5,3.8-4.6,3.8h-13.9V11.4H371.2z M365,24.9v-8.4h-6.1v9.7h4.6C364.5,26.2,365,25.8,365,24.9z"/>
+	<path class="st1" d="M391.4,43.1l-1.9,7.6c-0.5,1.8-1.8,2.7-3.7,2.7h-4.4v-4.8h2.1c0.3,0,0.5-0.3,0.7-1l1-4.5H391.4z M401.8,15.2
+		h-7v1.2h6v4.1h-6v1h7.5v4.3h-7.5V27h-6v-1.2h-7.3v-4.3h7.3v-1h-6v-4.1h6v-1.2h-6.8v-4.1h6.8V9.6h6v1.5h7V15.2z M423.3,27.6v10.9
+		c0,2.5-2,3.7-5.9,3.7h-35.1v-4.1h32.9c1,0,1.5-0.2,1.5-0.8v-0.5h-34V33h34v-1.3h-34.4v-4.1H423.3z M399.4,43.7v4.7
+		c0,0.6,0.4,0.8,1.3,0.8h13.7v4.3h-17.7c-2.7,0-4-0.9-4-2.6v-7.2H399.4z M407.7,43.3v1.3c0,0.4,0.4,0.5,1.2,0.5h2.6v3h-6.3
+		c-2.5,0-3.7-0.6-3.7-1.8v-3.1H407.7z M424.1,15.2h-6.5v1.2h5.8v4.1h-5.8v1.1h6.9v4.1h-6.9V27h-6v-1.3h-8.1v-4.1h8.1v-1.1h-7v-4.1h7
+		v-1.2h-7.5v-4.1h7.5V9.4h6v1.7h6.5V15.2z M420.8,43.3l1.2,4c0.1,0.9,0.6,1.3,1.3,1.3h1.2v4.7h-4.3c-1.9,0-3.2-0.9-3.7-2.7l-2.1-7.3
+		H420.8z"/>
+	<path class="st1" d="M475.6,29.9V48c0,3.5-2,5.2-6,5.2h-15.1v-5.8h12.9c1.1,0,1.6-0.4,1.6-1.2V35.8h-17.5L445.5,51
+		c-0.5,1.4-1.4,2.2-2.7,2.2h-7.3v-5.8h3.5c0.3,0,0.5-0.2,0.7-0.7l4.3-10.9h-8.3v-5.8H475.6z M447.2,18.6l-3,7.1
+		c-0.7,1.6-1.7,2.4-3.3,2.4h-5.1v-5.8h2.4c0.4,0,0.8-0.3,1-0.9l1.1-2.8H447.2z M467.7,10.7c1.2,0,2.1,0.5,2.8,1.4l3.9,7.6
+		c0.5,1.2,1.2,1.7,2,1.7h1v6.8H474c-1.1,0-2.2-0.8-3.2-2.4l-5.4-8.3c-0.6-0.5-1.2-0.7-1.8-0.7h-24v-6H467.7z"/>
+	<path class="st1" d="M505,19.6h-5.2v33.7h-6V26.7l-1.1,18.7c-0.1,1.5-0.5,2.6-1.2,3.3c-0.8,0.7-1.8,1.1-2.8,1.1h-1.9v-4.9h0.1
+		c0.8,0,1.2-0.5,1.2-1.7l1.3-19.9h4.3v-3.6h-5.3v-5.4h5.3v-4h6v4h5.2V19.6z M504.4,23.3l1.2,21.4c0,0.5,0.1,0.7,0.4,0.7h0.5v2.5
+		c0.4,0,0.6-0.2,0.6-0.6V11.8h14.9c1.1,0,1.6-0.5,1.6-1.7h6.4V13c0,2.7-1.9,4.1-5.6,4.1h-10.9v4.8h17v5.4h-4.2v26h-6.5v-26h-6.3
+		v21.3c0,2.9-1.6,4.4-4.8,4.4H506v-2.7h-1.7c-2,0-3-1.2-3.2-3.6l-1.2-23.4H504.4z"/>
+	<path class="st1" d="M583.3,23.4h-16.5l9.6,21.4c0.5,1.3,1.1,2,1.9,2h5.3V53h-9.9c-1,0-1.8-0.8-2.6-2.4l-8.7-21.3l-8.1,20.3
+		c-1,2.2-2.1,3.4-3.4,3.4h-10.4v-6.2h5.9c1,0,2-1.4,3.2-4.4l7.3-19.1h-16.2v-6.2h17.7v-7h7.3v7h17.7V23.4z"/>
+	<path class="st1" d="M601.7,45.3c0,2.6-0.6,4.5-1.9,5.8c-1.2,1.3-3.4,2.1-6.5,2.1v-5.6c1.2-0.5,1.8-1.3,1.8-2.5V10.3h41.2V20
+		c0,3.3-1.6,4.9-4.9,4.9h-29.8V45.3z M601.7,19.4h26.8c0.9,0,1.3-0.2,1.3-0.7v-3h-28.1V19.4z M613.6,26.5l1.1,3.4h9.2l0.8-3.4h7.2
+		l-0.9,3.4h3.8v5.2h-5.2v4.1h6.2v5.3h-6.2v8.8h-6.4v-8.8h-7.3V50c0,2.1-1.3,3.1-3.9,3.1h-8.1v-5.2h4.7c0.6,0,1-0.3,1-1.1v-2.3h-6
+		v-5.3h6v-4.1h-5.6v-5.2h3.6l-1.1-3.4H613.6z M623.2,35.1h-7.3v4.1h7.3V35.1z"/>
+</g>
+</svg>

projects/src/main/webapp/Screenpicture/screen_n/classify.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.h{fill:rgba(255,255,255,0);}.i{fill:#fff;}</style></defs><g id="b"><g id="c"><g id="d"><g id="e"><rect id="f" class="h" width="18" height="18"/><path id="g" class="i" d="M2.89,3.63c-.52,0-.95,.43-.95,.95s.43,.95,.95,.95,.95-.43,.95-.95-.43-.95-.95-.95h0Zm3.32,1.65H15.44c.36,0,.66-.31,.66-.7s-.3-.7-.66-.7H6.21c-.36,0-.66,.31-.66,.7s.3,.7,.66,.7Zm-3.32,2.79c-.52,0-.95,.43-.95,.95s.43,.95,.95,.95,.95-.43,.95-.95-.43-.95-.95-.95h0Zm12.55,.25H6.21c-.36,0-.66,.31-.66,.7s.3,.7,.66,.7H15.44c.36,0,.66-.31,.66-.7s-.3-.7-.66-.7h0ZM2.89,12.52c-.52,0-.95,.43-.95,.95s.43,.95,.95,.95,.95-.43,.95-.95-.43-.95-.95-.95Zm12.55,.25H6.21c-.36,0-.66,.31-.66,.7s.3,.7,.66,.7H15.44c.36,0,.66-.31,.66-.7s-.3-.7-.66-.7Z"/></g></g></g></g></svg>

projects/src/main/webapp/Screenpicture/screen_n/search.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12"><defs><style>.g{fill:#e0f1ff;fill-rule:evenodd;}</style></defs><g id="b"><g id="c"><g id="d"><g id="e"><path id="f" class="g" d="M5.35,10.37C2.37,10.37,0,8.07,0,5.19S2.37,0,5.35,0s5.35,2.3,5.35,5.19-2.37,5.19-5.35,5.19Zm0-1.48c2.14,0,3.82-1.63,3.82-3.7s-1.68-3.7-3.82-3.7S1.53,3.11,1.53,5.19s1.68,3.7,3.82,3.7Zm4.51,0l2.14,2.07-1.07,1.04-2.14-2.07,1.07-1.04Z"/></g></g></g></g></svg>

projects/src/main/webapp/Screenpicture/svgs/arrow_top.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 12.43"><defs><style>.d{fill:#fff;}.e{opacity:.1;}</style></defs><g id="b"><g id="c" class="e"><path class="d" d="M12,.5c.62,0,1.29,.38,2.17,1.22,.92,.89,9.02,8.77,9.1,8.85,.15,.15,.24,.35,.24,.56s-.08,.41-.24,.56c-.16,.15-.37,.24-.59,.24s-.44-.08-.59-.24L13.68,3.52c-.71-.69-1.13-1.1-1.68-1.1s-.96,.41-1.59,1.02C7.78,5.99,1.92,11.69,1.92,11.69c-.16,.15-.37,.24-.59,.24s-.44-.08-.59-.24c-.15-.15-.24-.35-.24-.56s.08-.41,.24-.56c0,0,7.84-7.63,9.1-8.85,.86-.83,1.54-1.22,2.16-1.22Z"/><path class="d" d="M22.67,11.43c.05,0,.16-.01,.24-.1,.07-.07,.09-.15,.09-.2s-.02-.13-.09-.2c-.08-.08-8.17-7.96-9.1-8.85-.77-.74-1.34-1.08-1.82-1.08s-1.05,.34-1.81,1.08C8.93,3.31,1.09,10.94,1.09,10.94c-.07,.07-.09,.15-.09,.2s.02,.13,.09,.2c.09,.08,.19,.1,.24,.1s.16-.01,.24-.1c0,0,5.86-5.7,8.48-8.25,.69-.68,1.2-1.16,1.94-1.16s1.26,.5,2.03,1.24l8.4,8.17c.09,.08,.19,.1,.24,.1m0,1c-.34,0-.68-.13-.94-.38,0,0-5.74-5.58-8.4-8.17-1.3-1.27-1.35-1.27-2.57-.08C8.13,6.35,2.27,12.05,2.27,12.05c-.52,.51-1.36,.51-1.88,0-.52-.51-.52-1.33,0-1.83C.39,10.22,8.23,2.59,9.49,1.37c1.88-1.83,3.15-1.81,5.02,0,.93,.9,9.1,8.85,9.1,8.85,.52,.51,.52,1.33,0,1.83-.26,.25-.6,.38-.94,.38Z"/></g></g></svg>

projects/src/main/webapp/Screenpicture/svgs/filter.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 63.97 63.96"><defs><style>.b{fill:#3885db;isolation:isolate;opacity:.7;}</style></defs><path class="b" d="M44.21,2.43c.82,.34,1.2,1.27,.87,2.09-.34,.82-1.27,1.2-2.09,.87C28.3-.69,11.47,6.29,5.4,20.98c-6.07,14.68,.91,31.51,15.59,37.58,14.68,6.07,31.51-.91,37.58-15.59,2.91-7.04,2.91-14.95,0-21.99-.34-.82,.05-1.75,.87-2.09,.82-.34,1.75,.05,2.09,.86,6.75,16.32-1,35.02-17.32,41.77-16.32,6.75-35.02-1-41.77-17.32C-4.31,27.88,3.44,9.18,19.76,2.43c7.83-3.24,16.62-3.24,24.45,0h0ZM17.56,32c0-.88,.71-1.59,1.59-1.6h25.62c.88,0,1.6,.72,1.6,1.6,0,.88-.72,1.6-1.6,1.6H19.15c-.88,0-1.59-.71-1.59-1.59,0,0,0,0,0,0h0Zm0-11.2c0-.88,.71-1.59,1.59-1.6h25.62c.88,0,1.6,.72,1.6,1.6,0,.88-.72,1.6-1.6,1.6H19.15c-.88,0-1.59-.71-1.59-1.59,0,0,0,0,0,0h0Zm0,22.4c0-.88,.71-1.59,1.59-1.6h25.62c.88,0,1.6,.72,1.6,1.6s-.72,1.6-1.6,1.6H19.15c-.88,0-1.59-.71-1.59-1.59,0,0,0,0,0,0h0Z"/></svg>

projects/src/main/webapp/Screenpicture/svgs/noinfo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="200" height="126.562" viewBox="0 0 200 126.562"><defs><style>.a{fill:#f5f5f5;}.b{fill:#d9d9d9;}.c{fill:#fafafa;}</style></defs><path class="a" d="M0,685.7c0,5.8,10.536,11.366,29.289,15.468s44.188,6.407,70.711,6.407,51.958-2.3,70.711-6.407S200,691.5,200,685.7s-10.536-11.366-29.289-15.468S126.52,663.819,100,663.819s-51.958,2.3-70.711,6.407S0,679.892,0,685.7Z" transform="translate(0 -581.009)"/><path class="b" d="M359.779,71.874H212.9V40.939L245.091,4.374A8.3,8.3,0,0,1,252.278,0H320.4a8.832,8.832,0,0,1,7.5,4.688l31.877,36.251ZM216.03,68.75H356.655V41.874L325.405,6.251c-1.563-2.188-3.127-3.438-5-3.438H252.275c-1.874,0-3.435,1.25-4.688,3.124L216.03,42.188Z" transform="translate(-186.344)"/><path class="c" d="M327.31,347.249c0-5,3.124-9.061,6.876-9.061h35v56.562c0,6.562-4.063,12.186-9.375,12.186h-125c-5,0-9.375-5.312-9.375-12.185V338.187h35c3.749,0,6.876,4.063,6.876,9.061s3.124,9.061,6.876,9.061h46.248C324.183,356.624,327.31,352.25,327.31,347.249Z" transform="translate(-197.313 -295.999)"/><path class="b" d="M348.84,397.529h-125c-5.937,0-10.939-6.248-10.939-13.749V325.654h36.565c4.688,0,8.437,4.688,8.437,10.625,0,4.063,2.5,7.5,5.312,7.5h46.251c2.81,0,5.31-3.435,5.31-7.5,0-5.937,3.749-10.625,8.439-10.625h36.562v58.123C359.779,391.278,355.091,397.529,348.84,397.529Zm-132.81-68.75v55c0,5.937,3.438,10.625,7.812,10.625h125c4.377,0,7.814-4.688,7.814-10.625v-55H323.217c-2.813,0-5.312,3.438-5.312,7.5,0,5.937-3.749,10.625-8.437,10.625H263.214c-4.688,0-8.437-4.688-8.437-10.625,0-4.063-2.5-7.812-5.312-7.812H216.03Z" transform="translate(-186.344 -285.029)"/></svg>

projects/src/main/webapp/Screenpicture/svgs/rank01.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="196" height="190" viewBox="0 0 196 190"><defs><style>.a{fill:url(#a);}.b{filter:url(#b);}</style><linearGradient id="a" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#ff6767"/><stop offset="0.089" stop-color="red"/><stop offset="0.724" stop-color="#9b0c0c"/><stop offset="0.936" stop-color="#b70909"/><stop offset="1" stop-color="#ea0d0d"/></linearGradient><filter id="b" x="0" y="0" width="196" height="190" filterUnits="userSpaceOnUse"><feOffset dx="6" input="SourceAlpha"/><feGaussianBlur result="c"/><feFlood flood-color="#fff19a"/><feComposite operator="in" in2="c"/><feComposite in="SourceGraphic"/></filter></defs><g class="b" transform="matrix(1, 0, 0, 1, 0, 0)"><path class="a" d="M1340.513,200,1280,295l60.513,95h-190V200Z" transform="translate(-1150.51 -200)"/></g></svg>

projects/src/main/webapp/Screenpicture/svgs/rank02.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="196" height="190" viewBox="0 0 196 190"><defs><style>.a{fill:url(#a);}.b{filter:url(#b);}</style><linearGradient id="a" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#ffbf67"/><stop offset="0.089" stop-color="#ff7f00"/><stop offset="0.724" stop-color="#9b380c"/><stop offset="0.936" stop-color="#b75309"/><stop offset="1" stop-color="#ea730d"/></linearGradient><filter id="b" x="0" y="0" width="196" height="190" filterUnits="userSpaceOnUse"><feOffset dx="6" input="SourceAlpha"/><feGaussianBlur result="c"/><feFlood flood-color="#fff19a"/><feComposite operator="in" in2="c"/><feComposite in="SourceGraphic"/></filter></defs><g class="b" transform="matrix(1, 0, 0, 1, 0, 0)"><path class="a" d="M1340.513,200,1280,295l60.513,95h-190V200Z" transform="translate(-1150.51 -200)"/></g></svg>

projects/src/main/webapp/Screenpicture/svgs/rank03.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="196" height="190" viewBox="0 0 196 190"><defs><style>.a{fill:url(#a);}.b{filter:url(#b);}</style><linearGradient id="a" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#67ffff"/><stop offset="0.089" stop-color="#00ebff"/><stop offset="0.724" stop-color="#0c969b"/><stop offset="0.936" stop-color="#09b7b7"/><stop offset="1" stop-color="#0deaea"/></linearGradient><filter id="b" x="0" y="0" width="196" height="190" filterUnits="userSpaceOnUse"><feOffset dx="6" input="SourceAlpha"/><feGaussianBlur result="c"/><feFlood flood-color="#fff19a"/><feComposite operator="in" in2="c"/><feComposite in="SourceGraphic"/></filter></defs><g class="b" transform="matrix(1, 0, 0, 1, 0, 0)"><path class="a" d="M1340.513,200,1280,295l60.513,95h-190V200Z" transform="translate(-1150.51 -200)"/></g></svg>

projects/src/main/webapp/Screenpicture/svgs/rank04.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="196" height="190" viewBox="0 0 196 190"><defs><style>.a{fill:url(#a);}.b{filter:url(#b);}</style><linearGradient id="a" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#1b55cc"/><stop offset="0.089" stop-color="#164499"/><stop offset="0.724" stop-color="#0b1f49"/><stop offset="0.936" stop-color="#0d3783"/><stop offset="1" stop-color="#0d3fa7"/></linearGradient><filter id="b" x="0" y="0" width="196" height="190" filterUnits="userSpaceOnUse"><feOffset dx="6" input="SourceAlpha"/><feGaussianBlur result="c"/><feFlood flood-color="#1b55cc"/><feComposite operator="in" in2="c"/><feComposite in="SourceGraphic"/></filter></defs><g class="b" transform="matrix(1, 0, 0, 1, 0, 0)"><path class="a" d="M1340.513,200,1280,295l60.513,95h-190V200Z" transform="translate(-1150.51 -200)"/></g></svg>

projects/src/main/webapp/Screenpicture/svgs/search.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40.02 40.01"><defs><style>.c{fill:#19254a;isolation:isolate;opacity:.6;}</style></defs><path id="b" class="c" d="M28.89,32.41c-7.94,6-19.25,4.42-25.25-3.52C-2.36,20.95-.78,9.64,7.16,3.64,15.11-2.36,26.41-.78,32.41,7.16c4.86,6.43,4.86,15.3,0,21.73l6.92,6.92c.95,.99,.91,2.57-.08,3.52-.96,.92-2.47,.92-3.44,0l-6.92-6.92Zm-10.86-.36c7.74,0,14.02-6.28,14.02-14.02s-6.28-14.02-14.02-14.02S4.01,10.28,4.01,18.03h0c0,7.74,6.27,14.02,14.01,14.02h0Z"/></svg>

projects/src/main/webapp/Screenpicture/svgs/title_bg.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="550" height="81" viewBox="0 0 550 81"><defs><style>.a,.b,.c,.d{fill:url(#a);}.b{opacity:0.799;}.c{opacity:0.604;}.d{opacity:0.404;}</style><linearGradient id="a" x2="1" gradientUnits="objectBoundingBox"><stop offset="0" stop-color="#46a4ff"/><stop offset="1" stop-color="#46a4ff" stop-opacity="0.102"/></linearGradient></defs><g transform="translate(-492 -189)"><path class="a" d="M-220,1,180,0l80,80-480,1" transform="translate(712 189)"/><path class="b" d="M180,10h20l70,70H250Z" transform="translate(732 190)"/><path class="c" d="M190,20h10l60,60H250Z" transform="translate(762 190)"/><path class="d" d="M200,30h10l50,50H250Z" transform="translate(782 190)"/></g></svg>

projects/src/main/webapp/Screenpicture/svgs/title_big_blue.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 192 160"><defs><style>.b{fill:#2b6ec6;}</style></defs><path class="b" d="M8,0H192V160H18c-4.42,0-8-3.58-8-8L0,8C0,3.58,3.58,0,8,0Z"/></svg>

projects/src/main/webapp/Screenpicture/svgs/title_big_orange.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 192 160"><defs><style>.b{fill:#ecc442;}</style></defs><path class="b" d="M8,0H192V160H18c-4.42,0-8-3.58-8-8L0,8C0,3.58,3.58,0,8,0Z"/></svg>

projects/src/main/webapp/Screenpicture/svgs/title_blue.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 89"><defs><style>.b{fill:#2b6ec6;}</style></defs><path class="b" d="M8,0H160V89H18c-4.42,0-8-3.99-8-8.9L0,8.9C0,3.98,3.58,0,8,0Z"/></svg>

projects/src/main/webapp/Screenpicture/svgs/title_orange.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 89"><defs><style>.b{fill:#ecc442;}</style></defs><path class="b" d="M8,0H160V89H18c-4.42,0-8-3.99-8-8.9L0,8.9C0,3.98,3.58,0,8,0Z"/></svg>