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

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

@@ -84,4 +84,10 @@ public interface SubInfoMapper {
     Long queryExceed();
 
     Long queryNotExceed();
+
+    Long queryExceedWithin();
+
+    Long queryExceedOutside();
+
+    List<WorkBenchVO> queryWarningStatistics();
 }

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

@@ -601,6 +601,7 @@
             AND sub_info.amt_total <= #{queryVO.endAmt}
         </if>
     </select>
+    <!--预警-->
     <select id="queryWarning" resultType="java.lang.Long">
         SELECT SUM(counts)
         FROM (
@@ -609,8 +610,8 @@
         FROM sub_info
         WHERE cb_status = 3
         AND qy_date IS NOT NULL
-        AND DATE_ADD(qy_date, INTERVAL cb_num DAY) &lt; NOW()
-        AND DATE_ADD(qy_date, INTERVAL cb_num DAY) > DATE_SUB(NOW(), INTERVAL 3 DAY)
+        AND DATE_ADD(qy_date, INTERVAL cb_num DAY) > NOW()
+        AND DATE_ADD(qy_date, INTERVAL cb_num DAY) &lt; DATE_ADD(NOW(), INTERVAL 3 DAY)
         AND `status` = 1
 
         UNION ALL
@@ -618,8 +619,8 @@
         -- 新建未转在建预警
         SELECT COUNT(*) AS counts
         FROM sub_info
-        WHERE DATE_ADD(begin_date, INTERVAL xj_num DAY) &lt; NOW()
-        AND DATE_ADD(begin_date, INTERVAL xj_num DAY) > DATE_SUB(NOW(), INTERVAL 3 DAY)
+        WHERE begin_date > NOW()
+        AND begin_date &lt; DATE_ADD(NOW(), INTERVAL 3 DAY)
         AND `status` = 2
 
         UNION ALL
@@ -627,8 +628,8 @@
         -- 在建未转投产预警
         SELECT COUNT(*) AS counts
         FROM sub_info
-        WHERE DATE_ADD(end_date, INTERVAL xj_num DAY) &lt; NOW()
-        AND DATE_ADD(end_date, INTERVAL xj_num DAY) > DATE_SUB(NOW(), INTERVAL 3 DAY)
+        WHERE end_date > NOW()
+        AND end_date &lt; DATE_ADD(NOW(), INTERVAL 3 DAY)
         AND `status` = 3
 
         UNION ALL
@@ -636,11 +637,12 @@
         -- 投产未入规预警
         SELECT COUNT(*) AS counts
         FROM sub_info
-        WHERE DATE_ADD(rt_date, INTERVAL xj_num DAY) &lt; NOW()
-        AND DATE_ADD(rt_date, INTERVAL xj_num DAY) > DATE_SUB(NOW(), INTERVAL 3 DAY)
+        WHERE rt_date > NOW()
+        AND rt_date &lt; DATE_ADD(NOW(), INTERVAL 3 DAY)
         AND `status` = 9
         ) AS combined_counts;
     </select>
+    <!-- 超期 -->
     <select id="queryExceed" resultType="java.lang.Long">
         SELECT SUM(counts) AS total_count
         FROM (
@@ -649,7 +651,7 @@
                  FROM sub_info
                  WHERE cb_status = 3
                    AND qy_date IS NOT NULL
-                   AND DATE_ADD(qy_date, INTERVAL cb_num DAY) > NOW()
+                   AND DATE_ADD(qy_date, INTERVAL cb_num DAY) &lt; NOW()
                    AND `status` = 1
 
                  UNION ALL
@@ -658,7 +660,7 @@
                  SELECT COUNT(*) AS counts
                  FROM sub_info
                  WHERE
-                       DATE_ADD(begin_date, INTERVAL xj_num DAY) > NOW()
+                     begin_date  &lt;  NOW()
                    AND `status` = 2
 
                  UNION ALL
@@ -666,7 +668,7 @@
                  -- 在建未转投产
                  SELECT COUNT(*) AS counts
                  FROM sub_info
-                 WHERE DATE_ADD(end_date, INTERVAL xj_num DAY) > NOW()
+                 WHERE end_date  &lt;  NOW()
                    AND `status` = 3
 
                  UNION ALL
@@ -674,10 +676,11 @@
                  -- 投产未入规
                  SELECT COUNT(*) AS counts
                  FROM sub_info
-                 WHERE DATE_ADD(rt_date, INTERVAL xj_num DAY) > NOW()
+                 WHERE rt_date  &lt;  NOW()
                    AND `status` = 9
              ) AS combined_counts;
     </select>
