新增土地流转信息，调整农事审核信息

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsBlockController.java

@@ -78,7 +78,6 @@ public class FmsBlockController extends BaseController
             fmsBlock.setDataFilter(true);
             fmsBlock.setBlockIds(strings);
         }
-
         startPage();
         fmsBlock.setTid(SecurityUtils.getTid());
         List<FmsBlock> list = fmsBlockService.selectFmsBlockList(fmsBlock);

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsExpertController.java

@@ -11,6 +11,7 @@ import com.yunfeiyun.agmp.common.framework.manager.ResManager;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
+import com.yunfeiyun.agmp.common.web.system.service.ISysResService;
 import com.yunfeiyun.agmp.fms.domain.FmsExpert;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsExpertAddReqVo;
 import com.yunfeiyun.agmp.fms.domain.reqvo.FmsExpertQueryParam;
@@ -41,6 +42,8 @@ public class FmsExpertController extends BaseController
     private IFmsExpertService fmsExpertService;
     @Resource
     private ResManager resManager;
+    @Resource
+    private ISysResService sysResService;
 
     /**
      * 查询专家列表

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsTaskController.java

@@ -278,7 +278,6 @@ public class FmsTaskController extends BaseController
         }
 
         LoginUser loginUser = getLoginUser();
-
         FmsTask fmsTask = new FmsTask();
         BeanUtils.copyProperties(reqVo, fmsTask);
         fmsTask.setTid(SecurityUtils.getTid());
@@ -290,7 +289,6 @@ public class FmsTaskController extends BaseController
         fmsTask.setTaskStatus(TaskStatus.EXECUTING.getCode());//执行中
         fmsTask.setTaskCreatetype(CommonEnums.TASK_CREATE_TYPE_MOVE.getCode());
         fmsTask.setTaskAudittype(CommonEnums.TASK_AUDIT_TYPE_DOWN.getCode());
-
         String title = "";
         String context = "";
         String farmType = "";

src/main/java/com/yunfeiyun/agmp/fms/controller/SysCustomerController.java

@@ -11,6 +11,7 @@ import com.yunfeiyun.agmp.common.framework.manager.ResManager;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.common.web.system.domain.SysRes;
+import com.yunfeiyun.agmp.common.web.system.service.ISysResService;
 import com.yunfeiyun.agmp.fms.domain.SysCustomer;
 import com.yunfeiyun.agmp.fms.domain.reqvo.SysCustomerEditReqVo;
 import com.yunfeiyun.agmp.fms.domain.resvo.SysCustomerExportResVo;
@@ -41,6 +42,8 @@ public class SysCustomerController extends BaseController
     private ISysCustomerService sysCustomerService;
     @Resource
     private ResManager resManager;
+    @Resource
+    private ISysResService sysResService;
 
     /**
      * 查询客户列表
@@ -90,7 +93,10 @@ public class SysCustomerController extends BaseController
     public AjaxResult add(@RequestBody SysCustomerEditReqVo sysCustomerEditReqVo) {
         sysCustomerEditReqVo.setCustomerId(sysCustomerEditReqVo.getId());
         sysCustomerEditReqVo.setCustomerDelstatus(0);
-        resManager.updateRes(sysCustomerEditReqVo.getResId(),sysCustomerEditReqVo.getCustomerId());
+        SysRes sysRes = new SysRes();
+        sysRes.setResId(sysCustomerEditReqVo.getResId());
+        sysRes.setResBusId(sysCustomerEditReqVo.getCustomerId());
+        sysResService.updateSysRes(sysRes);
         return toAjax(sysCustomerService.insertSysCustomer(sysCustomerEditReqVo));
     }
 
@@ -101,7 +107,10 @@ public class SysCustomerController extends BaseController
     @Log(title = "客户", businessType = BusinessType.UPDATE)
     @PutMapping("/edit")
     public AjaxResult edit(@RequestBody SysCustomerEditReqVo sysCustomerEditReqVo) {
-        resManager.updateRes(sysCustomerEditReqVo.getResId(),sysCustomerEditReqVo.getCustomerId());
+        SysRes sysRes = new SysRes();
+        sysRes.setResId(sysCustomerEditReqVo.getResId());
+        sysRes.setResBusId(sysCustomerEditReqVo.getCustomerId());
+        sysResService.updateSysRes(sysRes);
         return toAjax(sysCustomerService.updateSysCustomer(sysCustomerEditReqVo));
     }
 

src/main/java/com/yunfeiyun/agmp/fms/domain/FmsBlock.java

@@ -5,8 +5,6 @@ import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
 import com.yunfeiyun.agmp.common.utils.DictUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -86,11 +84,15 @@ public class FmsBlock extends BaseEntity
 
     @Excel(name = "租户标识")
     private String tid;
-
+    @Excel(name = "土地是否流转信息")
+    private String blockIstransfer;
+    @Excel(name = "土地承租人信息")
+    private String blockTransferinfo;
+    @Excel(name = "土地所有人信息")
+    private String blockOwnerinfo;
 
     /**序号*/
     private Integer blockSeq;
