预赋码更新宗地变化列表

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/CadastreManageController.java

@@ -6,6 +6,7 @@ import com.siwei.apply.domain.FzssFxrwrz;
 import com.siwei.apply.domain.LayerAndDbData;
 import com.siwei.apply.domain.MdbAndDbData;
 import com.siwei.apply.domain.RowUpdateContent;
+import com.siwei.apply.domain.cadastre.Zdbhqk;
 import com.siwei.apply.domain.vo.*;
 import com.siwei.apply.service.cadastre.CadastreManageService;
 import com.siwei.apply.service.cadastre.IZymlService;
@@ -464,4 +465,29 @@ public class CadastreManageController extends BaseController {
     }
 
 
+    /**
+     * 宗地变化情况结果
+     * @param zddm
+     * @param bdcdyh
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/zdbhqk/list")
+    public  R<?> zdbhqkList(
+            @RequestParam(value = "zddm",required = false) String zddm,
+            @RequestParam(value = "bdcdyh",required = false) String bdcdyh,
+            @RequestParam(value = "pageNum", required = false) Integer pageNum,
+            @RequestParam(value = "pageSize", required = false) Integer pageSize) {
+        try {
+            startPage();
+            List<Zdbhqk>  resList = cadastreManageService.zdbhqkList(zddm,bdcdyh);
+            return R.ok(getDataTable(resList));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.fail(e.getMessage());
+        }
+    }
+
+
 }

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

@@ -25,14 +25,14 @@ public interface LandOneCodeMapper {
     void updateCodeByProjectWorkflowId(LandOneCode entity);
 
 
+    void updateCodeByProjectId(String projectId,String resourceImmobileCode);
+
+
     // 根据主键ID查询
     LandOneCode getByWorkflowId(@Param("workflowId") String workflowId);
 
 
-
     LandOneCode getByProjectId(@Param("projectId") String projectId);
 
 
-
-
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/cadastre/ZdbhqkMapper.java

@@ -29,6 +29,8 @@ public interface ZdbhqkMapper {
      */
     List<Zdbhqk> getList();
 
+    List<Zdbhqk> selectZdbhqkList(@Param("zddm") String zddm,@Param("bdcdyh") String bdcdyh);
+
     /**
      * 更新不动产权属变更记录
      */

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/cadastre/CadastreManageService.java

@@ -4,6 +4,7 @@ import com.siwei.apply.domain.CadastreFile;
 import com.siwei.apply.domain.FzssFxrwrz;
 import com.siwei.apply.domain.LayerAndDbData;
 import com.siwei.apply.domain.MdbAndDbData;
+import com.siwei.apply.domain.cadastre.Zdbhqk;
 import com.siwei.apply.domain.vo.CadastreFileFilterVo;
 import com.siwei.apply.domain.vo.CheckInfoResultVo;
 import com.siwei.apply.domain.vo.CompareResultVo;
@@ -70,4 +71,8 @@ public interface CadastreManageService {
 
     String getQlrList(String name);
 
+    List<Zdbhqk> zdbhqkList(String zddm, String bdcdyh);
+
+
+
 }

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

@@ -2018,5 +2018,12 @@ public class CadastreManageServiceImpl implements CadastreManageService {
     }
 
 
+    @Override
+    public List<Zdbhqk> zdbhqkList(String zddm,String bdcdyh) {
+        // 名称为空直接返回空
+        List<Zdbhqk> list = zdbhqkMapper.selectZdbhqkList(zddm,bdcdyh);
+        return  list;
+    }
+
 
 }

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

@@ -192,7 +192,6 @@ public class DecisionTaskServiceImpl implements DecisionTaskService {
      * @param taskId
      * @return
      */
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public List<DecisionDetailsVo> detailsList(String taskId) {
         if (StringUtils.isBlank(taskId)) {

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

@@ -74,7 +74,8 @@ public class TakeDataServiceImpl implements TakeDataService {
     @Autowired
     private FwmxMapper fwmxMapper;
 
-
+    @Autowired
+    private  LandOneCodeMapper landOneCodeMapper;
 
     @Override
     public String add(TakeDataAddVo takeDataAddVo) {
@@ -82,8 +83,6 @@ public class TakeDataServiceImpl implements TakeDataService {
         return "1";
     }
 
-
-
     /**
      * 同步土地或房屋首次登记数据
      * @param projectId
@@ -785,11 +784,16 @@ public class TakeDataServiceImpl implements TakeDataService {
             updateVo.setTbzt("1");
             thirdRecordStatusMapper.updateById(updateVo);
 
-            //这里需要更新绑定关系
-            ProjectImmobileCode updateImmobileCode = new ProjectImmobileCode();
-            updateImmobileCode.setCode(bdcdyh);
-            updateImmobileCode.setPreAssignCode(yfbdcdyh);
-            projectImmobileCodeMapper.updateByPreCode(updateImmobileCode);
+            ProjectImmobileCode immobileCodeRes = projectImmobileCodeMapper.selectByPreAssignCode(yfbdcdyh);
+            if(Objects.nonNull(immobileCodeRes)){
+                //这里需要更新绑定关系
+                ProjectImmobileCode updateImmobileCode = new ProjectImmobileCode();
+                updateImmobileCode.setCode(bdcdyh);
+                projectImmobileCodeMapper.updateById(updateImmobileCode);
+                //这里需要更新当前项目的不动产登记号(保证资源码正确)
+                String projectId = immobileCodeRes.getProjectId();
+                landOneCodeMapper.updateCodeByProjectId(projectId,bdcdyh);
+            }
             return body.getId();
         }).exceptionally(e -> {
             log.error("不动产远程抓取数据失败: ywh={}, ywlx={}", ywh, ywlx, e);

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

@@ -76,4 +76,11 @@
             resource_project_code = #{resourceProjectCode}
         WHERE project_workflow_id = #{projectWorkflowId}
     </update>
+
+    <update id="updateCodeByProjectId" parameterType="com.siwei.apply.domain.LandOneCode">
+        UPDATE t_land_one_code
+        SET resource_immobile_code = #{resourceImmobileCode},
+        WHERE project_id = #{projectId}
+    </update>
+
 </mapper>

siwei-modules/siwei-apply/src/main/resources/mapper/cadastre/ZdbhqkMapper.xml

@@ -39,6 +39,20 @@
         WHERE valid_flag = 0
     </select>
 
+    <select id="selectZdbhqkList"  resultMap="BaseResultMap">
+        SELECT *
+        FROM  vector.zdbhqk
+        where  valid_flag = 0
+        <if test="zddm != null and zddm != ''">
+            and zddm = #{zddm}
+        </if>
+        <if test="bdcdyh != null and bdcdyh != ''">
+            and bdcdyh = #{bdcdyh}
+        </if>
+        ORDER BY ywh DESC
+    </select>
+
+
     <update id="update" parameterType="com.siwei.apply.domain.cadastre.Zdbhqk">
         UPDATE vector.zdbhqk
         <set>