项目详情查发改委库

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

@@ -1,6 +1,7 @@
 package com.rtrh.projects.modules.problem.mapper;
 
 import com.rtrh.core.repository.mybatis.MyBatisRepository;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -14,4 +15,6 @@ import java.util.Map;
 public interface SubquestionInfoMapper {
 
     List<Map<String,Object>> pageQueryQuestionNewList(Map<String,Object> params);
+
+    List<Map<String, Object>> pageQueryQuestionListBySubId(@Param("subId") String subId);
 }

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

@@ -69,4 +69,14 @@
         ORDER BY usersub DESC, date_conf DESC
 
     </select>
+    <select id="pageQueryQuestionListBySubId" resultType="java.util.Map">
+        SELECT a.file_type fileType,a.file_addre,a.file_name,DATE_FORMAT(a.comple_date,'%Y-%m-%d') as comple_date,a.comple_desc,a.status ,b.sub_name subName,f.title unitTitle,a.date_apply,a.title,c.title as kind_sourceid,d.title as kind_typeid,a.date_conf
+        FROM sub_q_info a LEFT JOIN sub_info b on a.sub_id =b.id
+        LEFT JOIN t_systable c on a.kind_sourceid=c.id
+        LEFT JOIN t_systable d on a.kind_typeid=d.id
+        LEFT JOIN j_unit f on f.id=b.unit_id
+        WHERE a.logic_delete_flag = 0 and a.sub_id = #{subId}
+        GROUP BY a.id
+        ORDER BY date_conf desc
+    </select>
 </mapper>

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

@@ -1031,17 +1031,24 @@ public class SubquestioninfoserviceImpl implements Subquestioninfoservice {
 	}
 
 	@Override
+	@TargetDataSource("secondary")
 	public Page pageBySub(Page page, String subId) {
-		StringBuffer sql = new StringBuffer();
+		PageHelper.startPage(page.getPageNo(), page.getPageSize());
-		sql.append(" SELECT a.file_type fileType,a.file_addre,a.file_name,DATE_FORMAT(a.comple_date,'%Y-%m-%d') as comple_date,a.comple_desc,a.status ,b.sub_name subName,f.title unitTitle,a.date_apply,a.title,c.title as kind_sourceid,d.title as kind_typeid,a.date_conf ");
+		List<Map<String, Object>> mapList = subquestionInfoMapper.pageQueryQuestionListBySubId(subId);
-		sql.append(" FROM sub_q_info a LEFT JOIN sub_info b on a.sub_id =b.id ");
+		PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(mapList);
-		sql.append(" LEFT JOIN t_systable c on a.kind_sourceid=c.id ");
+		page.setList(mapList);
-		sql.append(" LEFT JOIN t_systable d on a.kind_typeid=d.id  ");
+		page.setTotalCount(pageInfo.getTotal());
-		sql.append(" LEFT JOIN j_unit f on f.id=b.unit_id ");
+		return page;
-		sql.append(" WHERE a.logic_delete_flag = 0 and a.sub_id = '"+ subId+"' ");
+		// StringBuffer sql = new StringBuffer();
-		sql.append(" GROUP BY a.id ");
+		// sql.append(" SELECT a.file_type fileType,a.file_addre,a.file_name,DATE_FORMAT(a.comple_date,'%Y-%m-%d') as comple_date,a.comple_desc,a.status ,b.sub_name subName,f.title unitTitle,a.date_apply,a.title,c.title as kind_sourceid,d.title as kind_typeid,a.date_conf ");
-		sql.append(" ORDER BY date_conf desc ");
+		// sql.append(" FROM sub_q_info a LEFT JOIN sub_info b on a.sub_id =b.id ");
-		return subquestionInfoDao.queryForListBySql(sql.toString(), page);
+		// sql.append(" LEFT JOIN t_systable c on a.kind_sourceid=c.id ");
+		// sql.append(" LEFT JOIN t_systable d on a.kind_typeid=d.id  ");
+		// sql.append(" LEFT JOIN j_unit f on f.id=b.unit_id ");
+		// sql.append(" WHERE a.logic_delete_flag = 0 and a.sub_id = '"+ subId+"' ");
+		// sql.append(" GROUP BY a.id ");
+		// sql.append(" ORDER BY date_conf desc ");
+		// return subquestionInfoDao.queryForListBySql(sql.toString(), page);
 	}
 
 	@Override

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