+    <!-- 绿灯 未超期-->
     <select id="queryNotExceed" resultType="java.lang.Long">
         SELECT SUM(counts) AS total_count
         FROM (
@@ -686,7 +689,7 @@
         FROM sub_info
         WHERE cb_status = 3
         AND qy_date IS NOT NULL
-        AND DATE_ADD(qy_date, INTERVAL cb_num DAY) &lt; DATE_SUB(NOW(), INTERVAL 3 DAY)
+        AND DATE_ADD(qy_date, INTERVAL cb_num DAY) > NOW()
         AND `status` = 1
 
         UNION ALL
@@ -695,7 +698,7 @@
         SELECT COUNT(*) AS counts
         FROM sub_info
         WHERE
-         DATE_ADD(begin_date, INTERVAL xj_num DAY) &lt; DATE_SUB(NOW(), INTERVAL 3 DAY)
+            begin_date > NOW()
         AND `status` = 2
 
         UNION ALL
@@ -704,7 +707,7 @@
         SELECT COUNT(*) AS counts
         FROM sub_info
         WHERE
-         DATE_ADD(end_date, INTERVAL xj_num DAY) &lt; DATE_SUB(NOW(), INTERVAL 3 DAY)
+            end_date > NOW()
         AND `status` = 3
 
         UNION ALL
@@ -713,8 +716,104 @@
         SELECT COUNT(*) AS counts
         FROM sub_info
         WHERE
-         DATE_ADD(rt_date, INTERVAL xj_num DAY) &lt; DATE_SUB(NOW(), INTERVAL 3 DAY)
+            rt_date > NOW()
         AND `status` = 9
         ) AS combined_counts;
     </select>
+    <!-- 黄灯 -->
+    <select id="queryExceedWithin" resultType="java.lang.Long">
+        SELECT SUM(counts) AS total_count
+        FROM (
+                 -- 已签约(未转新建)
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE cb_status = 3
+                   AND qy_date IS NOT NULL
+                   AND DATE_ADD(qy_date, INTERVAL cb_num DAY) > DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND DATE_ADD(qy_date, INTERVAL cb_num DAY) &lt; NOW()
+                   AND `status` = 1
+
+                 UNION ALL
+
+                 -- 新建未转在建
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE
+                     begin_date > DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND begin_date &lt; NOW()
+                   AND `status` = 2
+
+                 UNION ALL
+
+                 -- 在建未转投产
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE
+                     end_date > DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND end_date &lt; NOW()
+                   AND `status` = 3
+
+                 UNION ALL
+
+                 -- 投产未入规
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE
+                       rt_date > DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND rt_date &lt; NOW()
+                   AND `status` = 9
+             ) AS combined_counts;
+    </select>
+    <!-- 红灯 -->
+    <select id="queryExceedOutside" resultType="java.lang.Long">
+        SELECT SUM(counts) AS total_count
+        FROM (
+                 -- 已签约(未转新建)
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE cb_status = 3
+                   AND qy_date IS NOT NULL
+                   AND DATE_ADD(qy_date, INTERVAL cb_num DAY) &lt; DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND `status` = 1
+
+                 UNION ALL
+
+                 -- 新建未转在建
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE
+                     begin_date &lt; DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND `status` = 2
+
+                 UNION ALL
+
+                 -- 在建未转投产
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE end_date &lt; DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND `status` = 3
+
+                 UNION ALL
+
+                 -- 投产未入规
+                 SELECT COUNT(*) AS counts
+                 FROM sub_info
+                 WHERE rt_date &lt; DATE_SUB(NOW(), INTERVAL 3 DAY)
+                   AND `status` = 9
+             ) AS combined_counts;
+    </select>
+    <select id="queryWarningStatistics" resultType="com.rtrh.projects.modules.projects.vo.WorkBenchVO">
+        SELECT
+            id,
+            STATUS,
+            cb_status cbStatus,
+            qy_date qyDate,
+            begin_date beginDate,
+            end_date endDate,
+            rt_date rtDate
+        FROM
+            sub_info
+        WHERE
+            logic_delete_flag = 0
+    </select>
 </mapper>

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

@@ -265,12 +265,14 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
         List<SubInfoGxj> data = this.queryAll(loginUser, queryVO);
         data.forEach(e -> {
             if (StringUtils.isNotBlank(e.getContent())) {
-                int maxLength = Math.min(e.getContent().length(), 100);
-                e.setContent(e.getContent().substring(0, maxLength) + "...");
+                int maxLength = Math.min(e.getContent().length(), 48);
+                String content = e.getContent().substring(0, maxLength);
+                e.setContent(content.length()>=48? content + "..." : content);
             }
             if (StringUtils.isNotBlank(e.getProgress())) {
-                int maxLength = Math.min(e.getProgress().length(), 100);
-                e.setProgress(e.getProgress().substring(0, maxLength) + "...");
+                int maxLength = Math.min(e.getProgress().length(), 48);
+                String progress = e.getProgress().substring(0, maxLength);
+                e.setProgress(progress.length()>=48? progress + "..." : progress);
             }
         });
         PageInfo<SubInfoGxj> pageInfo = new PageInfo<>(data);

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

@@ -9,10 +9,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.rtrh.projects.modules.projects.enums.SubInfoCbStatusEnum;
 import com.rtrh.projects.modules.projects.enums.SubInfoStatusEnum;
 import com.rtrh.projects.modules.projects.mapper.SubInfoMapper;
 import com.rtrh.projects.modules.projects.po.SubInfoGxj;
 import com.rtrh.projects.modules.projects.vo.SubInfoQueryTzVO;
