fix：【数据录入】修改

src/main/java/com/fkzy/warn/common/util/ReportUtil.java

@@ -1017,8 +1017,6 @@ public class ReportUtil {
 
 
         for (LawCase lawCase : caseList) {
-
-
             String slcx = lawCase.getNSlcx();
             String companyName = lawCase.getCompanyName();
             if (slcxCaseCountMap.containsKey(slcx)) {
@@ -1071,7 +1069,6 @@ public class ReportUtil {
         data.setAyNameAmountTop2(sortedCaseReasonAmonts.get(1).getKey());
         data.setAyNameAmountTop3(sortedCaseReasonAmonts.get(2).getKey());
 
-
         // 取出前三的案由
         data.setAyCountTop1(sortedCaseReasons.get(0).getValue());
         data.setAyCountTop2(sortedCaseReasons.get(1).getValue());
@@ -1101,7 +1098,16 @@ public class ReportUtil {
         for(String k:provinceMap.keySet()) {
             enterpriseProvinceList.add(provinceMap.get(k));
         }
-
+        enterpriseProvinceList.sort((o1, o2) -> o2.getAmount().compareTo(o1.getAmount()));
+        List<EnterpriseProvince> topThree = enterpriseProvinceList.subList(0, Math.min(3, enterpriseProvinceList.size()));
+        BigDecimal mapAmount = BigDecimal.ZERO;
+        Integer mapCount = 0;
+        for (EnterpriseProvince ep : topThree) {
+            mapAmount= mapAmount.add(ep.getAmount());
+            mapCount += ep.getCount();
+        }
+        data.setMapAmount(mapAmount);
+        data.setMapCount(mapCount);
         data.setThreeYearsCount(caseList.size());
         data.setThreeYearsAmount(totalAmount);
 

src/main/java/com/fkzy/warn/controller/DataCenterController.java

@@ -24,7 +24,7 @@ import javax.annotation.Resource;
 @Slf4j
 public class DataCenterController {
     @Resource
-    private LawCaseService lawCaseService; ;
+    private LawCaseService lawCaseService;
 
     @RequestMapping(value = "judicialModelSave", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @ApiOperation(value = "司法模型")

src/main/java/com/fkzy/warn/mapper/DictItemMapper.java

@@ -0,0 +1,67 @@
+package com.fkzy.warn.mapper;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.fkzy.warn.model.DictItem;
+import com.fkzy.warn.model.vo.DictItemVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: yuyantian
+ * @Date: 2020/12/7
+ * @description
+ */
+@Mapper
+public interface DictItemMapper extends BaseMapper<DictItem> {
+
+  /**
+   * 批量逻辑删除
+   *
+   * @param dictId 字典id
+   */
+  boolean updateByDictId(@Param("dictIdList") List<String> dictId);
+
+  /**
+   * 根据字典编码查询字典项集合
+   */
+  List<DictItem> getDictItem(@Param("dictCode") String dictCode);
+
+  /**
+   * 根据字典编码查询指定字典项
+   *
+   * @param dictCode 字典编码
+   * @param dictItemCode 字典项编码
+   */
+  DictItemVO findByDictCode(@Param("dictCode") String dictCode,
+                            @Param("dictItemCode") String dictItemCode);
+
+  /**
+   * 根据字典名称查询指定字典项
+   *
+   * @param dictCode 字典编码
+   * @param dictItemName 字典项名称
+   */
+  DictItemVO findByDictName(@Param("dictCode") String dictCode,
+      @Param("dictItemName") String dictItemName);
+
+  /**
+   * 分页
+   */
+  Page<DictItemVO> queryPage(@Param("pagination") Page<DictItem> pagination,
+                                      @Param("map") Map map);
+
+  /**
+   * 分页查询出的数据总条数
+   */
+  long queryListTotal(JSONObject jsonObject);
+
+    List<String> findByDictId(@Param("dictId") Long  dictId);
+
+  String findDictCodeByProductName(@Param("productName")String productName);
+}

src/main/java/com/fkzy/warn/mapper/DictMapper.java

@@ -0,0 +1,40 @@
+package com.fkzy.warn.mapper;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fkzy.warn.model.Dict;
+import com.fkzy.warn.model.vo.DictVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: yuyantian
+ * @Date: 2020/12/7
+ * @description
+ */
+@Mapper
+public interface DictMapper extends BaseMapper<Dict> {
+
+    /**
+     * 分页
+     */
+    Page<DictVO> queryPage(@Param("pagination") Page<DictVO> pagination,
+                           @Param("map") Map map);
+
+    /**
+     * 分页查询出的数据总条数
+     *
+     * @param jsonObject
+     * @return
+     */
+    long queryListTotal(JSONObject jsonObject);
+
+    /**
+     * 批量逻辑删除字典
+     */
+    boolean updateBatch(@Param("idList") List<String> idList);
+}

src/main/java/com/fkzy/warn/model/Dict.java

@@ -0,0 +1,98 @@
+package com.fkzy.warn.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author yuyantian
+ * @date 2023/10/18 10:45
+ * @description  数据字典
+ */
+@TableName("t_sys_dict")
+@Data
+public class Dict extends Model<Dict> {
+    /**
+     * id
+     */
+    @ApiModelProperty("id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 字典名称
+     */
+    @ApiModelProperty("字典名称")
+    @TableField(value = "dict_name")
+    private String dictName;
+
+    /**
+     * 字典code
+     */
+    @ApiModelProperty("字典code")
+    @TableField(value = "dict_code")
+    private String dictCode;
+    
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    @TableField(value = "dict_rank")
+    private String dictRank;
+    /**
+     * 字典描述
+     */
+    @ApiModelProperty("字典描述")
+    @TableField(value = "dict_desc")
+    private String dictDesc;
+    /**
+     * 是否删除：0否1是
+     */
+    @ApiModelProperty("是否删除：0否1是")
+    @TableField(value = "is_del")
+    private Integer isDel;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField(value = "create_time")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty("修改时间")
+    @TableField(value = "edit_time")
+    private String editTime;
+    /**
+     * 删除时间
+     */
+    @ApiModelProperty("删除时间")
+    @TableField(value = "delete_time")
+    private String deleteTime;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField(value = "creator")
+    private String creator;
+    /**
+     * 操作人
+     */
+    @ApiModelProperty("操作人")
+    @TableField(value = "operator")
+    private String operator;
+
+
+    /**
+     * 数据子项
+     */
+    @ApiModelProperty("数据子项")
+    @TableField(exist = false)
+    private List<DictItem> dictItems;
+}

src/main/java/com/fkzy/warn/model/DictItem.java

@@ -0,0 +1,96 @@
+package com.fkzy.warn.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author yuyantian
+ * @date 2023/10/18 10:45
+ * @description  数据字典项
+ */
+@TableName("t_sys_dict_item")
+@Data
+public class DictItem extends Model<DictItem> {
+    /**
+     * id
+     */
+    @ApiModelProperty("id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 字典id
+     */
+    @ApiModelProperty("字典id")
+    @TableField(value = "dict_id")
+    private String dictId;
+    /**
+     * 字典项名称
+     */
+    @ApiModelProperty("字典项名称")
+    @TableField(value = "dict_item_name")
+    private String dictItemName;
+
+    /**
+     * 字典项code
+     */
+    @ApiModelProperty("字典项code")
+    @TableField(value = "dict_item_code")
+    private String dictItemCode;
+    
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    @TableField(value = "dict_item_rank")
+    private Integer dictItemRank;
+    /**
+     * 字典项描述
+     */
+    @ApiModelProperty("字典项描述")
+    @TableField(value = "dict_item_desc")
+    private String dictItemDesc;
+    /**
+     * 是否删除：0否1是
+     */
+    @ApiModelProperty("是否删除：0否1是")
+    @TableField(value = "is_del")
+    private Integer isDel;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField(value = "create_time")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty("修改时间")
+    @TableField(value = "edit_time")
+    private String editTime;
+    /**
+     * 删除时间
+     */
+    @ApiModelProperty("删除时间")
+    @TableField(value = "delete_time")
+    private String deleteTime;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty("创建人")
+    @TableField(value = "creator")
+    private String creator;
+    /**
+     * 操作人
+     */
+    @ApiModelProperty("操作人")
+    @TableField(value = "operator")
+    private String operator;
+}

src/main/java/com/fkzy/warn/model/DishonestInfo.java

@@ -1,5 +1,6 @@
 package com.fkzy.warn.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -54,7 +55,8 @@ public class DishonestInfo extends BaseField{
      * 判决金额估计
      */
     @ApiModelProperty("判决金额估计")
-    private BigDecimal pjje_gj;
+    @TableField(value = "pjje_gj")
+    private BigDecimal pjjeGj;
     /**
      * 移除日期
      */
@@ -103,4 +105,9 @@ public class DishonestInfo extends BaseField{
      */
     @ApiModelProperty("社会信用统一代码")
     private String creditCode;
+    /**
+     * 被执行人的履行情况
+     */
+    @ApiModelProperty("被执行人的履行情况")
+    private String lxqk;
 }

src/main/java/com/fkzy/warn/model/EnterpriseAlarmInfo.java

@@ -34,17 +34,6 @@ public class EnterpriseAlarmInfo extends BaseField{
     @ApiModelProperty("企业法人")
     private String legalPerson;
     /**
-     * 告警次数
-     */
-    @ApiModelProperty("告警次数")
-    private Integer alarmCount;
-    /**
-     * 告警金额
-     */
-    @ApiModelProperty("告警金额")
-    private BigDecimal alarmAmount;
-
-    /**
      * 近三月新发案件数
      */
     @ApiModelProperty("近三月新发案件数")
@@ -226,4 +215,15 @@ public class EnterpriseAlarmInfo extends BaseField{
      */
     @ApiModelProperty("案由名top3")
     private String ayNameAmountTop3;
+    /**
+     * 地域前三总数
+     */
+    @ApiModelProperty("地域前三总数")
+    private Integer mapCount;
+
+    /**
+     * 地域前三总数金额
+     */
+    @ApiModelProperty("地域前三总数金额")
+    private BigDecimal mapAmount;
 }

src/main/java/com/fkzy/warn/model/vo/DictItemVO.java

@@ -0,0 +1,52 @@
+package com.fkzy.warn.model.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuyantian
+ * @date 2023/10/18 10:45
+ * @description  数据字典项vo
+ */
+
+@Data
+public class DictItemVO extends Model<DictItemVO> {
+    /**
+     * id
+     */
+    @ApiModelProperty("id")
+    private Integer id;
+
+    /**
+     * 字典id
+     */
+    @ApiModelProperty("字典id")
+    private String dictId;
+    /**
+     * 字典项名称
+     */
+    @ApiModelProperty("字典项名称")
+    private String dictItemName;
+
+    /**
+     * 字典项code
+     */
+    @ApiModelProperty("字典项code")
+    private String dictItemCode;
+    
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    private Integer dictItemRank;
+    /**
+     * 字典项描述
+     */
+    @ApiModelProperty("字典项描述")
+    @TableField(value = "dict_item_desc")
+    private String dictItemDesc;
+
+
+}

src/main/java/com/fkzy/warn/model/vo/DictVO.java

@@ -0,0 +1,43 @@
+package com.fkzy.warn.model.vo;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author yuyantian
+ * @date 2023/10/18 10:45
+ * @description  数据字典vo
+ */
+@Data
+public class DictVO extends Model<DictVO> {
+    /**
+     * id
+     */
+    @ApiModelProperty("id")
+    private Integer id;
+    /**
+     * 字典名称
+     */
+    @ApiModelProperty("字典名称")
+    private String dictName;
+
+    /**
+     * 字典code
+     */
+    @ApiModelProperty("字典code")
+    private String dictCode;
+    
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    private String dictRank;
+    /**
+     * 字典描述
+     */
+    @ApiModelProperty("字典描述")
+    private String dictDesc;
+
+
+}

src/main/java/com/fkzy/warn/service/impl/LawCaseServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author zhangjing
@@ -86,6 +87,7 @@ public class LawCaseServiceImpl extends ServiceImpl impl
         // 获取近三个月的案件 d_larq 立案日期字段
         QueryWrapper<LawCase> query = new QueryWrapper<>();
         query.ge("d_larq", threeMonthsAgo);
+        query.ge("credit_code", creditCode);
         List<LawCase> caseList = this.list(query);
         if (needLitigant){
             for (LawCase lawCase : caseList) {
@@ -115,6 +117,7 @@ public class LawCaseServiceImpl extends ServiceImpl impl
         // 获取近三个月的案件 d_larq 立案日期字段
         QueryWrapper<LawCase> query = new QueryWrapper<>();
         query.ge("d_larq", threeMonthsAgo);
+        query.ge("credit_code", creditCode);
         List<LawCase> caseList = this.list(query);
         for (LawCase lawCase : caseList) {
             QueryWrapper<LitigantInfo> infoQueryWrapper = new QueryWrapper<>();
@@ -158,13 +161,6 @@ public class LawCaseServiceImpl extends ServiceImpl impl
     private void setAlarmInfo(String creditCode){
         EnterpriseAlarmInfo data = new EnterpriseAlarmInfo();
         data.setCreditCode(creditCode);
-        //告警数
-        QueryWrapper<AlarmCase> alarmCaseQueryWrapper = new QueryWrapper<>();
-        alarmCaseQueryWrapper.eq("credit_code", creditCode);
-        data.setAlarmCount(alarmCaseService.count(alarmCaseQueryWrapper));
-        //告警案件金额
-        List<LawCase> alarmCases = baseMapper.queryByAlarmCase(creditCode);
-        data.setAlarmAmount(ReportUtil.getCaseAmount(alarmCases));
         //近三月案件信息
         List<LawCase> threeMonths = threeMonthsCases(creditCode,false);
         data.setThreeMonthsCount(threeMonths.size());
@@ -182,50 +178,50 @@ public class LawCaseServiceImpl extends ServiceImpl impl
 
     @Override
     public void judicialModelSave(JSONObject jsonObject) {
-//        setAlarmInfo("91440300087909371X");
+        setAlarmInfo("915101007234134581");
 
 //          ReportModel reportModel = createReportData();
 //          ReportUtil.createReport(reportModel);
-//        String filePath = "司法.txt";
-        String filePath = "工商.txt";
+        String filePath = "司法.txt";
+//        String filePath = "工商.txt";
         String jsonOutput = convertTextToJson(filePath);
        if (jsonOutput == null) {
             logger.error("转换失败，JSON 字符串为空");
             return;
         }
         jsonObject = new JSONObject().parseObject(jsonOutput);
-        enterpriseInfoService.industryModelSave(jsonObject);
-//        JSONArray arr = jsonObject.getJSONArray("data");
-//        if (arr == null || arr.isEmpty()) {
-//            logger.error("数据数组为空");
-//            return;
-//        }
-//
-//        JSONObject data = arr.getJSONObject(0);
-//        String info = data.getString("id");
-//        String companyName = null;
-//        String creditCode = null;
-//        if (info != null) {
-//            String[] items = info.split(":");
-//            if (items.length == 2) {
-//                companyName = items[0];
-//                creditCode = items[1];
-//            }
-//        }
-//
-//        // 失信
-//        JSONObject sx = data.getJSONObject("sx");
-//        JSONArray sxbzxrCurrent = sx.getJSONArray("sxbzxr_current");
-//        String finalCompanyName = companyName;
-//        String finalCreditCode = creditCode;
-//        List<DishonestInfo> dishonestInfoList = JSON.parseArray(sxbzxrCurrent.toString(), DishonestInfo.class)
-//            .stream()
-//            .peek(p -> {
-//                p.setCompanyName(finalCompanyName);
-//                p.setCreditCode(finalCreditCode);
-//            })
-//            .collect(Collectors.toList());
-//        dishonestInfoService.saveOrUpdateBatch(dishonestInfoList);
+//        enterpriseInfoService.industryModelSave(jsonObject);
+        JSONArray arr = jsonObject.getJSONArray("data");
+        if (arr == null || arr.isEmpty()) {
+            logger.error("数据数组为空");
+            return;
+        }
+
+        JSONObject data = arr.getJSONObject(0);
+        String info = data.getString("id");
+        String companyName = null;
+        String creditCode = null;
+        if (info != null) {
+            String[] items = info.split(":");
+            if (items.length == 2) {
+                companyName = items[0];
+                creditCode = items[1];
+            }
+        }
+
+        // 失信
+        JSONObject sx = data.getJSONObject("sx");
+        JSONArray sxbzxrCurrent = sx.getJSONArray("sxbzxr_current");
+        String finalCompanyName = companyName;
+        String finalCreditCode = creditCode;
+        List<DishonestInfo> dishonestInfoList = JSON.parseArray(sxbzxrCurrent.toString(), DishonestInfo.class)
+            .stream()
+            .peek(p -> {
+                p.setCompanyName(finalCompanyName);
+                p.setCreditCode(finalCreditCode);
+            })
+            .collect(Collectors.toList());
+        dishonestInfoService.saveOrUpdateBatch(dishonestInfoList);
 //
 //        // 八类案件
 //        JSONObject detail = data.getJSONObject("detail");
@@ -289,9 +285,9 @@ public class LawCaseServiceImpl extends ServiceImpl impl
         }
 
 
-//        if (!caseList.isEmpty()) {
-//            saveOrUpdateCases(caseList);
-//        }
+        if (!caseList.isEmpty()) {
+            saveOrUpdateCases(caseList);
+        }
         if (!litigantInfoList.isEmpty()) {
             QueryWrapper<LitigantInfo> queryWrapper = new QueryWrapper<>();
             queryWrapper.in("n_ajbs", nAjbsList);

src/main/resources/mapper/DictItemMapper.xml

@@ -0,0 +1,119 @@
+<?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.smyq.app.mapper.DictItemMapper">
+
+  <!--数据字典项-->
+  <resultMap id="dictItem_result" type="com.fkzy.warn.model.vo.DictItemVO">
+    <result column="id" property="id" jdbcType="INTEGER"/>
+    <result column="dict_id" property="dictId" jdbcType="VARCHAR"/>
+    <result column="dict_item_name" property="dictItemName" jdbcType="VARCHAR"/>
+    <result column="dict_item_code" property="dictItemCode" jdbcType="VARCHAR"/>
+    <result column="dict_item_desc" property="dictItemDesc" jdbcType="VARCHAR"/>
+    <result column="dict_item_rank" property="dictItemRank" jdbcType="INTEGER"/>
+
+    
+  </resultMap>
+
+  <update id="updateByDictId">
+    <foreach collection="dictIdList" index="index" item="id" open="" separator=";" close="">
+      update t_sys_dict_item
+      <set>
+        is_del=1
+      </set>
+      WHERE dict_id=#{id}
+    </foreach>
+  </update>
+
+  <select id="getDictItem" resultMap="dictItem_result">
+    SELECT
+    dt.id,
+    dt.dict_id,
+    dt.dict_item_name,
+    dt.dict_item_code,
+    dt.dict_item_desc,
+    dt.dict_item_rank,
+    dt.is_del,
+    dt.create_time
+    FROM
+    t_sys_dict_item dt,
+    t_sys_dict d
+    WHERE
+    d.id = dt.dict_id
+
+    <if test="dictCode !=null">
+      AND d.dict_code = #{dictCode}
+    </if>
+    ORDER BY
+    dt.dict_item_rank ASC;
+  </select>
+
+  <select id="findByDictCode" resultMap="dictItem_result">
+    SELECT
+    dt.id,
+    dt.dict_id,
+    dt.dict_item_name,
+    dt.dict_item_code,
+    dt.dict_item_desc,
+    dt.dict_item_rank,
+    dt.is_del,
+    dt.create_time
+    FROM
+    t_sys_dict_item dt,
+    t_sys_dict d
+    WHERE
+    d.id = dt.dict_id
+    AND d.dict_code= #{dictCode}
+    AND dt.dict_item_code = #{dictItemCode}
+
+    ORDER BY
+    dt.dict_item_rank ASC
+  </select>
+
+  <select id="findByDictName" resultMap="dictItem_result">
+    SELECT
+    dt.id,
+    dt.dict_id,
+    dt.dict_item_name,
+    dt.dict_item_code,
+    dt.dict_item_desc,
+    dt.dict_item_rank,
+    dt.is_del,
+    dt.create_time
+    FROM
+    t_sys_dict_item dt,
+    t_sys_dict d
+    WHERE
+    d.id = dt.dict_id
+    AND d.dict_code= #{dictCode}
+    AND dt.dict_item_name = #{dictItemName}
+
+    ORDER BY
+    dt.dict_item_rank ASC
+  </select>
+
+  <select id="queryPage" resultMap="dictItem_result">
+   select
+     id,
+     dict_id ,
+     dict_item_name ,
+     dict_item_code ,
+     dict_item_desc ,
+     dict_item_rank ,
+     is_del ,
+     create_time
+    FROM
+    t_sys_dict_item as a
+    WHERE is_del=0
+      AND dict_id =#{map.id}
+
+  </select>
+    <select id="findByDictId" resultType="java.lang.String">
+      select dict_item_name from t_sys_dict_item where dict_id = #{dictId}
+    </select>
+  <select id="findDictCodeByProductName" resultType="java.lang.String">
+    select dict_item_code from t_sys_dict_item where dict_item_name = #{productName}
+  </select>
+
+
+</mapper>

src/main/resources/mapper/DictMapper.xml

@@ -0,0 +1,65 @@
+<?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.smyq.app.mapper.DictMapper">
+  <!--数据字典-->
+  <resultMap id="dict_result" type="com.fkzy.warn.model.vo.DictVO">
+    <result column="id" property="id" jdbcType="INTEGER"/>
+    <result column="dict_name" property="dictName" jdbcType="VARCHAR"/>
+    <result column="dict_code" property="dictCode" jdbcType="VARCHAR"/>
+    <result column="dict_rank" property="dictRank" jdbcType="INTEGER"/>
+    <result column="dict_desc" property="dictDesc" jdbcType="VARCHAR"/>
+ 
+  </resultMap>
+
+  <select id="queryPage" resultMap="dict_result">
+
+    SELECT
+    *
+    FROM
+    t_sys_dict
+    WHERE
+    is_del = 0
+    
+    <if test="null !=map.dictCode">
+      AND dict_code LIKE '%${map.dictCode}%'
+    </if>
+    <if test=" null !=map.dictName">
+      AND dict_name LIKE '%${map.dictName}%'
+    </if>
+
+    UNION
+    SELECT
+    *
+    FROM
+    t_sys_dict
+    WHERE
+    is_del = 0
+
+    AND id IN ( SELECT dict_id as id FROM t_sys_dict_item WHERE is_del = 0
+    <if test="null !=map.dictCode">
+      AND dict_item_code LIKE '%${map.dictCode}%'
+    </if>
+    <if test=" null !=map.dictName">
+      AND dict_item_name LIKE '%${map.dictName}%'
+    </if>
+    )
+
+
+  </select>
+
+
+
+
+  <update id="updateBatch">
+    <foreach collection="idList" index="index" item="id" open="" separator=";" close="">
+      update t_sys_dict
+      <set>
+        is_del =1
+      </set>
+      WHERE id=#{id}
+    </foreach>
+  </update>
+
+
+</mapper>