-
     /** 地块名称,用于查询时等于 */
     private String blockNameEq;
 

src/main/java/com/yunfeiyun/agmp/fms/mapper/FmsBlockMapper.java

@@ -52,37 +52,13 @@ public interface FmsBlockMapper
 
 
     /**
-     * 新增地块
-     * 
-     * @param fmsBlock 地块
-     * @return 结果
-     */
-    public int insertFmsBlock(FmsBlock fmsBlock);
-
-    /**
      * 修改地块
      * 
      * @param fmsBlock 地块
      * @return 结果
      */
     public int updateFmsBlock(FmsBlock fmsBlock);
-    public int updateFmsBlockBatch(List<FmsBlock> fmsBlocks);
-
-    /**
-     * 删除地块
-     * 
-     * @param blockId 地块主键
-     * @return 结果
-     */
-    public int deleteFmsBlockByBlockId(@Param("blockId") String blockId, @Param("tid") String tid);
 
-    /**
-     * 批量删除地块
-     * 
-     * @param blockIds 需要删除的数据主键集合
-     * @return 结果
-     */
-    public int deleteFmsBlockByBlockIds(@Param("array") String[] blockIds, @Param("tid") String tid);
 
     public int selectValidDataNumber(@Param("blockId") String blockId, @Param("tid") String tid);
 

src/main/java/com/yunfeiyun/agmp/fms/service/IFmsBlockService.java

@@ -36,13 +36,6 @@ public interface IFmsBlockService
      */
     public List<FmsBlock> selectFmsBlockList(FmsBlock fmsBlock);
 
-    /**
-     * 新增地块
-     * 
-     * @param fmsBlock 地块
-     * @return 结果
-     */
-    public AjaxResult insertFmsBlock(FmsBlock fmsBlock, FmsLand fmsLand);
 
     /**
      * 修改地块
@@ -52,21 +45,7 @@ public interface IFmsBlockService
      */
     public AjaxResult updateFmsBlock(FmsBlock fmsBlock, FmsLand fmsLand);
 
-    /**
-     * 批量删除地块
-     * 
-     * @param blockIds 需要删除的地块主键集合
-     * @return 结果
-     */
-    public AjaxResult deleteFmsBlockByBlockIds(String[] blockIds, String tid);
 
-    /**
-     * 删除地块信息
-     * 
-     * @param blockId 地块主键
-     * @return 结果
-     */
-    public int deleteFmsBlockByBlockId(String blockId, String tid);
 
     Integer selectCountByLandId(String landId, String tid);
 

src/main/java/com/yunfeiyun/agmp/fms/service/IFmsPlanService.java

@@ -79,7 +79,7 @@ public interface IFmsPlanService
     public int updateFmsPlan(FmsPlan fmsPlan, FmsBlock fmsBlock);
 
     public int updateFmsPlanBatch(List<FmsPlan> fmsPlans);