+import com.rtrh.projects.modules.projects.vo.WorkBenchVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -108,13 +112,21 @@ public class WorkBenchServiceImpl implements WorkBenchService {
 	@Override
 	public Map<String, Object> statisticData() {
 		Map<String, Object> map = new HashMap<>();
-		// 预警数
+		// 预警 提前3天内
 		Long warningNum = subInfoMapper.queryWarning();
+		// 超期 进度红灯
 		Long exceedNum = subInfoMapper.queryExceed();
+		// 未超期绿灯
 		Long notExceedNum = subInfoMapper.queryNotExceed();
+		// 黄灯超期3天内
+		Long withinNum = subInfoMapper.queryExceedWithin();
+		// 红灯超期超过3天
+		Long outsideNum = subInfoMapper.queryExceedOutside();
 		map.put("warningNum", warningNum);
 		map.put("exceedNum", exceedNum);
 		map.put("notExceedNum", notExceedNum);
+		map.put("withinNum", withinNum);
+		map.put("outsideNum", outsideNum);
 		return map;
 	}
 

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

@@ -0,0 +1,44 @@
+package com.rtrh.projects.modules.projects.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Setter
+@Getter
+@Accessors(chain = true)
+public class WorkBenchVO {
+    private String id;
+
+    private String status;
+    private String cbStatus;
+
+    // 签约日期
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date qyDate;
+
+    // 开始计划日期
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date beginDate;
+
+    // 计划投产日期
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date endDate;
+
+    // 计划申规入统时间
+    @JsonFormat(pattern="yyyy-MM-dd",timezone="GMT+8")
+    private Date rtDate;
+
+
+    // 储备转新建周期
+    private Integer cbNum;
+
+    // 新建转在建周期
+    private Integer xjNum;
+
+    // 在建转投产周期
+    private Integer zjNum;
+}

projects/pom.xml

@@ -530,7 +530,11 @@
 			<scope>test</scope>
 		</dependency>
 		<!-- 测试依赖结束 -->
-
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpclient</artifactId>
+			<version>4.5.13</version> <!-- 请使用最新版本 -->
+		</dependency>
 	</dependencies>
 
 

projects/src/main/java/com/rtrh/projects/outapi/controller/AuthApiController.java

@@ -6,12 +6,12 @@ import java.util.Objects;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.rtrh.projects.modules.rolemeun.dao.SecRoleMeunDao;
 import com.rtrh.projects.modules.rolemeun.po.SecRole;
+import com.rtrh.projects.modules.rolemeun.po.SecRoleMeun;
+import com.rtrh.projects.web.util.JwtUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.rtrh.common.modules.vcode.VCodeManager;
 import com.rtrh.common.modules.vcode.exception.VCodeFailException;
@@ -105,6 +105,53 @@ public class AuthApiController extends BaseOutApiController {
 		return result;
 	}
 
+	/**
+	 * 工信局切换发改委登录验证
+	 * @return
+	 */
+	@TokenAuthenticate(AuthenticateType.NONE)
+	@GetMapping("gxjLogin")
+	public JsonResult gxjLogin(@RequestParam String token) {
+		JsonResult result = new JsonResult();
+		try {
+			//对token进行解密得到用户名
+			String username = JwtUtil.validateToken(token);
+			CommUser commUser = commUserService.findCommUserByLoginname(username);
+			if(null == commUser){
+				result.setCode(ResultCode.LOGIN_FAIL);
+			}
+			if(CommUserChecker.isDisabledUser(commUser)){
+				result.setCode(ResultCode.ACCOUNT_DISABLE);
+			}
+			SecUser user = secUserService.getById(commUser.getId());
+			String tokenApp = jwtUtils.createToken(user);
+			result.setData("token",tokenApp);
+
+			Boolean isLead=user.getIsLead()==null?false:user.getIsLead();
+
+			String roleCode="";
+			SecRole role=secRoleservice.getById(user.getKind());
+			if(null!=role){
+				roleCode=role.getCode();
+				result.setData("roleCode",roleCode);
+				if(roleCode.equals("001")){
+					result.setData("kind","2");
+					return result;
+				}
+			}
+			if (isLead&&"1".equals(user.getKindUnit())){
+				result.setData("kind","3");
+			}else{
+				result.setData("kind",user.getKindUnit());
+			}
+
+		} catch (Exception e) {
+			logger.error("", e);
+			result.setCode(ResultCode.SYSTEM_ERROR, e.getMessage());
+		}
+		return result;
+	}
+
 	@TokenAuthenticate
 	@PostMapping("outLogin")
 	public JsonResult outLogin() {

projects/src/main/java/com/rtrh/projects/outapi/result/JsonResult.java

@@ -5,9 +5,11 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.rtrh.projects.web.util.ResultCodeDeserializer;
 
 public class JsonResult {
-
+	@JSONField(deserializeUsing = ResultCodeDeserializer.class)
 	private Integer code = ResultCode.SUCCESS.getCode();
 	
 	private String msg = "";

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

@@ -1,34 +1,70 @@
 package com.rtrh.projects.web.controller.passport.api;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.rtrh.projects.outapi.result.JsonResult;
 import com.rtrh.projects.web.controller.BaseController;
 import com.rtrh.projects.web.util.JwtUtil;
 import com.team.security.TeamShiroUser;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.ResourceBundle;
 
 @RestController
-@RequestMapping("/switch")
+@RequestMapping("/app/switch")
 public class SwitchApiController extends BaseController {
 
     /**
      * 切换到发改委系统
+     *
      * @param request
      * @return
      */
-    @GetMapping("/toFgw")
-    public String switchToFgw(HttpServletRequest request) {
-
-        //获取当前用户信息
+    @PostMapping("/toFgw")
+    public Object switchToFgw() {
+        // 获取当前用户信息
         TeamShiroUser curUser = getCurUser();
-        //使用jwt生成token
+        // 使用jwt生成token
         String token = JwtUtil.generateToken(curUser.getLoginName());
-
+        if (token == null || token.isEmpty()) {
+            // 处理token生成失败的情况
+            throw new RuntimeException("token生成失败"); // 或者抛出异常，由全局异常处理器处理
+        }
+        ResourceBundle resourceBundle = ResourceBundle.getBundle("config");
+        String url = resourceBundle.getString("app.fgw.url");
         // 拼接 B 系统的 URL
-        String targetUrl = "http://localhost:8090/projects/api/login?token=" + token;
-        return "redirect:" + targetUrl;
+        // 获取B系统的登录token
+        String targetUrl = url+"/projects/outApi/auth/fgwLogin?token=" + token;
+
+        // 创建一个HttpClient实例
+        // 创建一个HttpClient实例
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            // 创建一个HttpGet请求
+            HttpGet request = new HttpGet(targetUrl);
+            // 发送请求并获取响应
+            try (CloseableHttpResponse response = httpClient.execute(request)) {
+                // 获取响应实体
+                HttpEntity entity = response.getEntity();
+                // 如果响应实体不为空，则输出响应内容
+                if (entity != null) {
+                    String responseBody = EntityUtils.toString(entity);
+                    System.out.println("Response body: " + responseBody);
+                    JsonResult result = JSONObject.parseObject(responseBody, JsonResult.class);
+                    result.setMsg(url);
+                    return result;
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
     }
 
 }

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

@@ -40,9 +40,11 @@ import com.rtrh.projects.modules.projects.vo.export.*;
 import com.rtrh.projects.modules.system.service.ISubInduService;
 import com.rtrh.projects.modules.utils.CustomCellWriteWidthStrategy;
 import com.rtrh.projects.modules.utils.DateUtils;
-import com.rtrh.projects.modules.utils.QualificationsDeclareCellWriteHandler;
 import com.rtrh.projects.modules.utils.MyStringUtils;
+import com.rtrh.projects.modules.utils.QualificationsDeclareCellWriteHandler;
+//import com.rtrh.projects.modules.utils.StringUtils;
 import com.rtrh.projects.outapi.result.JsonResult;
+import com.rtrh.projects.web.util.ExcelStyleUtil;
 import com.rtrh.projects.web.util.SheetData;
 import com.rtrh.projects.web.util.SheetHead;
 import org.apache.commons.lang3.StringUtils;
@@ -874,16 +876,24 @@ public class SubInfoExportController extends BaseController {
         Map<String, String> hyDictMap = subInduService.queryParentAll().stream().collect(Collectors.toMap(SubIndu::getCode, SubIndu::getTitle));
         // 按行业分组
         Map<String, List<SubInfoGxj>> groupMap = list.stream()
-                .collect(Collectors.groupingBy(e -> StringUtils.defaultIfBlank(e.getIndusKind(), "未知行业")));
+                .collect(Collectors.groupingBy(e -> {
+                    if (StringUtils.isNotBlank(e.getIndusKind())){
+                        return e.getIndusKind().substring(0, 2);
+                    }
+                    return "未知行业";
+                }));
         Workbook workbook;
         if (SubInfoStatusEnum.CB.getCode().equals(queryVO.getStatus())) {
             ExportParams exportParams = new ExportParams("“四个一批”工业项目表（储备项目库）", "储备项目库", ExcelType.XSSF);
+            exportParams.setStyle(ExcelStyleUtil.class);
             exportDetail(response, exportParams, SubInfoCbVO.class, list, hyDictMap, groupMap);
         }else if (SubInfoStatusEnum.XJ.getCode().equals(queryVO.getStatus())){
             ExportParams exportParams = new ExportParams("“四个一批”工业项目表（新建项目库）","新建项目库",ExcelType.XSSF);
+            exportParams.setStyle(ExcelStyleUtil.class);
             exportDetail(response, exportParams, SubInfoXjVO.class, list, hyDictMap, groupMap);
         }else if (SubInfoStatusEnum.ZJ.getCode().equals(queryVO.getStatus())){
             ExportParams exportParams = new ExportParams("“四个一批”工业项目表（在建项目库）","在建项目库",ExcelType.XSSF);
+            exportParams.setStyle(ExcelStyleUtil.class);
             exportDetail(response, exportParams, SubInfoZjVO.class, list, hyDictMap, groupMap);
         }else if(SubInfoStatusEnum.TC.getCode().equals(queryVO.getStatus())) {
             List<SubInfoTcVO> exportList = new ArrayList<>();
@@ -918,6 +928,8 @@ public class SubInfoExportController extends BaseController {
                 index++;
             }
             ExportParams exportParams = new ExportParams("“四个一批”工业项目表（投产项目库）","投产项目库",ExcelType.XSSF);
+            exportParams.setStyle(ExcelStyleUtil.class);
+            // 设置默认样式（这里设置所有单元格都有边框）
             workbook = ExcelExportUtil.exportExcel(exportParams, SubInfoTcVO.class, exportList);
             extracted(response, list, workbook, allSize);
         }else {
@@ -952,6 +964,7 @@ public class SubInfoExportController extends BaseController {
                 index++;
             }
             ExportParams exportParams = new ExportParams("“四个一批”工业项目表（项目总库）", "项目总库", ExcelType.XSSF);
+            exportParams.setStyle(ExcelStyleUtil.class);
             workbook = ExcelExportUtil.exportExcel(exportParams, SubInfoZkVO.class, exportList);
             // workbook = ExcelExportUtil.exportBigExcel(exportParams, SubInfoZkVO.class, new IExcelExportServer() {
             //     /**
@@ -1071,6 +1084,15 @@ public class SubInfoExportController extends BaseController {
         cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
         return cellStyle;
     }
+    private static CellStyle createBorderStyle(Workbook workbook) {
+        CellStyle cellStyle = workbook.createCellStyle();
+        cellStyle.setBorderBottom(BorderStyle.THIN);   // 下边框
+        cellStyle.setBorderLeft(BorderStyle.THIN);     // 左边框
+        cellStyle.setBorderTop(BorderStyle.THIN);      // 上边框
+        cellStyle.setBorderRight(BorderStyle.THIN);    // 右边框
+        return cellStyle;
+    }
+
 
     private ExcelExportEntity getExcelExportEntity(String name, Object key, int width) {
         ExcelExportEntity excelExportEntity = new ExcelExportEntity(name, key, width);
@@ -1133,6 +1155,7 @@ public class SubInfoExportController extends BaseController {
 
             // 3.导出
             ExportParams exportParams = new ExportParams("哈密市“四个一批”工业项目库总体情况", "项目库总体情况", ExcelType.XSSF);
+            exportParams.setStyle(ExcelStyleUtil.class);
             Workbook workbook = ExcelExportUtil.exportExcel(exportParams, entityList, dataList);
             response.setContentType("application/xlsx;charset=utf-8");
             response.setHeader("Content-Disposition", "attachment; filename=" + URLEncodeUtil.encode("项目库总体情况") + System.currentTimeMillis() + ".xlsx");
@@ -1222,6 +1245,7 @@ public class SubInfoExportController extends BaseController {
                 exportData.add(new SubInfoTotalInfoVO("合计", "合计", list.size(), reduce.divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP)));
                 // 4.导出
                 ExportParams exportParams = new ExportParams("项目库基本情况","项目库基本情况", ExcelType.XSSF);
+                exportParams.setStyle(ExcelStyleUtil.class);
                 int mergeTotalStartRow = exportData.size() + 1;
                 Workbook workbook = ExcelExportUtil.exportExcel(exportParams, SubInfoTotalInfoVO.class, exportData);
                 response.setContentType("application/xlsx;charset=utf-8");

projects/src/main/java/com/rtrh/projects/web/util/ExcelStyleUtil.java

@@ -0,0 +1,176 @@
+package com.rtrh.projects.web.util;
+
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
+import cn.afterturn.easypoi.excel.entity.params.ExcelForEachParams;
+import cn.afterturn.easypoi.excel.export.styler.IExcelExportStyler;
+import org.apache.poi.ss.usermodel.*;
+
+public class ExcelStyleUtil implements IExcelExportStyler {
+    private static final short STRING_FORMAT = (short) BuiltinFormats.getBuiltinFormat("TEXT");
+    private static final short FONT_SIZE_TEN = 9;
+    private static final short FONT_SIZE_ELEVEN = 10;
+    private static final short FONT_SIZE_TWELVE = 10;
+    /**
+     * 大标题样式
+     */
+    private CellStyle headerStyle;
+    /**
+     * 每列标题样式
+     */
+    private CellStyle titleStyle;
+    /**
+     * 数据行样式
+     */
+    private CellStyle styles;
+
+    public ExcelStyleUtil(Workbook workbook) {
+        this.init(workbook);
+    }
+
+    /**
+     * 初始化样式
+     *
+     * @param workbook
+     */
+    private void init(Workbook workbook) {
+        this.headerStyle = initHeaderStyle(workbook);
+        this.titleStyle = initTitleStyle(workbook);
+        this.styles = initStyles(workbook);
+    }
+
+    /**
+     * 大标题样式
+     *
+     * @param color
+     * @return
+     */
+    @Override
+    public CellStyle getHeaderStyle(short color) {
+        return headerStyle;
+    }
+
+    /**
+     * 每列标题样式
+     *
+     * @param color
+     * @return
+     */
+    @Override
+    public CellStyle getTitleStyle(short color) {
+        return titleStyle;
+    }
+
+    /**
+     * 数据行样式
+     *
+     * @param parity 可以用来表示奇偶行
+     * @param entity 数据内容
+     * @return 样式
+     */
+    @Override
+    public CellStyle getStyles(boolean parity, ExcelExportEntity entity) {
+        return styles;
+    }
+
+    /**
+     * 获取样式方法
+     *
+     * @param dataRow 数据行
+     * @param obj     对象
+     * @param data    数据
+     */
+    @Override
+    public CellStyle getStyles(Cell cell, int dataRow, ExcelExportEntity entity, Object obj, Object data) {
+        return getStyles(true, entity);
+    }
+
+    /**
+     * 模板使用的样式设置
+     */
+    @Override
+    public CellStyle getTemplateStyles(boolean isSingle, ExcelForEachParams excelForEachParams) {
+        return null;
+    }
+
+    /**
+     * 初始化--大标题样式
+     *
+     * @param workbook
+     * @return
+     */
+    private CellStyle initHeaderStyle(Workbook workbook) {
+        CellStyle style = getBaseCellStyle(workbook);
+        style.setFont(getFont(workbook, FONT_SIZE_TWELVE, true));
+        return style;
+    }
+
+    /**
+     * 初始化--每列标题样式
+     *
+     * @param workbook
+     * @return
+     */
+    private CellStyle initTitleStyle(Workbook workbook) {
+        CellStyle style = getBaseCellStyle(workbook);
+        style.setFont(getFont(workbook, FONT_SIZE_ELEVEN, false));
+        //背景色
+        style.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        return style;
+    }
+
+    /**
+     * 初始化--数据行样式
+     *
+     * @param workbook
+     * @return
+     */
+    private CellStyle initStyles(Workbook workbook) {
+        CellStyle style = getBaseCellStyle(workbook);
+        style.setFont(getFont(workbook, FONT_SIZE_TEN, false));
+        style.setDataFormat(STRING_FORMAT);
+        return style;
+    }
+
+    /**
+     * 基础样式
+     *
+     * @return
+     */
+    private CellStyle getBaseCellStyle(Workbook workbook) {
+        CellStyle style = workbook.createCellStyle();
+        //下边框
+        style.setBorderBottom(BorderStyle.THIN);
+        //左边框
+        style.setBorderLeft(BorderStyle.THIN);
+        //上边框
+        style.setBorderTop(BorderStyle.THIN);
+        //右边框
+        style.setBorderRight(BorderStyle.THIN);
+        //水平居中
+        style.setAlignment(HorizontalAlignment.CENTER);
+        //上下居中
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        //设置自动换行
+        style.setWrapText(true);
+        return style;
+    }
+
+    /**
+     * 字体样式
+     *
+     * @param size   字体大小
+     * @param isBold 是否加粗
+     * @return
+     */
+    private Font getFont(Workbook workbook, short size, boolean isBold) {
+        Font font = workbook.createFont();
+        //字体样式
+        font.setFontName("宋体");
+        //是否加粗
+        font.setBold(isBold);
+        //字体大小
+        font.setFontHeightInPoints(size);
+        return font;
+    }
+}

projects/src/main/java/com/rtrh/projects/web/util/JwtUtil.java

@@ -5,7 +5,7 @@ import io.jsonwebtoken.SignatureAlgorithm;
 import java.util.Date;
 
 public class JwtUtil {
-    private static final String SECRET_KEY = "yourSecretKey";
+    private static final String SECRET_KEY = "cereshuzhitingnizhenbangcereshuzhitingnizhenbang";
 
     public static String generateToken(String username) {
         return Jwts.builder()

projects/src/main/java/com/rtrh/projects/web/util/ResultCodeDeserializer.java

@@ -0,0 +1,24 @@
+package com.rtrh.projects.web.util;
+
+import com.alibaba.fastjson.parser.DefaultJSONParser;
+import com.alibaba.fastjson.parser.deserializer.ObjectDeserializer;
+import com.rtrh.projects.outapi.result.ResultCode;
+import java.lang.reflect.Type;
+
+public class ResultCodeDeserializer implements ObjectDeserializer {
+    @Override
+    public <T> T deserialze(DefaultJSONParser parser, Type type, Object fieldName) {
+        int code = parser.parseObject(Integer.class); // 从 JSON 中解析整数
+        for (ResultCode resultCode : ResultCode.values()) {
+            if (resultCode.getCode() == code) {
+                return (T) resultCode; // 返回匹配的枚举常量
+            }
+        }
+        throw new IllegalArgumentException("Unknown result code: " + code); // 如果没有匹配的枚举常量，则抛出异常
+    }
+
+    @Override
+    public int getFastMatchToken() {
+        return 0; // 通常不需要重写这个方法，除非你知道你在做什么
+    }
+}

projects/src/main/resources/config.properties

@@ -1,2 +1,4 @@
 flow_vedio_path=/home/data/file/flew_hami.mp4
-flow_img_path=/home/data/file/flow.svg
+flow_img_path=/home/data/file/flow.svg
+
+app.fgw.url=http://localhost:8089

projects/src/main/resources/dbconfig.properties

@@ -18,6 +18,6 @@ jdbc.password=Chaoliu@0917!@#
 
 #\u4ECE\u6570\u636E\u6E90\uFF0C\u5728mybatis\u67E5\u8BE2\u7684\u65B9\u6CD5\u4E0A\u6DFB\u52A0\u6CE8\u89E3@TargetDataSource("secondary")\u5219\u4F7F\u7528\u8BE5\u6570\u636E\u6E90\u8FDB\u884C\u67E5\u8BE2
 jdbc.secondary.driver=com.mysql.jdbc.Driver
-jdbc.secondary.url=jdbc:mysql://139.155.7.62:3306/subject_old?useUnicode=true&useSSL=false&characterEncoding=UTF-8&autoReconnect=true
+jdbc.secondary.url=jdbc:mysql://139.155.7.62:3306/subject?useUnicode=true&useSSL=false&characterEncoding=UTF-8&autoReconnect=true
 jdbc.secondary.username=root
 jdbc.secondary.password=Chaoliu@0917!@#

projects/src/main/webapp/vmodules/problem/info/preInfo.jsp

@@ -30,6 +30,8 @@
         <!-- 内容区域 -->
         <div class="right_title">
             <div class="tab-group">
+                <button class="btn btn1" :class="{active: tabActive === 1}" @click="onChangeActive(1)">储备转新建超期
+                    <span class="button-card" @click="ct('','','','','1')">{{preWarnNum}}</span></button>
                 <button class="btn btn1" :class="{active: tabActive === 1}" @click="onChangeActive(1)">前期手续办理超期
                     <span class="button-card" @click="ct('','','','','1')">{{preWarnNum}}</span></button>
                 <button class="btn btn2" :class="{active: tabActive === 3}" @click="onChangeActive(3)">项目开工超期

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

@@ -1208,4 +1208,5 @@
 
 </script>
 </body>
+
 </html>

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

@@ -239,31 +239,31 @@
                     <div class="layui-row">
                         <h2 style="width: 80%;background-color: #EDE9EC;margin-bottom: 20px;margin-top: 20px">资金信息</h2>
                     </div>
-                    <div class="layui-row">
-                        <div class="layui-col-xs6 layui-col-sm6">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label required"
-                                >投资类型</label>
-                                <div class="layui-input-block">
-                                    <select lay-verify="required" lay-filter="kindNature" v-model="subInfo.kindNature">
-                                        <option value="">请选择</option>
-                                        <c:forEach items="${TZXZ }" var="tz">
-                                            <option value="${tz.code }">${tz.title }</option>
-                                        </c:forEach>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                        <%--                        <div class="layui-col-xs6 layui-col-sm6" style="display: none;">
-                                                    <div class="layui-form-item">
-                                                        <label class="layui-form-label required" >年度计划投资金额(万元)</label>
-                                                        <div class="layui-input-block">
-                                                            <input type="number" placeholder="请输入" autocomplete="off" class="layui-input"
-                                                                   v-model="subInfo.amtYear">
-                                                        </div>
-                                                    </div>
-                                                </div>--%>
-                    </div>
+<%--                    <div class="layui-row">--%>
+<%--                        <div class="layui-col-xs6 layui-col-sm6">--%>
+<%--                            <div class="layui-form-item">--%>
+<%--                                <label class="layui-form-label required"--%>
+<%--                                >投资类型</label>--%>
+<%--                                <div class="layui-input-block">--%>
+<%--                                    <select lay-verify="required" lay-filter="kindNature" v-model="subInfo.kindNature">--%>
+<%--                                        <option value="">请选择</option>--%>
+<%--                                        <c:forEach items="${TZXZ }" var="tz">--%>
+<%--                                            <option value="${tz.code }">${tz.title }</option>--%>
+<%--                                        </c:forEach>--%>
+<%--                                    </select>--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+<%--                        &lt;%&ndash;                        <div class="layui-col-xs6 layui-col-sm6" style="display: none;">--%>
+<%--                                                    <div class="layui-form-item">--%>
+<%--                                                        <label class="layui-form-label required" >年度计划投资金额(万元)</label>--%>
+<%--                                                        <div class="layui-input-block">--%>
+<%--                                                            <input type="number" placeholder="请输入" autocomplete="off" class="layui-input"--%>
+<%--                                                                   v-model="subInfo.amtYear">--%>
+<%--                                                        </div>--%>
+<%--                                                    </div>--%>
+<%--                                                </div>&ndash;%&gt;--%>
+<%--                    </div>--%>
                     <%--                    <div class="layui-row">
                                             <div class="layui-col-xs6 layui-col-sm6">
                                                 <div class="layui-form-item">
@@ -436,6 +436,7 @@
                                         <option value="A">A类</option>
                                         <option value="B">B类</option>
                                         <option value="C">C类</option>
+                                        <option value="D">D类</option>
                                     </select>
                                 </div>
                             </div>
@@ -482,30 +483,30 @@
                             </div>
                         </div>
                     </div>
-                    <div class="layui-row">
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">新建转在建周期</label>
-                                <div class="layui-input-block">
-                                    <input type="number" name="xjNum" id="xjNum" placeholder="请输入"
-                                           autocomplete="off"  class="layui-input"
-                                           v-model="subInfo.xjNum">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="layui-row">
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">在建转投产周期</label>
-                                <div class="layui-input-block">
-                                    <input type="number" name="zjNum" id="zjNum" placeholder="请输入"
-                                           autocomplete="off" class="layui-input"
-                                           v-model="subInfo.zjNum">
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+<%--                    <div class="layui-row">--%>
+<%--                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">--%>
+<%--                            <div class="layui-form-item">--%>
+<%--                                <label class="layui-form-label">新建转在建周期</label>--%>
+<%--                                <div class="layui-input-block">--%>
+<%--                                    <input type="number" name="xjNum" id="xjNum" placeholder="请输入"--%>
+<%--                                           autocomplete="off"  class="layui-input"--%>
+<%--                                           v-model="subInfo.xjNum">--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
+<%--                    <div class="layui-row">--%>
+<%--                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">--%>
+<%--                            <div class="layui-form-item">--%>
+<%--                                <label class="layui-form-label">在建转投产周期</label>--%>
+<%--                                <div class="layui-input-block">--%>
+<%--                                    <input type="number" name="zjNum" id="zjNum" placeholder="请输入"--%>
+<%--                                           autocomplete="off" class="layui-input"--%>
+<%--                                           v-model="subInfo.zjNum">--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
 
                     <div class="layui-row">
                         <div class='layui-form-item'>

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

@@ -201,7 +201,8 @@
         <div>
             <div class="layui-row">
                 <div style="display: flex;margin-bottom: 3px">
-                    <label class="juli" onclick="levelList('abcs','A类','')">
+<%--                    <label class="juli" onclick="levelList('abcs','A类','')">--%>
+                    <label class="juli">
                         储备项目总数
                         <span class="info-icon" title="A类项目：成熟类项目，可研或初设已编制并完成初审，达到项目等资金的进度">?</span>
                         <span class="lanse-first">{{beginRate.num}}</span>
@@ -843,7 +844,7 @@
                         {
                             field: 'amtTotal',
                             title: '计划总投资（亿元）',
-                            width: 100,
+                            width: 80,
                             templet: d => (d.amtTotal / 10000).toFixed(2) + "亿元"
                         },
                         {field: 'progress', title: '进展情况', minWidth: 300},

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

@@ -1110,7 +1110,7 @@
                         {field: 'subjectName', title: '项目所在地', width: 100},
                         {field: 'content',  title: '项目建设内容', minWidth: 300},
                         {
-                            field: 'amtTotal', title: '计划总投资（亿元）', width: 100, templet: function (d) {
+                            field: 'amtTotal', title: '计划总投资（亿元）', width: 80, templet: function (d) {
                                 return (d.amtTotal / 10000).toFixed(2) + "亿元";
                             }
                         },

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

@@ -1149,7 +1149,7 @@
                         {field: 'subjectName', title: '项目所在地', width: 100},
                         {field: 'content', title: '项目建设内容', width: 300},
                         {
-                            field: 'amtTotal',  title: '计划总投资（亿元）', width: 100, templet: function (d) {
+                            field: 'amtTotal',  title: '计划总投资（亿元）', width: 80, templet: function (d) {
                                 return (d.amtTotal / 10000).toFixed(2) + "亿元";
                             }
                         },

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

@@ -1136,7 +1136,7 @@
                         {field: 'subjectName', title: '项目所在地', minWidth: 100},
                         {field: 'content', title: '项目建设内容', minWidth: 200},
                         {
-                            field: 'amtTotal',  title: '计划总投资（亿元）', minWidth: 120, templet: function (d) {
+                            field: 'amtTotal',  title: '计划总投资（亿元）', minWidth: 80, templet: function (d) {
                                 return (d.amtTotal / 10000).toFixed(2) + "亿元";
                             }
                         },

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

@@ -1062,7 +1062,7 @@
                         {field: 'subjectName', title: '项目所在地', width: 100},
                         {field: 'content', title: '项目建设内容', minWidth: 300},
                         {
-                            field: 'amtTotal', title: '计划总投资（亿元）', width: 100, templet: function (d) {
+                            field: 'amtTotal', title: '计划总投资（亿元）', width: 80, templet: function (d) {
                                 return (d.amtTotal / 10000).toFixed(2) + "亿元";
                             }
                         },

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

@@ -1132,7 +1132,7 @@
                         {field: 'subjectName', title: '项目所在地', width: 100},
                         {field: 'content', title: '项目建设内容', minWidth: 300},
                         {
-                            field: 'amtTotal', title: '计划总投资（亿元）', width: 100, templet: function (d) {
+                            field: 'amtTotal', title: '计划总投资（亿元）', width: 80, templet: function (d) {
                                 return (d.amtTotal / 10000).toFixed(2) + "亿元";
                             }
                         },

projects/src/main/webapp/vmodules/top.jsp

@@ -95,6 +95,11 @@
         <li class="layui-nav-item">
             <div class="top-cutline-normal"></div>
         </li>
+        <li class="layui-nav-item">
+            <div style="display: flex; align-items: center; height: 100%;">
+                <button class="layui-btn" @click="changeSystem">返回发改委系统</button>
+            </div>
+        </li>
         <li class="layui-nav-item">
             <a style="padding:0;margin-left:25px;">
 				<span class="txt">
@@ -122,6 +127,18 @@
                 this.collapse = !this.collapse;
                 window.parent.postMessage({collapse: this.collapse}, "*");
             },
+            changeSystem() {
+                App.postJson("/app/switch/toFgw", {}, function (res) {
+                    console.log(res);
+                    if(res.code ===200){
+                        var targetUrl = res.msg+"/projects/index";
+                        var cookiesToSend = "rememberMe="+res.data.token;
+                        // 将需要携带的cookie通过URL参数的形式附加到目标URL上
+                        targetUrl += "?cookies=" + encodeURIComponent(cookiesToSend);
+                        window.location.href = targetUrl;
+                    }
+                });
+            }
         }
     })
 </script>

projects/src/main/webapp/vmodules/workBench/zr_gzt.jsp

@@ -386,11 +386,11 @@
                         </div>
                         <div>
                             <span class="title">黄灯项目数</span>
-                            <span class="num" id="yellowNum">${warningNum}</span>
+                            <span class="num" id="yellowNum">${withinNum}</span>
                         </div>
                         <div>
                             <span class="title">红灯项目数</span>
-                            <span class="num" id="redNum">${exceedNum}</span>
+                            <span class="num" id="redNum">${outsideNum}</span>
                         </div>
                     </div>
 <%--                    <div class="monthly-charts" id="charts-year-done"></div>--%>