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

@@ -1140,7 +1140,7 @@ public class StaticsServiceImpl implements StaticsService {
                 //进度占比=(年度金额/所有金额)*100
                 BigDecimal yearAmtTotal = subInfoTjfxVo.getYearAmtTotal();
                 if (yearAmtTotal.compareTo(BigDecimal.ZERO) != 0) {
-                    subInfoTjfxTableVo.setNumBZb(subInfoTjfxTableVo.getAmtJh().divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).divide(yearAmtTotal, 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100")));
+                    subInfoTjfxTableVo.setNumBZb(subInfoTjfxTableVo.getAmtJh().divide(yearAmtTotal, 6, RoundingMode.HALF_UP).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
                 } else {
                     subInfoTjfxTableVo.setNumBZb(BigDecimal.ZERO);
                 }
@@ -1149,7 +1149,7 @@ public class StaticsServiceImpl implements StaticsService {
                 subInfoTjfxTableVo.setLastAmtJh(entry.getValue().stream().map(SubInfoTjfxDataVo::getLastAmt).reduce(BigDecimal.ZERO, BigDecimal::add));
                 if (lastYearAmtTotal.compareTo(BigDecimal.ZERO) != 0) {
                     //需要计算当前年度占比
-                    subInfoTjfxTableVo.setNumBl(subInfoTjfxTableVo.getNumBZb().subtract(subInfoTjfxTableVo.getLastAmtJh().divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).divide(lastYearAmtTotal, 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))));
+                    subInfoTjfxTableVo.setNumBl(subInfoTjfxTableVo.getNumBZb().subtract(subInfoTjfxTableVo.getLastAmtJh().divide(new BigDecimal("100"), 6, RoundingMode.HALF_UP).divide(lastYearAmtTotal, 2, RoundingMode.HALF_UP)));
                 } else {
                     subInfoTjfxTableVo.setNumBl(subInfoTjfxTableVo.getNumBZb());
                 }
@@ -1170,7 +1170,7 @@ public class StaticsServiceImpl implements StaticsService {
                 //进度占比=(年度金额/所有金额)*100
                 BigDecimal yearAmtTotal = subInfoTjfxVo.getYearAmtTotal();
                 if (yearAmtTotal.compareTo(BigDecimal.ZERO) != 0) {
-                    subInfoTjfxTableVo.setNumBZb(subInfoTjfxTableVo.getAmtJh().divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).divide(yearAmtTotal, 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100")));
+                    subInfoTjfxTableVo.setNumBZb(subInfoTjfxTableVo.getAmtJh().divide(new BigDecimal("100"), 6, RoundingMode.HALF_UP).divide(yearAmtTotal, 2, RoundingMode.HALF_UP));
                 } else {
                     subInfoTjfxTableVo.setNumBZb(BigDecimal.ZERO);
                 }
@@ -1179,7 +1179,7 @@ public class StaticsServiceImpl implements StaticsService {
                 subInfoTjfxTableVo.setLastAmtJh(entry.getValue().stream().map(SubInfoTjfxDataVo::getLastAmt).reduce(BigDecimal.ZERO, BigDecimal::add));
                 if (lastYearAmtTotal.compareTo(BigDecimal.ZERO) != 0) {
                     //需要计算当前年度占比
-                    subInfoTjfxTableVo.setNumBl(subInfoTjfxTableVo.getNumBZb().subtract(subInfoTjfxTableVo.getLastAmtJh().divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).divide(lastYearAmtTotal, 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))));
+                    subInfoTjfxTableVo.setNumBl(subInfoTjfxTableVo.getNumBZb().subtract(subInfoTjfxTableVo.getLastAmtJh().divide(new BigDecimal("100"), 6, RoundingMode.HALF_UP).divide(lastYearAmtTotal, 2, RoundingMode.HALF_UP)));
                 } else {
                     subInfoTjfxTableVo.setNumBl(subInfoTjfxTableVo.getNumBZb());
                 }
@@ -1204,7 +1204,7 @@ public class StaticsServiceImpl implements StaticsService {
                 //进度占比=(年度金额/所有金额)*100
                 BigDecimal yearAmtTotal = subInfoTjfxVo.getYearAmtTotal();
                 if (yearAmtTotal.compareTo(BigDecimal.ZERO) != 0) {
-                    subInfoTjfxTableVo.setNumBZb(subInfoTjfxTableVo.getAmtJh().divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).divide(yearAmtTotal, 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100")));
+                    subInfoTjfxTableVo.setNumBZb(subInfoTjfxTableVo.getAmtJh().divide(new BigDecimal("100"), 6, RoundingMode.HALF_UP).divide(yearAmtTotal, 2, RoundingMode.HALF_UP));
                 } else {
                     subInfoTjfxTableVo.setNumBZb(BigDecimal.ZERO);
                 }
@@ -1213,7 +1213,7 @@ public class StaticsServiceImpl implements StaticsService {
                 subInfoTjfxTableVo.setLastAmtJh(entry.getValue().stream().map(SubInfoTjfxDataVo::getLastAmt).reduce(BigDecimal.ZERO, BigDecimal::add));
                 if (lastYearAmtTotal.compareTo(BigDecimal.ZERO) != 0) {
                     //需要计算当前年度占比
-                    subInfoTjfxTableVo.setNumBl(subInfoTjfxTableVo.getNumBZb().subtract(subInfoTjfxTableVo.getLastAmtJh().divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).divide(lastYearAmtTotal, 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"))));
+                    subInfoTjfxTableVo.setNumBl(subInfoTjfxTableVo.getNumBZb().subtract(subInfoTjfxTableVo.getLastAmtJh().divide(new BigDecimal("100"), 6, RoundingMode.HALF_UP).divide(lastYearAmtTotal, 2, RoundingMode.HALF_UP)));
                 } else {
                     subInfoTjfxTableVo.setNumBl(subInfoTjfxTableVo.getNumBZb());
                 }

projects/src/main/java/com/rtrh/projects/web/controller/projects/SubPreNewController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.rtrh.projects.modules.rolemeun.po.SecRole;
 import com.rtrh.projects.modules.rolemeun.servicel.SecRoleservice;
 import com.rtrh.projects.vo.subject.SubinfoPreQueryVo;
+import com.rtrh.projects.web.log.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -134,6 +135,7 @@ public class SubPreNewController extends BaseController {
 	 * @param subId
 	 * @return
 	 */
+	@Log("用户点击项目前期管理-项目信息申报-办理情况按钮")
 	@GetMapping("sbTodo")
 	public ModelAndView sbTodo(ModelMap model, String subId) {
 		model.put("subId", subId);

projects/src/main/java/com/rtrh/projects/web/controller/projects/api/TzfxApiController.java

@@ -13,6 +13,7 @@ import com.rtrh.projects.modules.projects.po.TLogOperate;
 import com.rtrh.projects.modules.projects.vo.*;
 import com.rtrh.projects.modules.system.po.SecUser;
 import com.rtrh.projects.vo.passport.RegisterListVO;
+import com.rtrh.projects.web.log.Log;
 import com.team.security.TeamShiroUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -90,6 +91,7 @@ public class TzfxApiController extends BaseController {
 	 * 获取统计分析页面数据
 	 * @return
 	 */
+	@Log("用户查询统计分析数据")
 	@PostMapping("getTjfxData")
 	public Message getTjfxData(@RequestBody TzfxDataQueryVO queryVO) {
 		Message message = new Message();
@@ -106,6 +108,7 @@ public class TzfxApiController extends BaseController {
 	/**
 	 * 项目转换统计列表数据
 	 */
+	@Log("用户查询项目转换统计数据")
 	@PostMapping("/getXmzhtjData")
 	public ListMessage getXmzhtjData(@RequestBody Page page, @RequestBody RegisterListVO vo) {
 		ListMessage message = new ListMessage();
@@ -123,6 +126,7 @@ public class TzfxApiController extends BaseController {
 	/**
 	 * 项目转换统计详情数据
 	 */
+	@Log("用户查询项目转换统计详情数据")
 	@PostMapping("getXmzhtjDetailData")
 	public ListMessage getXmzhtjDetailData(@RequestBody Page page, @RequestBody XmzhtjDetailVo queryVO) {
 		ListMessage message = new ListMessage();
@@ -137,6 +141,4 @@ public class TzfxApiController extends BaseController {
 	}
 
 
-
-
 }

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

@@ -23,6 +23,7 @@ import com.rtrh.projects.modules.system.dao.TSystableDao;
 import com.rtrh.projects.modules.system.po.TSystable;
 import com.rtrh.projects.modules.system.service.ISubInduService;
 import com.rtrh.projects.modules.utils.DateUtils;
+import com.rtrh.projects.web.log.Log;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -143,6 +144,7 @@ public class SubInfoController extends BaseController {
      * @param model
      * @return
      */
+    @Log("用户查看项目前期管理-前期手续办理情况-按部门统计")
     @GetMapping("reportDepartment")
     public ModelAndView reportDepartment(ModelMap model) {
         List<Map<String, Object>> unit = jUnitService.getCheckUnit();
@@ -157,6 +159,7 @@ public class SubInfoController extends BaseController {
      * @param model
      * @return
      */
+    @Log("用户查看项目前期管理-前期手续办理情况-按办理手续统计")
     @GetMapping("reportFile")
     public ModelAndView reportFile(ModelMap model) {
         List<JUnit> unit = jUnitService.getUnitByKind(JUnitKind.ZFDW);
@@ -170,6 +173,7 @@ public class SubInfoController extends BaseController {
      * @param model
      * @return
      */
+    @Log("用户查看项目前期管理-前期手续办理情况-按项目统计")
     @GetMapping("reportProject")
     public ModelAndView reportProject(ModelMap model) {
         List<JUnit> unit = jUnitService.getUnitByKind(JUnitKind.ZFDW);
@@ -1154,6 +1158,7 @@ public class SubInfoController extends BaseController {
         return begin + "~" + end;
     }
 
+    @Log("用户查看项目详细信息")
     @GetMapping("detailView2")
     public ModelAndView viewDetail(Model model, String subId, String lastUrl, Boolean layer, String queryYear, Boolean isCt) {
         // Map<String, Object> subInfo = subInfoService.getSubInfoById(subId, queryYear);

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

@@ -44,6 +44,7 @@ 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.log.Log;
 import com.rtrh.projects.web.util.ExcelStyleUtil;
 import com.rtrh.projects.web.util.SheetData;
 import com.rtrh.projects.web.util.SheetHead;
@@ -639,6 +640,7 @@ public class SubInfoExportController extends BaseController {
      * @param response
      * @param vo
      */
+    @Log("用户点击项目汇总导出按钮，导出重点库项目汇总信息")
     @PostMapping("/exportFixTotalExcel")
     public void exportFixTotalExcel(HttpServletResponse response, @RequestBody SubInfoQueryTzVO vo) {
 
@@ -1316,6 +1318,7 @@ public class SubInfoExportController extends BaseController {
      * @param response
      * @param vo
      */
+    @Log("用户点击重点项目-新建项目明细表导出按钮，导出重点新建项目明细表信息")
     @PostMapping("/exportFixXjDetailExcel")
     public void exportFixXjDetailExcel(HttpServletResponse response, @RequestBody SubInfoQueryTzVO vo) throws IOException {
         try (cn.hutool.poi.excel.ExcelWriter writer = ExcelUtil.getBigWriter();
@@ -1430,6 +1433,7 @@ public class SubInfoExportController extends BaseController {
      * @param response
      * @param vo
      */
+    @Log("用户点击重点项目-储备项目明细导出按钮，导出重点储备项目明细信息")
     @PostMapping("/exportFixCbDetailExcel")
     public void exportFixCbDetailExcel(HttpServletResponse response, @RequestBody SubInfoQueryTzVO vo) throws IOException {
 
@@ -1529,6 +1533,7 @@ public class SubInfoExportController extends BaseController {
      * @param response
      * @param vo
      */
+    @Log("用户点击重点项目-在建项目明细导出按钮，导出重点在建项目明细信息")
     @PostMapping("/exportFixZjDetailExcel")
     public void exportFixZjDetailExcel(HttpServletResponse response, @RequestBody SubInfoQueryTzVO vo) throws IOException {
 
@@ -1644,6 +1649,7 @@ public class SubInfoExportController extends BaseController {
      * @param response
      * @param vo
      */
+    @Log("用户点击重点项目-投产项目明细表导出按钮，导出重点投产项目明细表信息")
     @PostMapping("/exportFixTcDetailExcel")
     public void exportFixTcDetailExcel(HttpServletResponse response, @RequestBody SubInfoQueryTzVO vo) throws IOException {
 

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

@@ -145,7 +145,7 @@ public class SubInfoApiController extends BaseController {
      * 抓取四库代码到重点项目库中
      *
      */
-    @Log("自动抓取四库代码到重点项目库中")
+    @Log("用户点击自动抓取按钮，抓取数据到重点项目库中")
     @PostMapping(value = "/subInfoToSubFix")
     public ListMessage subInfoToSubFix(@RequestBody SubInfoToSubFixVo subInfoToSubFixVo) {
         ListMessage message = new ListMessage();
@@ -162,7 +162,7 @@ public class SubInfoApiController extends BaseController {
     /**
      * 重点项目状态改变
      */
-    @Log("重点项目信息状态转换")
+    @Log("用户更改重点项目状态")
     @PostMapping(value = "/updateFixeCat/{subInfoId}/{cat}")
     public Message updateFixeCat(@PathVariable String subInfoId,@PathVariable String cat) {
         Message message = new Message();
@@ -189,6 +189,7 @@ public class SubInfoApiController extends BaseController {
      * @param beginDateEnd
      * @return
      */
+    @Log("用户查询项目前期管理-项目申报信息数据")
     @PostMapping(value = "/pageQueryNDataPlus")
     public ListMessage pageQueryNDataPlus(@RequestBody Page page, @RequestBody SubInfoNDataQueryVO queryVO) {
         ListMessage message = new ListMessage();
@@ -1137,6 +1138,76 @@ public class SubInfoApiController extends BaseController {
         return message;
     }
 
+    /**
+     * 设置项目取消纳入年度固定资产项目库
+     */
+    @PostMapping("setIsFixAdd")
+    @Log("用户纳入数据到重点项目库中")
+    public Message setIsFixAdd(@RequestBody SubIdVO vo) {
+        Message message = new Message();
+        try {
+            LoginUserVO userVO = getCurUser().getLoginUser();
+            if (StringUtil.isNotEmpty(vo.getSubId())) {
+                SubInfo subinfo = subInfoDao.findById(vo.getSubId());
+                if ("0".equals(vo.getIsFix())) {
+                    subDataLogService.saveFeild("STRING", "纳入", "不纳入", getCurUser().getLoginUser(), vo.getSubId(), "is_fix", "不纳入年度固定资产项目库,stateFix:" + vo.getStateFix(), SubLogEnum.XMXX.getCode());
+                } else {
+                    subDataLogService.saveFeild("STRING", "不纳入", "纳入", getCurUser().getLoginUser(), vo.getSubId(), "is_fix", "纳入年度固定资产项目库,stateFix:" + vo.getStateFix(), SubLogEnum.XMXX.getCode());
+                }
+		/*		subinfo.setIsFix(vo.getIsFix());
+				subinfo.setStateFix(vo.getStateFix());
+				subinfo.setLastUpdateTime(new Date());
+				subinfo.setLastUpdateUserId(userVO.getId());
+				subInfoDao.saveOrUpdate(subinfo);*/
+                if ("1".equals(vo.getIsFix())) {
+                    subFixDao.saveOrUpdate(new SubFix().setId(Identities.uuid()).setSubId(vo.getSubId()).setCat(vo.getStateFix()).setYear(vo.getYear()).setCreateUserId(userVO.getId()).setCreateTime(new Date()));
+                } else {
+                    List list = subFixDao.queryForClsListBySql("select a.Id from sub_fix a where sub_id='" + vo.getSubId() + "' and year=" + vo.getYear(), SubFix.class);
+                    subFixDao.deleteAll(list);
+                }
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            message.addError("保存失败");
+        }
+        return message;
+    }
+
+    /**
+     * 设置项目取消纳入年度固定资产项目库
+     */
+    @PostMapping("setIsFixRemove")
+    @Log("用户移除重点项目库中数据")
+    public Message setIsFixRemove(@RequestBody SubIdVO vo) {
+        Message message = new Message();
+        try {
+            LoginUserVO userVO = getCurUser().getLoginUser();
+            if (StringUtil.isNotEmpty(vo.getSubId())) {
+                SubInfo subinfo = subInfoDao.findById(vo.getSubId());
+                if ("0".equals(vo.getIsFix())) {
+                    subDataLogService.saveFeild("STRING", "纳入", "不纳入", getCurUser().getLoginUser(), vo.getSubId(), "is_fix", "不纳入年度固定资产项目库,stateFix:" + vo.getStateFix(), SubLogEnum.XMXX.getCode());
+                } else {
+                    subDataLogService.saveFeild("STRING", "不纳入", "纳入", getCurUser().getLoginUser(), vo.getSubId(), "is_fix", "纳入年度固定资产项目库,stateFix:" + vo.getStateFix(), SubLogEnum.XMXX.getCode());
+                }
+		/*		subinfo.setIsFix(vo.getIsFix());
+				subinfo.setStateFix(vo.getStateFix());
+				subinfo.setLastUpdateTime(new Date());
+				subinfo.setLastUpdateUserId(userVO.getId());
+				subInfoDao.saveOrUpdate(subinfo);*/
+                if ("1".equals(vo.getIsFix())) {
+                    subFixDao.saveOrUpdate(new SubFix().setId(Identities.uuid()).setSubId(vo.getSubId()).setCat(vo.getStateFix()).setYear(vo.getYear()).setCreateUserId(userVO.getId()).setCreateTime(new Date()));
+                } else {
+                    List list = subFixDao.queryForClsListBySql("select a.Id from sub_fix a where sub_id='" + vo.getSubId() + "' and year=" + vo.getYear(), SubFix.class);
+                    subFixDao.deleteAll(list);
+                }
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            message.addError("保存失败");
+        }
+        return message;
+    }
+
     /**
      * 变更开工停工状态
      *
@@ -1360,6 +1431,7 @@ public class SubInfoApiController extends BaseController {
      * @param queryVO
      * @return
      */
+    @Log("用户查询项目前期手续数据")
     @PostMapping(value = "/pageQueryRreProject")
     public ListMessage pageQueryRreProject(@RequestBody Page page, @RequestBody SubinfoPreQueryVo queryVO) {
         ListMessage message = new ListMessage();

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

@@ -92,8 +92,144 @@ public class SubInfoQueryApiController extends BaseController {
      * @param queryVO
      * @return
      */
-    @PostMapping("subFixGetAll")
-    public ListMessage subFixGetAll(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
+    @Log("用户查询重点项目-储备项目数据")
+    @PostMapping("subFixGetAllCb")
+    public ListMessage subFixGetAllCb(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
+        ListMessage message = new ListMessage();
+        try {
+
+            //查询出行业分类
+            List<SubIndu> subInduList = subInduService.selectAllSubIndu();
+
+            //保存行业code
+            List<String> indusKinds = new ArrayList<>();
+            //判断搜索条件中是否有行业分类条件
+            if (StringUtils.isNotBlank(queryVO.getIndusKind())) {
+                //在subInduList中找到code=queryVO.getIndusKinds()的数据
+                SubIndu subIndu = subInduList.stream().filter(item -> item.getCode().equals(queryVO.getIndusKind())).findFirst().orElse(null);
+
+                if (subIndu != null){
+                    //判断这个行业是不是上级行业
+                    if (StringUtils.isBlank(subIndu.getLastId())){
+                        // 这个行业是上级行业，需要找到所有下级行业的code
+                        indusKinds = subInduList.stream().filter(item -> item.getLastId() != null && item.getLastId().equals(subIndu.getId())).map(SubIndu::getCode).collect(Collectors.toList());
+                    }else {
+                        indusKinds.add(subIndu.getCode());
+                    }
+                }
+            }
+
+            List<String> subjectIds = getSubjectIds();
+            Page pageData = subInfoQueryService.subFixGetAll(page, queryVO, indusKinds, subjectIds);
+            message.add(pageData.getList(), pageData.getTotalCount());
+
+        } catch (Exception e) {
+            logger.error("", e);
+            message.add("查询失败");
+        }
+        return message;
+    }
+
+    /**
+     * 获取重点项目数据
+     *
+     * @param page
+     * @param queryVO
+     * @return
+     */
+    @Log("用户查询重点项目-新建项目数据")
+    @PostMapping("subFixGetAllXj")
+    public ListMessage subFixGetAllXj(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
+        ListMessage message = new ListMessage();
+        try {
+
+            //查询出行业分类
+            List<SubIndu> subInduList = subInduService.selectAllSubIndu();
+
+            //保存行业code
+            List<String> indusKinds = new ArrayList<>();
+            //判断搜索条件中是否有行业分类条件
+            if (StringUtils.isNotBlank(queryVO.getIndusKind())) {
+                //在subInduList中找到code=queryVO.getIndusKinds()的数据
+                SubIndu subIndu = subInduList.stream().filter(item -> item.getCode().equals(queryVO.getIndusKind())).findFirst().orElse(null);
+
+                if (subIndu != null){
+                    //判断这个行业是不是上级行业
+                    if (StringUtils.isBlank(subIndu.getLastId())){
+                        // 这个行业是上级行业，需要找到所有下级行业的code
+                        indusKinds = subInduList.stream().filter(item -> item.getLastId() != null && item.getLastId().equals(subIndu.getId())).map(SubIndu::getCode).collect(Collectors.toList());
+                    }else {
+                        indusKinds.add(subIndu.getCode());
+                    }
+                }
+            }
+
+            List<String> subjectIds = getSubjectIds();
+            Page pageData = subInfoQueryService.subFixGetAll(page, queryVO, indusKinds, subjectIds);
+            message.add(pageData.getList(), pageData.getTotalCount());
+
+        } catch (Exception e) {
+            logger.error("", e);
+            message.add("查询失败");
+        }
+        return message;
+    }
+
+    /**
+     * 获取重点项目数据
+     *
+     * @param page
+     * @param queryVO
+     * @return
+     */
+    @Log("用户查询重点项目-在建项目数据")
+    @PostMapping("subFixGetAllZj")
+    public ListMessage subFixGetAllZj(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
+        ListMessage message = new ListMessage();
+        try {
+
+            //查询出行业分类
+            List<SubIndu> subInduList = subInduService.selectAllSubIndu();
+
+            //保存行业code
+            List<String> indusKinds = new ArrayList<>();
+            //判断搜索条件中是否有行业分类条件
+            if (StringUtils.isNotBlank(queryVO.getIndusKind())) {
+                //在subInduList中找到code=queryVO.getIndusKinds()的数据
+                SubIndu subIndu = subInduList.stream().filter(item -> item.getCode().equals(queryVO.getIndusKind())).findFirst().orElse(null);
+
+                if (subIndu != null){
+                    //判断这个行业是不是上级行业
+                    if (StringUtils.isBlank(subIndu.getLastId())){
+                        // 这个行业是上级行业，需要找到所有下级行业的code
+                        indusKinds = subInduList.stream().filter(item -> item.getLastId() != null && item.getLastId().equals(subIndu.getId())).map(SubIndu::getCode).collect(Collectors.toList());
+                    }else {
+                        indusKinds.add(subIndu.getCode());
+                    }
+                }
+            }
+
+            List<String> subjectIds = getSubjectIds();
+            Page pageData = subInfoQueryService.subFixGetAll(page, queryVO, indusKinds, subjectIds);
+            message.add(pageData.getList(), pageData.getTotalCount());
+
+        } catch (Exception e) {
+            logger.error("", e);
+            message.add("查询失败");
+        }
+        return message;
+    }
+
+    /**
+     * 获取重点项目数据
+     *
+     * @param page
+     * @param queryVO
+     * @return
+     */
+    @Log("用户查询重点项目-投产项目数据")
+    @PostMapping("subFixGetAllTc")
+    public ListMessage subFixGetAllTc(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
         ListMessage message = new ListMessage();
         try {
 

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

@@ -428,7 +428,7 @@ new Vue({
 				type: 2,
 				title: '',
 				area: ['1000px', '800px'],
-				content: App.getUrl("/subject/subInfo/detailView?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href),
+				content: App.getUrl("/subject/subInfo/detailView2?layer=true&subId=" + obj.data.id + "&lastUrl=" + window.location.href),
 			});
 			layui.layer.full(index);
 		},

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

@@ -854,7 +854,7 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/subFixGetAll", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAllZj", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
@@ -1232,7 +1232,7 @@
                 addSub: function (index, data) {
                     var self = this;
                     App.msg.confirm("是否纳入重点项目库？", function () {
-                        App.postJson("/api/subject/subInfo/setIsFix", {
+                        App.postJson("/api/subject/subInfo/setIsFixAdd", {
                             subId: data.id,
                             year: data.year,
                             isFix: "1",
@@ -1249,7 +1249,7 @@
                 isNoFix: function (obj) {
                     var self = this;
                     App.msg.confirm("是否取消纳入？", function () {
-                        App.postJson("/api/subject/subInfo/setIsFix", {
+                        App.postJson("/api/subject/subInfo/setIsFixRemove", {
                             subId: obj.data.id,
                             isFix: "0",
                             year: self.getSearchParams().year,

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

@@ -850,7 +850,7 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/subFixGetAll", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAllXj", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
@@ -1228,7 +1228,7 @@
                 addSub: function (index, data) {
                     var self = this;
                     App.msg.confirm("是否纳入重点项目库？", function () {
-                        App.postJson("/api/subject/subInfo/setIsFix", {
+                        App.postJson("/api/subject/subInfo/setIsFixAdd", {
                             subId: data.id,
                             year: data.year,
                             isFix: "1",
@@ -1244,7 +1244,7 @@
                 }, isNoFix: function (obj) {
                     var self = this;
                     App.msg.confirm("是否取消纳入？", function () {
-                        App.postJson("/api/subject/subInfo/setIsFix", {
+                        App.postJson("/api/subject/subInfo/setIsFixRemove", {
                             subId: obj.data.id,
                             isFix: "0",
                             year: self.getSearchParams().year,

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

@@ -845,7 +845,7 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/subFixGetAll", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAllCb", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
@@ -1199,7 +1199,7 @@
                 addSub: function (index, data) {
                     var self = this;
                     App.msg.confirm("是否纳入重点项目库？", function () {
-                        App.postJson("/api/subject/subInfo/setIsFix", {
+                        App.postJson("/api/subject/subInfo/setIsFixAdd", {
                             subId: data.id,
                             year: data.year,
                             isFix: "1",
@@ -1216,7 +1216,7 @@
                 isNoFix: function (obj) {
                     var self = this;
                     App.msg.confirm("是否取消纳入？", function () {
-                        App.postJson("/api/subject/subInfo/setIsFix", {
+                        App.postJson("/api/subject/subInfo/setIsFixRemove", {
                             subId: obj.data.id,
                             isFix: "0",
                             year: self.getSearchParams().year,

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

@@ -866,7 +866,7 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/subFixGetAll", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAllTc", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
@@ -1243,7 +1243,7 @@
                 addSub: function (index, data) {
                     var self = this;
                     App.msg.confirm("是否纳入重点项目库？", function () {
-                        App.postJson("/api/subject/subInfo/setIsFix", {
+                        App.postJson("/api/subject/subInfo/setIsFixAdd", {
                             subId: data.id,
                             year: data.year,
                             isFix: "1",
@@ -1260,7 +1260,7 @@
                 isNoFix: function (obj) {
                     var self = this;
                     App.msg.confirm("是否取消纳入？", function () {
-                        App.postJson("/api/subject/subInfo/setIsFix", {
+                        App.postJson("/api/subject/subInfo/setIsFixRemove", {
                             subId: obj.data.id,
                             isFix: "0",
                             year: self.getSearchParams().year,

projects/src/main/webapp/vmodules/tjfx/index2.jsp

@@ -159,7 +159,7 @@
 	    					"isCheck": false
 	    				},{
                             "value": "4",
-                            "title": "10亿元一下",
+                            "title": "10亿元以下",
                             "isAll": false,
                             "isCheck": false
                         }