@@ -0,0 +1,22 @@
+package com.rtrh.projects.modules.projects.mapper;
+
+import com.rtrh.core.repository.mybatis.MyBatisRepository;
+import com.rtrh.projects.modules.records.vo.MeetingRecordsVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 行业设置表 Mapper 接口
+ * </p>
+ *
+ * @author jiangpengli
+ * @since 2024-12-27
+ */
+@MyBatisRepository
+public interface SubMeetingMapper {
+
+    List<MeetingRecordsVO> listBySubId(@Param("subId") String subId);
+
+}

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

@@ -0,0 +1,13 @@
+<?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.SubMeetingMapper" >
+
+    <select id="listBySubId" resultType="com.rtrh.projects.modules.records.vo.MeetingRecordsVO">
+        SELECT mr.id, mr.host, mr.meeting_place meetingPlace, mr.kind, mr.meeting_date meetingDate, mr.meeting_title meetingTitle,mr.content,
+        mr.remark, mr.join_person joinPerson, mr.solve_problem solveProblem
+        FROM meeting_records mr LEFT JOIN sub_meeting sm ON mr.id = sm.meeting_id
+        WHERE mr.logic_delete_flag=0
+        AND sm.sub_id = #{subId}
+        ORDER BY mr.create_time DESC
+    </select>
+</mapper>

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

@@ -0,0 +1,21 @@
+package com.rtrh.projects.modules.projects.mapper;
+
+import com.rtrh.core.repository.mybatis.MyBatisRepository;
+import com.rtrh.projects.modules.projects.vo.SubSourceVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 行业设置表 Mapper 接口
+ * </p>
+ *
+ * @author jiangpengli
+ * @since 2024-12-27
+ */
+@MyBatisRepository
+public interface SubSourceMapper {
+
+    List<SubSourceVO> findBySubId(@Param("subId") String subId);
+}

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

@@ -0,0 +1,10 @@
+<?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.SubSourceMapper" >
+
+    <select id="findBySubId" resultType="com.rtrh.projects.modules.projects.vo.SubSourceVO">
+        SELECT a.id,a.sub_id as subId, a.source_id as sourceId, a.amt, a.amt_sj amtSj, b.title as sourceName,a.plan_date planDate,a.amt_pay amtPay
+        FROM sub_source a LEFT JOIN t_systable b on a.source_id = b.id
+        WHERE a.logic_delete_flag = 0 and a.sub_id = #{subId}
+    </select>
+</mapper>

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

@@ -0,0 +1,22 @@
+package com.rtrh.projects.modules.projects.mapper;
+
+import com.rtrh.core.repository.mybatis.MyBatisRepository;
+import com.rtrh.projects.modules.records.vo.MeetingRecordsVO;
+import com.rtrh.projects.modules.system.po.TSystable;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 行业设置表 Mapper 接口
+ * </p>
+ *
+ * @author jiangpengli
+ * @since 2024-12-27
+ */
+@MyBatisRepository
+public interface TSystableMapper {
+
+    List<TSystable> getSysDataByKind(@Param("kind") String kind);
+}

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

@@ -0,0 +1,11 @@
+<?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.TSystableMapper" >
+
+    <select id="getSysDataByKind" resultType="com.rtrh.projects.modules.system.po.TSystable">
+        select id,kind,code,title,unit_id unitId,remark
+        from t_systable
+        where logic_delete_flag = 0 and kind = #{kind}
+        order by code asc
+    </select>
+</mapper>

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