-    public int updateFmsPlanBatch(List<FmsPlan> fmsPlans, List<FmsBlock> fmsBlocks);
+
     /**
      * 批量删除种植计划
      * 

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsBlockServiceImpl.java

@@ -75,50 +75,6 @@ public class FmsBlockServiceImpl implements IFmsBlockService
         return fmsBlockMapper.selectFmsBlockList(fmsBlock);
     }
 
-    /**
-     * 新增地块
-     * 
-     * @param fmsBlock 地块
-     * @return 结果
-     */
-    @Transactional
-    @Override
-    public AjaxResult insertFmsBlock(FmsBlock fmsBlock, FmsLand fmsLand) {
-        //新增地块时，对所属基地的地块数进行更新维护
-        fmsBlock.setBlockId(fmsBlock.getId());
-        fmsBlock.setBlockAreaplant(new BigDecimal("0"));
-        // TODO: 昌黎定制版的地块的租户标识来源于基地标识
-        fmsBlock.setTid(SecurityUtils.getTid());
-        int i = fmsBlockMapper.insertFmsBlock(fmsBlock);
-
-        Integer count = fmsBlockMapper.selectCountByLandId(fmsBlock.getLandId(),fmsLand.getLandId());
-        //地块面积不能大于基地面积
-        if (count > 0) {
-            FmsLand fmsLand1 = new FmsLand();
-            fmsLand1.setLandId(fmsBlock.getLandId());
-            BigDecimal sum = fmsBlockMapper.selectSumAreaByLandId(fmsLand1);
-            if (sum.compareTo(fmsLand.getLandArea()) == 1) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-
-//                return AjaxResult.error(ErrorCode.INVALID_PARAMETER.getCode());
-                return AjaxResult.error(ErrorCode.INVALID_PARAMETER_AREA.getCode(), ErrorCode.INVALID_PARAMETER_AREA.getMessage());
-            }
-        }
-        fmsLand.setLandBlockcount(Long.valueOf(count));
-        fmsLand.setTid(SecurityUtils.getTid());
-        fmsLandMapper.updateFmsLand(fmsLand);
-
-        String resIdsStr = fmsBlock.getResIds();
-        if (!StringUtils.isEmpty(resIdsStr)) {
-            String[] resIds = resIdsStr.split(",");
-            for (String resId : resIds) {
-                SysRes sysRes = sysResMapper.selectSysResByResId(resId);
-                sysRes.setResBusId(fmsBlock.getBlockId());
-                sysResMapper.updateSysRes(sysRes);
-            }
-        }
-        return AjaxResult.success();
-    }
 
     /**
      * 修改地块
@@ -159,39 +115,6 @@ public class FmsBlockServiceImpl implements IFmsBlockService
         return AjaxResult.success();
     }
 
-    /**
-     * 批量删除地块
-     * 
-     * @param blockIds 需要删除的地块主键
-     * @return 结果
-     */
-    @Transactional
-    @Override
-    public AjaxResult deleteFmsBlockByBlockIds(String[] blockIds, String tid) {
-        //获取批量删除地块的所包含的基地
-        List<FmsLand> fmsLands = fmsBlockMapper.selectFmsLandByBlockIds(blockIds,tid);
-        fmsBlockMapper.deleteFmsBlockByBlockIds(blockIds,tid);
-        for (FmsLand fmsLand : fmsLands) {
-            String landId = fmsLand.getLandId();
-            Integer count = fmsBlockMapper.selectCountByLandId(landId,tid);
-            fmsLand.setLandBlockcount(Long.valueOf(count));
-//            fmsLandMapper.updateFmsLand(fmsLand);
-        }
-        fmsLandMapper.updateFmsLandBatch(fmsLands);
-        return AjaxResult.success();
-    }
-
-    /**
-     * 删除地块信息
-     * 
-     * @param blockId 地块主键
-     * @return 结果
-     */
-    @Override
-    public int deleteFmsBlockByBlockId(String blockId, String tid) {
-        return fmsBlockMapper.deleteFmsBlockByBlockId(blockId,tid);
-    }
-
     @Override
     public Integer selectCountByLandId(String landId, String tid) {
         return fmsBlockMapper.selectCountByLandId(landId,tid);

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsPlanServiceImpl.java

@@ -199,13 +199,6 @@ public class FmsPlanServiceImpl implements IFmsPlanService {
         return fmsPlanMapper.updateFmsPlanBatch(fmsPlans);
     }
 
-    @Transactional
-    @Override
-    public int updateFmsPlanBatch(List<FmsPlan> fmsPlans, List<FmsBlock> fmsBlocks) {
-        int i = updateFmsPlanBatch(fmsPlans);
-        fmsBlockMapper.updateFmsBlockBatch(fmsBlocks);
-        return i;
-    }
 
     /**
      * 批量删除种植计划

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsTaskrcdServiceImpl.java

@@ -482,7 +482,7 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
         }
         int i = fmsTaskService.updateFmsTask(fmsTask);
         /* 消息通知 */
-        if (i > 0 ) {
+       /* if (i > 0 ) {
             String title = "";
             String context = "";
             PtsMsgBizType type ;
@@ -517,26 +517,26 @@ public class FmsTaskrcdServiceImpl implements IFmsTaskrcdService
 
 
 
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("id", fmsTask.getTaskId());
-            jsonObject.put("taskNo", fmsTask.getTaskNo());
-            jsonObject.put("farmType", farmType);
+            // JSONObject jsonObject = new JSONObject();
+            // jsonObject.put("id", fmsTask.getTaskId());
+            // jsonObject.put("taskNo", fmsTask.getTaskNo());
+            // jsonObject.put("farmType", farmType);
 
 //            MsgbatchContent msgbatchContent = new MsgbatchContent(context);
 //            msgbatchContent.setAppRedirect(url, jsonObject);
 
-            List<String> managers = new ArrayList<>();
-            managers.add(fmsTask.getTaskManager());
+            // List<String> managers = new ArrayList<>();
+            // managers.add(fmsTask.getTaskManager());
 //            messageContentService.sendMsg(title, msgbatchContent,null, type, fmsTask.getTaskId(), managers);
 
-            PtsMessageListReqVo ptsMessageListReqVo = new PtsMessageListReqVo();
-            ptsMessageListReqVo.setBizobj(fmsTaskrcd.getTaskrcdId());
-            ptsMessageListReqVo.setType(PtsMsgBizType.FMS_TASK_AUDIT_MSG_COMMON.getMsgbatchBiztype());
-            List<PtsMsg> ptsMsgList = messageUtil.findPtsMessage(ptsMessageListReqVo);
-            if(!ptsMsgList.isEmpty()){
+            // PtsMessageListReqVo ptsMessageListReqVo = new PtsMessageListReqVo();
+            // ptsMessageListReqVo.setBizobj(fmsTaskrcd.getTaskrcdId());
+            // ptsMessageListReqVo.setType(PtsMsgBizType.FMS_TASK_AUDIT_MSG_COMMON.getMsgbatchBiztype());
+            // List<PtsMsg> ptsMsgList = messageUtil.findPtsMessage(ptsMessageListReqVo);
+            *//*if(!ptsMsgList.isEmpty()){
                 messageUtil.handleMessage(ptsMsgList.get(0).getMsgbatchId());
-            }
-        }
+            }*//*
+        }*/
         return i;
     }
 

src/main/resources/mapper/FmsBlockMapper.xml

@@ -6,11 +6,11 @@
 
     <sql id="selectFmsBlockVo">
         select blockId, landId, blockName, blockType, blockManager, blockManagername, blockArea, blockAreaplant,blockSeq,
-        blockLngrange, blockColor, blockRemark, blockIcon, tid from FmsBlock
+        blockLngrange, blockColor, blockRemark, blockIcon, tid, blockIstransfer, blockTransferinfo, blockOwnerinfo from FmsBlock
     </sql>
 
     <sql id="selectFmsBlockHasResVo">
-        select b.blockId, b.landId, b.blockName, b.blockType, b.blockManager, b.blockManagername, b.blockArea, b.blockSeq, b.blockAreaplant, b.blockLngrange, b.blockColor, b.blockRemark, b.blockIcon,
+        select b.blockId, b.landId, b.blockName, b.blockType, b.blockManager, b.blockManagername, b.blockArea, b.blockSeq, b.blockAreaplant, b.blockLngrange, b.blockColor, b.blockRemark, b.blockIcon,, b.blockIstransfer, b.blockTransferinfo, b.blockOwnerinfo
         (select GROUP_CONCAT(resUrl) from SysRes r where r.resBusId = b.blockId) blockPreview,
         (select GROUP_CONCAT(resId) from SysRes r where r.resBusId = b.blockId) resIds,
         b.tid
@@ -20,6 +20,7 @@
     <sql id="selectFmsBlockHasResVo2">
         select b.blockId, b.landId, b.blockName, b.blockType, b.blockManager, b.blockManagername, b.blockArea,
         b.blockSeq, b.tid, b.blockAreaplant, b.blockLngrange, b.blockColor, b.blockRemark, b.blockIcon, l.landName,
+        b.blockIstransfer, b.blockTransferinfo, b.blockOwnerinfo,
         (select GROUP_CONCAT(c.cropName) from FmsCrop c
         left join FmsPlan p on p.cropId = c.cropId
         where p.blockId = b.blockId) cropName,
@@ -36,7 +37,7 @@
 
 
 
-    <select id="selectFmsBlockList" parameterType="FmsBlock" resultType="FmsBlock">
+    <select id="selectFmsBlockList" parameterType="FmsBlock" resultType="com.yunfeiyun.agmp.fms.domain.FmsBlock">
         <include refid="selectFmsBlockHasResVo"/>
         <where>
             b.tid = #{tid}
@@ -61,7 +62,7 @@
         order by b.blockSeq
     </select>
 
-    <select id="selectFmsBlockByBlockId" parameterType="String" resultType="FmsBlock">
+    <select id="selectFmsBlockByBlockId" parameterType="String" resultType="com.yunfeiyun.agmp.fms.domain.FmsBlock">
         <include refid="selectFmsBlockHasResVo"/>
         <where>
             blockId = #{blockId}
@@ -69,9 +70,10 @@
         </where>
     </select>
 
-    <select id="selectFmsBlockInfoByBlockId" parameterType="String" resultType="FmsBlockResVo">
+    <select id="selectFmsBlockInfoByBlockId" parameterType="String" resultType="com.yunfeiyun.agmp.fms.domain.resvo.FmsBlockResVo">
         SELECT b.blockId, b.landId, b.blockName, b.blockType, b.blockManager, b.blockArea,
             b.blockSeq, b.blockAreaplant, b.blockLngrange, b.blockColor, b.blockRemark, b.blockIcon,
+            b.blockIstransfer, b.blockTransferinfo, b.blockOwnerinfo
             b.tid, l.landName,
             u.userName as blockManagername, (select GROUP_CONCAT(resUrl) from SysRes r where r.resBusId = b.blockId) blockPreview
         from FmsBlock b
@@ -91,29 +93,8 @@
         </where>
     </select>
 
-    <select id="selectCountByPlanStatus" parameterType="SelectCountByPlanStatusReqVo" resultType="Integer">
-        SELECT count(1) FROM
-        (SELECT b.blockId,(SELECT count(1) FROM FmsPlan p
-        <where>
-            p.blockId = b.blockId
-            and p.tid = #{tid}
-            <if test="planStatus != null  and planStatus != ''">
-                and p.planStatus in
-                <foreach collection="planStatus.split(',')" item="item" index="index" open="(" close=")" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-        ) count FROM FmsBlock b
-        <where>
-            b.tid = #{tid}
-            <if test="landId != null  and landId != ''">and b.landId = #{landId}</if>
-        </where>
-        ) tb
-        WHERE tb.count > 0
-    </select>
 
-    <select id="selectSumAreaByLandId" parameterType="FmsLand" resultType="BigDecimal">
+    <select id="selectSumAreaByLandId" parameterType="FmsLand" resultType="java.math.BigDecimal">
         select sum(blockArea) from FmsBlock
         <where>
             tid = #{tid}
@@ -127,7 +108,7 @@
         </where>
     </select>
 
-    <select id="selectSumArea" parameterType="FmsBlockReqVo" resultType="BigDecimal">
+    <select id="selectSumArea" parameterType="FmsBlockReqVo" resultType="java.math.BigDecimal">
         select sum(b.blockArea) from FmsBlock b LEFT JOIN FmsLand l ON b.landId = l.landId WHERE l.landId is not null
         and b.tid = #{tid}
         <if test="landId != null  and landId != ''"> and l.landId = #{landId}</if>
@@ -140,7 +121,7 @@
 
     </select>
 
-    <select id="selectFmsBlockHasPlan" parameterType="FmsBlockReqVo" resultType="FmsBlockResVo">
+    <select id="selectFmsBlockHasPlan" parameterType="FmsBlockReqVo" resultType="com.yunfeiyun.agmp.fms.domain.resvo.FmsBlockResVo">
         select b.* , l.landName,
         tb1.blockPreview,
         tb1.resIds,
@@ -167,129 +148,7 @@
         order by b.blockSeq
     </select>
 
-    <insert id="insertFmsBlock" parameterType="FmsBlock">
-        insert into FmsBlock
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="blockId != null">blockId,</if>
-            <if test="landId != null">landId,</if>
-            <if test="blockName != null">blockName,</if>
-            <if test="blockType != null">blockType,</if>
-            <if test="blockManager != null">blockManager,</if>
-            <if test="blockManagername != null">blockManagername,</if>
-            <if test="blockArea != null">blockArea,</if>
-            <if test="blockAreaplant != null">blockAreaplant,</if>
-            <if test="blockLngrange != null">blockLngrange,</if>
-            <if test="blockColor != null">blockColor,</if>
-            <if test="blockRemark != null">blockRemark,</if>
-            <if test="blockIcon != null">blockIcon,</if>
-            <if test="blockSeq != null">blockSeq,</if>
-            <if test="tid != null">tid,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="blockId != null">#{blockId},</if>
-            <if test="landId != null">#{landId},</if>
-            <if test="blockName != null">#{blockName},</if>
-            <if test="blockType != null">#{blockType},</if>
-            <if test="blockManager != null">#{blockManager},</if>
-            <if test="blockManagername != null">#{blockManagername},</if>
-            <if test="blockArea != null">#{blockArea},</if>
-            <if test="blockAreaplant != null">#{blockAreaplant},</if>
-            <if test="blockLngrange != null">#{blockLngrange},</if>
-            <if test="blockColor != null">#{blockColor},</if>
-            <if test="blockRemark != null">#{blockRemark},</if>
-            <if test="blockIcon != null">#{blockIcon},</if>
-            <if test="blockSeq != null">#{blockSeq},</if>
-            <if test="tid != null">#{tid},</if>
-        </trim>
-    </insert>
-
-    <update id="updateFmsBlock" parameterType="FmsBlock">
-        update FmsBlock
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="landId != null">landId = #{landId},</if>
-            <if test="blockName != null">blockName = #{blockName},</if>
-            <if test="blockType != null">blockType = #{blockType},</if>
-            <if test="blockManager != null">blockManager = #{blockManager},</if>
-            <if test="blockManagername != null">blockManagername = #{blockManagername},</if>
-            <if test="blockArea != null">blockArea = #{blockArea},</if>
-            <if test="blockAreaplant != null">blockAreaplant = #{blockAreaplant},</if>
-            <if test="blockLngrange != null">blockLngrange = #{blockLngrange},</if>
-            <if test="blockColor != null">blockColor = #{blockColor},</if>
-            <if test="blockRemark != null">blockRemark = #{blockRemark},</if>
-            <if test="blockSeq != null">blockSeq =#{blockSeq},</if>
-            <if test="blockIcon != null">blockIcon = #{blockIcon},</if>
-            <if test="tid != null">tid = #{tid},</if>
-        </trim>
-        <where>
-            blockId = #{blockId}
-            and tid = #{tid}
-        </where>
-    </update>
-
-    <update id="updateFmsBlockBatch" parameterType="FmsBlock">
-        <foreach collection="list" item="block" separator=";">
-            update FmsBlock
-            <trim prefix="SET" suffixOverrides=",">
-                <if test="block.landId != null">landId = #{block.landId},</if>
-                <if test="block.blockName != null">blockName = #{block.blockName},</if>
-                <if test="block.blockType != null">blockType = #{block.blockType},</if>
-                <if test="block.blockManager != null">blockManager = #{block.blockManager},</if>
-                <if test="block.blockManagername != null">blockManagername = #{block.blockManagername},</if>
-                <if test="block.blockArea != null">blockArea = #{block.blockArea},</if>
-                <if test="block.blockAreaplant != null">blockAreaplant = #{block.blockAreaplant},</if>
-                <if test="block.blockLngrange != null">blockLngrange = #{block.blockLngrange},</if>
-                <if test="block.blockColor != null">blockColor = #{block.blockColor},</if>
-                <if test="block.blockRemark != null">blockRemark = #{block.blockRemark},</if>
-                <if test="block.blockSeq != null">blockSeq =#{block.blockSeq},</if>
-                <if test="block.blockIcon != null">blockIcon = #{block.blockIcon},</if>
-                <if test="block.tid != null">tid = #{block.tid},</if>
-            </trim>
-            <where>
-                blockId = #{block.blockId}
-                and tid = #{block.tid}
-            </where>
-        </foreach>
-    </update>
-    <update id="updateManagerByBlockIds">
-        update FmsBlock set blockManager = #{manager},blockManagername = #{managerName}
-        <where>
-            blockId in
-            <foreach collection="blockIds" index="index" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-            and tid = #{tid}
-        </where>
-    </update>
-    <update id="clearManagerByManagerId">
-        update FmsBlock set blockManager = null
-        <where>
-            blockManager = #{manager}
-            and tid = #{tid}
-        </where>
-    </update>
-
-    <delete id="deleteFmsBlockByBlockId" parameterType="String">
-        delete from FmsBlock
-        <where>
-            blockId = #{blockId}
-            and tid = #{tid}
-        </where>
-
-    </delete>
-
-    <delete id="deleteFmsBlockByBlockIds" parameterType="String">
-        delete from FmsBlock
-        <where>
-            blockId in
-            <foreach item="blockId" collection="array" open="(" separator="," close=")">
-                #{blockId}
-            </foreach>
-            and tid = #{tid}
-        </where>
-
-    </delete>
-
-    <select id="selectFmsLandByBlockIds" parameterType="String" resultType="FmsLand">
+    <select id="selectFmsLandByBlockIds" parameterType="String" resultType="com.yunfeiyun.agmp.fms.domain.FmsLand">
         select l.* from FmsBlock b LEFT JOIN FmsLand l ON b.landId = l.landId
         <where>
             b.blockId in
@@ -310,55 +169,6 @@
         </trim>
         AS validDataNum
     </select>
-    <select id="selectBlockManagerAndLandManager"
-            resultType="SysUser">
-        select u.userId, u.deptId, u.userLoginname, u.userName, u.userEmail, u.userMobile, u.userLoginpwd, u.userSex, u.userLockstatus, u.userDelstatus, u.userLastloginip, u.userLastlogindate, u.userCreator, u.userCreateddate, u.userRemark,u.userRegion,
-        GROUP_CONCAT(r.roleId) as roleId,
-        GROUP_CONCAT(r.roleName) as roleName,
-        GROUP_CONCAT(r.roleKey) as roleKey,
-        res.resUrl as userAvatar
-        from SysUser u
-        left join SysUserrole ur on u.userId = ur.userId
-        left join SysRole r on r.roleId = ur.roleId
-        left join SysRes res on res.resBusId = u.userId
-        <where>
-            r.roleKey in ('land_admin','block_admin') and u.tid = #{tid}
-            <if test="roleName != null and roleName != ''">and r.roleName like CONCAT('%',#{roleName},'%')</if>
-            <if test="userName != null and userName != ''">and u.userName like CONCAT('%',#{userName},'%')</if>
-            <if test="userLoginname != null and userLoginname !=''">and u.userLoginname = #{userLoginname}</if>
-            <if test="userMobile != null and userMobile !=''">and u.userMobile = #{userMobile}</if>
-        </where>
-        GROUP BY u.userId
-    </select>
-    <select id="selectFmsBlockBaseDataList" resultType="com.yunfeiyun.agmp.fms.domain.FmsBlock">
-        <include refid="selectFmsBlockVo"/>
-        <where>
-            and tid = #{tid}
-            <if test="landId != null  and landId != ''"> and landId = #{landId}</if>
-            <if test="blockName != null  and blockName != ''"> and blockName like concat('%', #{blockName}, '%')</if>
-            <if test="blockNameEq != null  and blockNameEq != ''"> and blockName = #{blockNameEq}</if>
-            <if test="blockType != null  and blockType != ''"> and blockType = #{blockType}</if>
-            <if test="blockManager != null  and blockManager != ''"> and blockManager = #{blockManager}</if>
-            <if test="blockManagername != null  and blockManagername != ''"> and blockManagername like concat('%', #{blockManagername}, '%')</if>
-            <if test="blockArea != null "> and blockArea = #{blockArea}</if>
-            <if test="blockAreaplant != null "> and blockAreaplant = #{blockAreaplant}</if>
-            <if test="blockLngrange != null  and blockLngrange != ''"> and blockLngrange = #{blockLngrange}</if>
-            <if test="blockColor != null  and blockColor != ''"> and blockColor = #{blockColor}</if>
-            <if test="blockRemark != null  and blockRemark != ''"> and blockRemark = #{blockRemark}</if>
-            <if test="dataFilter == true and blockIds !=null and blockIds.size()>0">
-                and blockId in
-                <foreach collection="blockIds" item="blockId" index="index" open="(" close=")" separator=",">
-                    #{blockId}
-                </foreach>
-            </if>
-            <if test="landIds != null and landIds.size()!=0">
-                and landId in
-                <foreach collection="landIds" item="item" index="index" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-        </where>
-    </select>
     <select id="selectFmsBlockListByLandManager" resultType="com.yunfeiyun.agmp.fms.domain.FmsBlock">
         select * from FmsBlock
         where landId in (
@@ -410,5 +220,27 @@
         delete from FmsBlockUser where userId = #{userId} and tid = #{tid}
     </delete>
 
+    <update id="updateFmsBlock" parameterType="FmsBlock">
+        update FmsBlock
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="landId != null">landId = #{landId},</if>
+            <if test="blockName != null">blockName = #{blockName},</if>
+            <if test="blockType != null">blockType = #{blockType},</if>
+            <if test="blockManager != null">blockManager = #{blockManager},</if>
+            <if test="blockManagername != null">blockManagername = #{blockManagername},</if>
+            <if test="blockArea != null">blockArea = #{blockArea},</if>
+            <if test="blockAreaplant != null">blockAreaplant = #{blockAreaplant},</if>
+            <if test="blockLngrange != null">blockLngrange = #{blockLngrange},</if>
+            <if test="blockColor != null">blockColor = #{blockColor},</if>
+            <if test="blockRemark != null">blockRemark = #{blockRemark},</if>
+            <if test="blockSeq != null">blockSeq =#{blockSeq},</if>
+            <if test="blockIcon != null">blockIcon = #{blockIcon},</if>
+            <if test="tid != null">tid = #{tid},</if>
+        </trim>
+        <where>
+            blockId = #{blockId}
+            and tid = #{tid}
+        </where>
+    </update>
 
 </mapper>

src/main/resources/mapper/FmsTaskpickMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.yunfeiyun.agmp.fms.mapper.FmsTaskpickMapper">
 
     <sql id="selectFmsTaskpickVo">
-        select taskpickId, taskId, pickArea, pickWeight, pickDate, pickRemark, pickNo from FmsTaskpick
+        select taskpickId, taskId, pickArea, pickWeight, pickDate, pickRemark, pickNo, tid from FmsTaskpick
     </sql>
 
     <select id="selectFmsTaskpickList" parameterType="FmsTaskPickListReqVo" resultType="FmsTaskPickListResVo">

src/main/resources/mapper/FmsTaskrcdMapper.xml

@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
 
     <sql id="selectFmsTaskrcdVo">
-        select taskrcdId, taskId, warehouseId, taskrcdCompletedate, taskrcdHour, taskrcdWeight, taskrcdSubmitcontent, taskrcdPatrolway, taskrcdAuditstatus, taskrcdAuditdate, taskrcdAuditor, taskrcdAuditcontent, taskrcdExecutor, taskrcdExecutorname from FmsTaskrcd
+        select taskrcdId, taskId, warehouseId, taskrcdCompletedate, taskrcdHour, taskrcdWeight, taskrcdSubmitcontent, taskrcdPatrolway, taskrcdAuditstatus, taskrcdAuditdate, taskrcdAuditor, taskrcdAuditcontent, taskrcdExecutor, taskrcdExecutorname, tid from FmsTaskrcd
     </sql>
 
     <select id="selectTaskrcdList" parameterType="FmsTaskListReqVo" resultType="FmsTaskrcdListDto">