过滤掉未上链的数据

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/GyjsydjfwscdjController.java

@@ -8,6 +8,7 @@ import com.siwei.apply.domain.vo.GyjsydjfwscdjVo;
 import com.siwei.apply.domain.vo.OnChainVo;
 import com.siwei.apply.service.GyjsydjfwscdjService;
 import com.siwei.apply.service.NodeLandService;
+import com.siwei.apply.service.ProjectService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
 import org.apache.commons.collections4.CollectionUtils;
@@ -30,7 +31,8 @@ public class GyjsydjfwscdjController extends BaseController {
     private GyjsydjfwscdjService gyjsydjfwscdjService;
     @Autowired
     NodeLandService nodeLandService;
-
+    @Autowired
+    ProjectService projectService;
     /**
      * 添加国有建设用地使用权及房屋所有权首次登记
      */
@@ -111,6 +113,8 @@ public class GyjsydjfwscdjController extends BaseController {
             for (String id : onChainVo.getIds()) {
                 gyjsydjfwscdjService.updateHasOnchain(id, onChainVo.getHasOnchain());
             }
+            // 更新项目表的上链数量
+            projectService.countOnChinaNum(onChainVo.getProjectId());
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/GyjsydscdjController.java

@@ -8,6 +8,7 @@ import com.siwei.apply.domain.vo.GyjsydscdjVo;
 import com.siwei.apply.domain.vo.OnChainVo;
 import com.siwei.apply.service.GyjsydscdjService;
 import com.siwei.apply.service.NodeLandService;
+import com.siwei.apply.service.ProjectService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
 import org.apache.commons.collections4.CollectionUtils;
@@ -30,6 +31,8 @@ public class GyjsydscdjController extends BaseController {
     private GyjsydscdjService gyjsydscdjService;
     @Autowired
     NodeLandService nodeLandService;
+    @Autowired
+    ProjectService projectService;
     /**
      * 添加国有建设用地使用权首次登记
      */
@@ -110,6 +113,10 @@ public class GyjsydscdjController extends BaseController {
             for (String id : onChainVo.getIds()) {
                 gyjsydscdjService.updateHasOnchain(id, onChainVo.getHasOnchain());
             }
+            // 更新项目表的上链数量
+            projectService.countOnChinaNum(onChainVo.getProjectId());
+
+
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/JsgcghxkController.java

@@ -8,6 +8,7 @@ import com.siwei.apply.domain.vo.JsgcghxkVo;
 import com.siwei.apply.domain.vo.OnChainVo;
 import com.siwei.apply.service.JsgcghxkService;
 import com.siwei.apply.service.NodeLandService;
+import com.siwei.apply.service.ProjectService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
 import org.apache.commons.collections4.CollectionUtils;
@@ -31,6 +32,8 @@ public class JsgcghxkController extends BaseController {
     private JsgcghxkService jsgcghxkService;
     @Autowired
     NodeLandService nodeLandService;
+    @Autowired
+    ProjectService projectService;
     /**
      * 添加建设工程规划许可
      */
@@ -112,6 +115,8 @@ public class JsgcghxkController extends BaseController {
             for (String id : onChainVo.getIds()) {
                 jsgcghxkService.updateHasOnchain(id, onChainVo.getHasOnchain());
             }
+            // 更新项目表的上链数量
+            projectService.countOnChinaNum(onChainVo.getProjectId());
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/JsydghxkController.java

@@ -6,6 +6,7 @@ import com.siwei.apply.domain.vo.JsydghxkUpdateVo;
 import com.siwei.apply.domain.vo.JsydghxkVo;
 import com.siwei.apply.service.JsydghxkService;
 import com.siwei.apply.service.NodeLandService;
+import com.siwei.apply.service.ProjectService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
 import org.apache.commons.lang3.StringUtils;
@@ -28,7 +29,8 @@ public class JsydghxkController extends BaseController {
     private JsydghxkService jsydghxkService;
     @Autowired
     NodeLandService nodeLandService;
-
+    @Autowired
+    ProjectService projectService;
     /**
      * 添加建设用地规划许可
      */
@@ -98,6 +100,7 @@ public class JsydghxkController extends BaseController {
     public R<Void> updateHasOnchain(@RequestBody Map<String, Object> params) {
         try {
             String id = (String) params.get("id");
+            String projectId = (String) params.get("projectId");
             Boolean hasOnchain = (Boolean) params.get("hasOnchain");
             if (StringUtils.isBlank(id)) {
                 return R.fail("nodeId不能为空");
@@ -107,6 +110,8 @@ public class JsydghxkController extends BaseController {
                 return R.fail(502,"数据空间信息不存在，请检查先导入空间数据");
             }
             jsydghxkService.updateHasOnchain(id, hasOnchain);
+            // 更新项目表的上链数量
+            projectService.countOnChinaNum(projectId);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/ProjectController.java

@@ -145,4 +145,31 @@ public class ProjectController extends BaseController {
             return R.fail(e.getMessage());
         }
     }
+
+
+
+    /**
+     *
+     * 全文检索项目信息
+     * 获取项目列表
+     *
+     * @return
+     */
+    @PostMapping("/listSearch")
+    public R<Map<String, Object>> GetListByKeyWord(@RequestBody ProjectFilterVo projectFilterVo) {
+        try {
+            Map<String, Object> projects = projectService.getList(projectFilterVo);
+            return R.ok(projects);
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+
+
+
+    }
+
+
+
+
+
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/TdgyController.java

@@ -6,6 +6,7 @@ import com.siwei.apply.domain.res.TdgyRes;
 import com.siwei.apply.domain.vo.TdgyUpdateVo;
 import com.siwei.apply.domain.vo.TdgyVo;
 import com.siwei.apply.service.NodeLandService;
+import com.siwei.apply.service.ProjectService;
 import com.siwei.apply.service.TdgyService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
@@ -30,6 +31,8 @@ public class TdgyController extends BaseController {
     private TdgyService tdgyService;
     @Autowired
     NodeLandService nodeLandService;
+    @Autowired
+    ProjectService projectService;
     /**
      * 添加土地供应
      */
@@ -112,6 +115,7 @@ public class TdgyController extends BaseController {
     public R<Void> updateHasOnchain(@RequestBody Map<String, Object> params) {
         try {
             String id = (String) params.get("id");
+            String projectId = (String) params.get("projectId");
             Boolean hasOnchain = (Boolean) params.get("hasOnchain");
             if (StringUtils.isBlank(id)) {
                 return R.fail("nodeId不能为空");
@@ -122,6 +126,8 @@ public class TdgyController extends BaseController {
             }
 
             tdgyService.updateHasOnchain(id, hasOnchain);
+            // 更新项目表的上链数量
+            projectService.countOnChinaNum(projectId);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/TdhyhsController.java

@@ -7,6 +7,7 @@ import com.siwei.apply.domain.vo.OnChainVo;
 import com.siwei.apply.domain.vo.TdhyhsUpdateVo;
 import com.siwei.apply.domain.vo.TdhyhsVo;
 import com.siwei.apply.service.NodeLandService;
+import com.siwei.apply.service.ProjectService;
 import com.siwei.apply.service.TdhyhsService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
@@ -30,6 +31,8 @@ public class TdhyhsController extends BaseController {
     private TdhyhsService tdhyhsService;
     @Autowired
     NodeLandService nodeLandService;
+    @Autowired
+    ProjectService projectService;
     /**
      * 添加土地核验与规划核实
      */
@@ -110,6 +113,8 @@ public class TdhyhsController extends BaseController {
             for (String id : onChainVo.getIds()) {
                 tdhyhsService.updateHasOnchain(id, onChainVo.getHasOnchain());
             }
+            // 更新项目表的上链数量
+            projectService.countOnChinaNum(onChainVo.getProjectId());
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/YdbpController.java

@@ -5,6 +5,7 @@ import com.siwei.apply.domain.res.YdbpRes;
 import com.siwei.apply.domain.vo.YdbpUpdateVo;
 import com.siwei.apply.domain.vo.YdbpVo;
 import com.siwei.apply.service.NodeLandService;
+import com.siwei.apply.service.ProjectService;
 import com.siwei.apply.service.YdbpService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
@@ -27,6 +28,8 @@ public class YdbpController extends BaseController {
     private YdbpService ydbpService;
     @Autowired
     NodeLandService nodeLandService;
+    @Autowired
+    ProjectService projectService;
     /**
      * 添加用地报批
      */
@@ -96,6 +99,7 @@ public class YdbpController extends BaseController {
     public R<Void> updateHasOnchain(@RequestBody Map<String, Object> params) {
         try {
             String id = (String) params.get("id");
+            String projectId = (String) params.get("projectId");
             Boolean hasOnchain = (Boolean) params.get("hasOnchain");
             if (StringUtils.isBlank(id)) {
                 return R.fail("nodeId不能为空");
@@ -105,6 +109,8 @@ public class YdbpController extends BaseController {
                 return R.fail(502,"数据空间信息不存在，请检查先导入空间数据");
             }
             ydbpService.updateHasOnchain(id, hasOnchain);
+            // 更新项目表的上链数量
+            projectService.countOnChinaNum(projectId);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/YdysyxzController.java

@@ -5,6 +5,7 @@ import com.siwei.apply.domain.res.YdysyxzRes;
 import com.siwei.apply.domain.vo.YdysyxzUpdateVo;
 import com.siwei.apply.domain.vo.YdysyxzVo;
 import com.siwei.apply.service.NodeLandService;
+import com.siwei.apply.service.ProjectService;
 import com.siwei.apply.service.YdysyxzService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
@@ -27,6 +28,11 @@ public class YdysyxzController extends BaseController {
     private YdysyxzService ydysyxzService;
     @Autowired
     NodeLandService nodeLandService;
+    @Autowired
+    ProjectService projectService;
+
+
+
     /**
      * 添加用地预审与选址信息
      */
@@ -98,6 +104,7 @@ public class YdysyxzController extends BaseController {
     public R<Void> updateHasOnchain(@RequestBody Map<String, Object> params) {
         try {
             String id = (String) params.get("id");
+            String projectId = (String) params.get("projectId");
             Boolean hasOnchain = (Boolean) params.get("hasOnchain");
             if (StringUtils.isBlank(id)) {
                 return R.fail("nodeId不能为空");
@@ -107,6 +114,8 @@ public class YdysyxzController extends BaseController {
                 return R.fail(502,"数据空间信息不存在，请检查先导入空间数据");
             }
             ydysyxzService.updateHasOnchain(id, hasOnchain);
+            // 更新项目表的上链数量
+            projectService.countOnChinaNum(projectId);
             return R.ok();
         } catch (Exception e) {
             return R.fail(e.getMessage());

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Project.java

@@ -23,5 +23,7 @@ public class Project extends BaseId {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateAt;
     private Integer projectType;
+    private Integer onChainNum;
     private String creatorId;
+
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/OnChainVo.java

@@ -12,4 +12,5 @@ import java.util.List;
 public class OnChainVo {
     private List<String> ids = new ArrayList<>();
     private Boolean hasOnchain = false;
+    private String projectId = "";
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/ProjectFilterVo.java

@@ -18,6 +18,8 @@ public class ProjectFilterVo {
      */
     private Integer projectType;
 
+    private Integer hasOnchain;
+
     // 分页参数
     private Integer pageNum = 1; // 当前页码
     private Integer pageSize = 10; // 每页条数

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/ProjectVo.java

@@ -8,4 +8,5 @@ public class ProjectVo {
     private String code;
     private String company;
     private Integer projectType;
+    private Integer onChainNum;
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/ProjectWorkflowMapper.java

@@ -63,4 +63,13 @@ public interface ProjectWorkflowMapper {
     List<ProjectWorkflow> selectProjectOneNodeId(@Param("nodeId") String nodeId,@Param("nodeTableName") String nodeTableName);
 
 
+
+    /**
+     *  查询当前项目下的某个节点ID的数据
+     *
+     */
+    List<ProjectWorkflow> selectOnchainInfoByNodeId(@Param("nodeId") String nodeId,@Param("nodeTableName") String nodeTableName);
+
+
+
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/ProjectService.java

@@ -63,5 +63,8 @@ public interface ProjectService {
      * 获取项目周期
      */
     List<ProjectCycleRes> getCycle(String projectId);
+
+    void countOnChinaNum(String projectId);
+
 }
 

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ProjectImpl.java

@@ -1,6 +1,7 @@
 package com.siwei.apply.service.impl;
 
 import com.siwei.apply.domain.Project;
+import com.siwei.apply.domain.ProjectWorkflow;
 import com.siwei.apply.domain.res.*;
 import com.siwei.apply.domain.vo.ProjectFilterVo;
 import com.siwei.apply.domain.vo.ProjectUpdateVo;
@@ -138,5 +139,35 @@ public class ProjectImpl implements ProjectService {
         }
         return workflows;
     }
+
+
+    //根据项目id，更新项目的上链节点数量
+    /**
+     * 1.查询出所有的节点。
+     * 2.根据节点表名和项目id，查询出该节点表中该项目的上链数量。
+     *
+     * @param projectId
+     */
+    @Override
+    public void countOnChinaNum(String projectId) {
+        List<ProjectWorkflow> projectWorkflowList =  projectWorkflowMapper.selectByProjectId(projectId);
+        int onChinaNum = 0;
+        for (ProjectWorkflow projectWorkflow : projectWorkflowList) {
+            String nodeTableName = projectWorkflow.getNodeTableName();
+            String nodeId = projectWorkflow.getNodeId();
+            Boolean hasOnchain = projectWorkflowMapper.isOnchain(nodeId, projectId,nodeTableName);
+            if(hasOnchain.equals(true)){
+                onChinaNum++;
+            }
+        }
+        ProjectUpdateVo updateProject = new ProjectUpdateVo();
+        updateProject.setId(projectId);
+        updateProject.setOnChainNum(onChinaNum);
+        //updateProject.setOnChainNum(onChinaNum);
+        projectMapper.update(updateProject);
+    }
+
+
+
 }
 

siwei-modules/siwei-apply/src/main/resources/mapper/ProjectMapper.xml

@@ -11,6 +11,7 @@
         <result column="created_at" property="createAt"/>
         <result column="updated_at" property="updateAt"/>
         <result column="project_type" property="projectType"/>
+        <result column="on_chain_num" property="onChainNum"/>
         <result column="creator_id" property="creatorId"/>
     </resultMap>
 
@@ -46,6 +47,10 @@
             <if test="projectType != null and projectType != 0">
                 AND project_type = #{projectType}
             </if>
+            <if test="hasOnchain != null and hasOnchain == 1">
+                AND on_chain_num > 0
+            </if>
+
         </where>
         ORDER BY updated_at DESC
         LIMIT #{pageSize} offset #{offset}
@@ -78,6 +83,7 @@
             <if test="code != null">code = #{code},</if>
             <if test="company != null">company = #{company},</if>
             <if test="projectType != null">project_type = #{projectType},</if>
+            <if test="projectType != null">project_type = #{projectType},</if>
             updated_at = now()
         </set>
         WHERE id = #{id}
@@ -102,7 +108,7 @@
             SUM(CASE WHEN project_type = 1 THEN 1 ELSE 0 END) AS singleCount,
             SUM(CASE WHEN project_type = 2 THEN 1 ELSE 0 END) AS batchCount,
             COUNT(*) AS total
-        FROM t_project
+        FROM t_project where on_chain_num>0
     </select>
 
     <select id="selectOtherSupply" resultType="com.siwei.apply.domain.res.ProjectSupplyRes">

siwei-modules/siwei-apply/src/main/resources/mapper/ProjectWorkflowMapper.xml

@@ -122,7 +122,7 @@
                 <if test="projectType != null">
                     EXISTS (
                         SELECT 1 FROM t_project p
-                        WHERE p.id = tpw.project_id AND p.project_type = #{projectType}
+                        WHERE p.id = tpw.project_id AND p.project_type = #{projectType} AND p.on_chain_num > 0
                     )
                 </if>
             </where>
@@ -148,6 +148,14 @@
         WHERE flow1.node_id = #{nodeId}
     </select>
 
+<!--    <select id="selectOnchainInfoByNodeId" resultType="map" parameterType="String">-->
+<!--        SELECT-->
+<!--            id,-->
+<!--            has_onchain as "hasOnchain"-->
+<!--            FROM "public".#{nodeTableName}-->
+<!--            WHERE id = #{nodeId}-->
+<!--        limit 1-->
+<!--    </select>-->
 
 
 

siwei-modules/siwei-apply/src/main/resources/mapper/TdgyMapper.xml

@@ -105,7 +105,7 @@
             <if test="projectType != null">
                 EXISTS (
                     SELECT 1 FROM t_project p
-                    WHERE p.id = td.project_id AND p.project_type = #{projectType}
+                    WHERE p.id = td.project_id AND p.project_type = #{projectType} and p.on_chain_num > 0
                 )
             </if>
         </where>