@@ -0,0 +1,10 @@
+package com.rtrh.projects.modules.projects.service;
+
+import com.rtrh.projects.modules.projects.vo.SubSourceVO;
+
+import java.util.List;
+
+public interface SubSourceService {
+
+    List<SubSourceVO> findBySubId(String id);
+}

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

@@ -159,6 +159,9 @@ public class SubInfoServiceImpl implements SubInfoService {
     @Autowired
     private ILogOperateService logOperateService;
 
+    @Autowired
+    private SubSourceService subSourceService;
+
     @Override
     public Page pageYqInfo(Page page, LoginUserVO vo, String projName, String startTime, String endTime, String overStatus, String year, String beginMonth, String endMonth, Boolean onlySub) {
         Page data = subInfoDao.pageYqInfo(page, vo, projName, startTime, endTime, overStatus, year, beginMonth, endMonth, onlySub, null, null, null, null, null);
@@ -844,7 +847,8 @@ public class SubInfoServiceImpl implements SubInfoService {
     public SubInfoVO getById(String id) {
         SubInfo subInfo = subInfoDao.findById(id);
         //List<SubPlan> list = subPlanDao.getPlanListBySubId(id);
-        List<SubSourceVO> subSourceVOs = subSourceDao.findBySubId(id);
+        List<SubSourceVO> subSourceVOs = subSourceService.findBySubId(id);
+        // List<SubSourceVO> subSourceVOs = subSourceDao.findBySubId(id);
         return new SubInfoVO(subInfo, null, subSourceVOs);
     }
 

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

@@ -0,0 +1,23 @@
+package com.rtrh.projects.modules.projects.service.impl;
+
+import com.rtrh.projects.modules.projects.mapper.SubSourceMapper;
+import com.rtrh.projects.modules.projects.service.SubSourceService;
+import com.rtrh.projects.modules.projects.vo.SubSourceVO;
+import com.rtrh.projects.util.TargetDataSource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class SubSourceServiceImpl implements SubSourceService {
+
+    @Autowired
+    private SubSourceMapper subSourceMapper;
+
+    @Override
+    @TargetDataSource("secondary")
+    public List<SubSourceVO> findBySubId(String subId) {
+        return subSourceMapper.findBySubId(subId);
+    }
+}

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

@@ -9,6 +9,8 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import com.rtrh.projects.modules.problem.vo.QuestionQueryVO;
+import com.rtrh.projects.modules.projects.mapper.SubMeetingMapper;
+import com.rtrh.projects.util.TargetDataSource;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.MatchMode;
@@ -56,6 +58,9 @@ public class MeetingRecordsServiceImpl implements MeetingRecordsService {
     @Autowired
     private SubMeetingDao subMeetingDao;
 
+    @Autowired
+    private SubMeetingMapper subMeetingMapper;
+
     @Override
     @Transactional(readOnly = true)
     public Page pageQuery(Page page, MeetingRecordsQueryVO queryVO) {
@@ -95,8 +100,10 @@ public class MeetingRecordsServiceImpl implements MeetingRecordsService {
     }
 
     @Override
+    @TargetDataSource("secondary")
     public List<MeetingRecordsVO> listBySubId(String subId) {
-        List<MeetingRecordsVO> dataList = subMeetingDao.listBySubId(subId);
+        List<MeetingRecordsVO> dataList = subMeetingMapper.listBySubId(subId);
+        // List<MeetingRecordsVO> dataList = subMeetingDao.listBySubId(subId);
         if (CollectionUtil.isNotEmpty(dataList)) {
             List<TSystable> list = tSysTableService.getByKind(SysTableKind.ZTLX);
             Map<String, String> kindMap = list.stream().collect(Collectors.toMap(TSystable::getCode, TSystable::getTitle));

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

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author dupengcheng
@@ -36,4 +37,6 @@ public interface WeekAndMonrhFileMapper {
 
     @Update("update week_and_month_file set logic_delete_flag = #{w.logicDeleteFlag} where id = #{w.id}")
     void update(@Param("w") WeekAndMonthFile w);
+
+    List<Map<String, Object>> pageBySub(@Param("types") List<Integer> types, @Param("subId") String subId);
 }

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

@@ -33,4 +33,18 @@
         )
     </foreach>
 </insert>
+
+    <select id="pageBySub" resultType="java.util.Map">
+        select if(b.kind = '1', DATE_FORMAT(b.begin_date,'%Y年%m月'), DATE_FORMAT(b.begin_date,'%Y年%m月%d日')) time, a.file_name fileName,
+        a.file_addre fileAddre, a.file_type fileType, DATE_FORMAT(a.create_time,'%Y-%m-%d %H:%i:%s') createTime, if(b.kind = '1','月报','周报') kind
+        FROM week_and_month_file a left join sub_rpt_cont b ON a.main_id = b.id
+        <where>
+            b.sub_id = #{subId} and a.logic_delete_flag = 0 and b.logic_delete_flag = 0
+            and a.file_type in
+            <foreach collection="types" item="type" open="(" close=")" separator=",">
+                #{type}
+            </foreach>
+        </where>
+        ORDER BY createTime desc
+    </select>
 </mapper>

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

@@ -3,8 +3,10 @@ package com.rtrh.projects.modules.system.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.rtrh.projects.modules.projects.mapper.TSystableMapper;
 import com.rtrh.projects.modules.rolemeun.dao.MeunInfoDao;
 import com.rtrh.projects.modules.rolemeun.po.MeunInfo;
+import com.rtrh.projects.util.TargetDataSource;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Restrictions;
@@ -26,15 +28,17 @@ public class TSysTableServiceImpl implements TSysTableService {
 
 	@Autowired
 	private TSystableDao tSystableDao;
-
+	@Autowired
+	private TSystableMapper tSystableMapper;
 
 	@Autowired
 	private MeunInfoDao meunInfoDao;
 
 	@Override
+	@TargetDataSource("secondary")
 	public List<TSystable> getByKind(SysTableKind kind) {
-
+		return tSystableMapper.getSysDataByKind(kind.getCode());
-		return tSystableDao.getSysDataByKind(kind);
+		// return tSystableDao.getSysDataByKind(kind);
 	}
 
 

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

@@ -1,9 +1,10 @@
 package com.rtrh.projects.modules.system.service.impl;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.rtrh.common.modules.filesystem.FileSystemEnum;
 import com.rtrh.projects.modules.system.mapper.WeekAndMonrhFileMapper;
 import com.rtrh.projects.util.TargetDataSource;
 import org.apache.commons.lang3.StringUtils;
@@ -107,8 +108,20 @@ public class WeekAndMonthFileImpl implements WeekAndMonthFileService {
     }
 
 	@Override
+    @TargetDataSource("secondary")
 	public Page pageBySub(Page page, String type, String subId) {
-
+        PageHelper.startPage(page.getPageNo(), page.getPageSize());
-		return weekAndMonrhFileDao.pageBySub(page, type, subId);
+        List<Integer> fileTypes = new ArrayList<>();
+        if ("IMAGE".equals(type)){
+            fileTypes = Arrays.asList(FileSystemEnum.FileType.JPEG.getKey(), FileSystemEnum.FileType.JPG.getKey(), FileSystemEnum.FileType.PNG.getKey());
+        }else if ("VEDIO".equals(type)){
+            fileTypes = Collections.singletonList(FileSystemEnum.FileType.MP4.getKey());
+        }
+        List<Map<String, Object>> mapList = weekAndMonrhFileMapper.pageBySub(fileTypes, subId);
+        PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(mapList);
+        page.setList(mapList);
+        page.setTotalCount(pageInfo.getTotal());
+        return page;
+		// return weekAndMonrhFileDao.pageBySub(page, type, subId);
 	}
 }