fix:[资源库管理][供试品]

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GspRkjlController.java

@@ -105,6 +105,9 @@ public class GspRkjlController extends BaseController
     @RequiresPermissions("business:resource:gsp:rkxz")
     public AjaxResult save(@RequestBody GspRkjlForm form)
     {
+        if(StringUtils.isEmpty(form.getRkdw())) {
+            return error("请选择入库单位");
+        }
         GspRkjl gspRkjl = gspRkjlService.queryInfo(form);
         if(gspRkjl != null) {
             return error("系统已有记录");
@@ -120,6 +123,9 @@ public class GspRkjlController extends BaseController
     @RequiresPermissions("business:resource:gsp:rkbj")
     public AjaxResult bj(@RequestBody GspRkjlForm form)
     {
+        if(StringUtils.isEmpty(form.getRkdw())) {
+            return error("请选择入库单位");
+        }
         GspRkjl gspRkjl = gspRkjlService.queryInfo(form);
         if(gspRkjl != null && !form.getId().equals(gspRkjl.getId())) {
             return error("系统已有记录");

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gsp.java

@@ -71,11 +71,11 @@ public class Gsp extends MpBaseEntity
 
     /** 有效期 */
     @Compare(name = "有效期", nameEn = "Validity Period")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date yxq;
 
     /** 接收日期 */
-    @Compare(name = "接收日期", nameEn = "Date Received")
+    // @Compare(name = "接收日期", nameEn = "Date Received")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date jsrq;
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspBjForm.java

@@ -50,13 +50,12 @@ public class GspBjForm {
     private String kcdw;
 
     /** 有效期 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @NotNull(message = "请选择有效期")
     private Date yxq;
 
     /** 接收日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @NotNull(message = "请选择接收日期")
     private Date jsrq;
 
     /** 存储条件 */

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gsp/GspForm.java

@@ -50,13 +50,12 @@ public class GspForm {
     private String kcdw;
 
     /** 有效期 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @NotNull(message = "请选择有效期")
     private Date yxq;
 
     /** 接收日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @NotNull(message = "请选择接收日期")
     private Date jsrq;
 
     /** 存储条件 */

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspFfjlMapper.java

@@ -1,6 +1,7 @@
 package com.hxhq.business.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hxhq.business.domain.GspFfjl;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hxhq.business.domain.GspRkjl;
@@ -41,7 +42,7 @@ public interface GspFfjlMapper extends BaseMapper
      * @param queryWrapper
      * @return
      */
-    Map<String, String> getStatisticsUnit(@Param("ew") Wrapper<GspFfjl> queryWrapper);
+    Map<String, String> getStatisticsUnit(@Param("ew") Wrapper<GspFfjl> queryWrapper1, @Param("ew2") Wrapper<GspFfjl> queryWrapper2, @Param("ew3") Wrapper<GspFfjl> queryWrapper3);
     Map<String, Double> getStatistics(@Param("ew") Wrapper<GspFfjl> queryWrapper, @Param("rkldw") String rkldw, @Param("ckldw") String ckldw, @Param("syldw") String syldw);
 
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GspRkjlMapper.java

@@ -1,6 +1,7 @@
 package com.hxhq.business.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hxhq.business.domain.Gsp;
 import com.hxhq.business.domain.GspRkjl;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -18,8 +19,6 @@ import java.util.Map;
 public interface GspRkjlMapper extends BaseMapper<GspRkjl>
 {
 
-
-
     /**
      * 筛选项中出现频率最高的入库单位
      * @param queryWrapper
@@ -34,4 +33,5 @@ public interface GspRkjlMapper extends BaseMapper
      */
     BigDecimal sumRkl(@Param("ew") Wrapper<GspRkjl> queryWrapper);
 
+
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspFfjlServiceImpl.java

@@ -1,6 +1,7 @@
 package com.hxhq.business.service.impl;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -56,13 +57,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
     @Autowired
     private IStudyGspService studyGspService;
 
-    /**
-     * 查询供试品发放记录列表
-     * @return 供试品发放记录
-     */
-    @Override
-    public List<GspFfjlListDto> queryList(GspSearchListForm form)
-    {
+    public QueryWrapper<GspFfjl> getListCondition(GspSearchListForm form) {
         QueryWrapper<GspFfjl> queryWrapper = Wrappers.query();
         queryWrapper.eq("t.del_flag", "0");
         if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
@@ -94,6 +89,17 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
                     .or().apply(" exists(select s.* from t_study s  where find_in_set(s.id, t.`md_ids`) and  s.name like CONCAT('%', {0}, '%'))",form.getMd())
             );
         }
+        return queryWrapper;
+    }
+
+    /**
+     * 查询供试品发放记录列表
+     * @return 供试品发放记录
+     */
+    @Override
+    public List<GspFfjlListDto> queryList(GspSearchListForm form)
+    {
+        QueryWrapper<GspFfjl> queryWrapper = getListCondition(form);
         queryWrapper.orderByDesc("t.id");
         return baseMapper.queryList(queryWrapper);
     }
@@ -200,7 +206,7 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         gspFfjl.setGhzytj(form.getGhzytj());
         // 入库量
         gspFfjl.setRkl(form.getRkl());
-        gspFfjl.setRkldw(form.getRkldw());
+        gspFfjl.setRkldw(gspFfjl.getCkldw());
         // 转换为基础单位的 入库量
         BigDecimal basicRkl = UnitTools.convert2Basic(form.getRkl(), form.getRkldw());
         gspFfjl.setBasicRkl(basicRkl);
@@ -865,41 +871,27 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
 
     @Override
     public Map<String, String> getStatisticsUnit(GspSearchListForm form) {
-        QueryWrapper<GspFfjl> queryWrapper = Wrappers.query();
-        queryWrapper.eq("del_flag", "0");
-        if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
-            queryWrapper.eq("jyzt", form.getJyzt());
-        }
-        if (form.getJlzt() != null && form.getJlzt().intValue() > 0) {
-            queryWrapper.eq("jlzt", form.getJlzt());
-        }
-        if (StringUtils.isNoneBlank(form.getMc())) {
-            queryWrapper.and(p -> p.like("`mc`", form.getMc()));
-        }
-        if (StringUtils.isNoneBlank(form.getBh())) {
-            queryWrapper.and(p -> p.like("`bh`", form.getBh()));
-        }
-        if (StringUtils.isNoneBlank(form.getStartDateCk())) {
-            queryWrapper.and(p -> p.apply("ffrq>={0}", form.getStartDateCk()));
-        }
-        if (StringUtils.isNoneBlank(form.getEndDateCk())) {
-            queryWrapper.apply("ffrq>={0}", form.getStartDateCk());
-        }
-        if (StringUtils.isNoneBlank(form.getStartDateRk())) {
-            queryWrapper.and(p -> p.apply("ghrq>={0}", form.getStartDateRk()));
-        }
-        if (StringUtils.isNoneBlank(form.getEndDateRk())) {
-            queryWrapper.apply("ghrq>={0}", form.getEndDateRk());
-        }
-        return baseMapper.getStatisticsUnit(queryWrapper);
+        QueryWrapper<GspFfjl> queryWrapper1 = getListCondition(form);
+        queryWrapper1.isNotNull("ckldw")
+                .ne("ckldw", "");
+
+        QueryWrapper<GspFfjl> queryWrapper2 = getListCondition(form);
+        queryWrapper2.isNotNull("syldw")
+                .ne("syldw", "");
+
+        QueryWrapper<GspFfjl> queryWrapper3 = getListCondition(form);
+        queryWrapper3.isNotNull("rkldw")
+                .ne("rkldw", "");
+
+        return baseMapper.getStatisticsUnit(queryWrapper1, queryWrapper2, queryWrapper3);
     }
 
     @Override
     public Map<String, String> getStatistics(GspSearchListForm form) {
         Map<String, String> result = new HashMap<>();
-        result.put("ckl", "0");
-        result.put("rkl", "0");
-        result.put("syl", "0");
+        result.put("ckl", "");
+        result.put("rkl", "");
+        result.put("syl", "");
 
         Map<String, String> unitMap = getStatisticsUnit(form);
         if(unitMap == null || unitMap.size() == 0) {
@@ -909,50 +901,61 @@ public class GspFfjlServiceImpl extends ServiceImpl impl
         String syldw = unitMap.get("syldw");
         String rkldw = unitMap.get("rkldw");
 
-        QueryWrapper<GspFfjl> queryWrapper = Wrappers.query();
-        queryWrapper.eq("del_flag", 0);
-        if (form.getJyzt() != null && form.getJyzt().intValue() > 0) {
-            queryWrapper.eq("jyzt", form.getJyzt());
-        }
-        if (form.getJlzt() != null && form.getJlzt().intValue() > 0) {
-            queryWrapper.eq("jlzt", form.getJlzt());
-        }
-        if (StringUtils.isNoneBlank(form.getMc())) {
-            queryWrapper.and(p -> p.like("`mc`", form.getMc()));
-        }
-        if (StringUtils.isNoneBlank(form.getBh())) {
-            queryWrapper.and(p -> p.like("`bh`", form.getBh()));
-        }
-        if (StringUtils.isNoneBlank(form.getStartDateCk())) {
-            queryWrapper.and(p -> p.apply("ffrq>={0}", form.getStartDateCk()));
-        }
-        if (StringUtils.isNoneBlank(form.getEndDateCk())) {
-            queryWrapper.apply("ffrq>={0}", form.getStartDateCk());
-        }
-        if (StringUtils.isNoneBlank(form.getStartDateRk())) {
-            queryWrapper.and(p -> p.apply("ghrq>={0}", form.getStartDateRk()));
-        }
-        if (StringUtils.isNoneBlank(form.getEndDateRk())) {
-            queryWrapper.apply("ghrq>={0}", form.getEndDateRk());
-        }
-        Map<String, Double> map = baseMapper.getStatistics(queryWrapper, rkldw, ckldw, syldw);
+
 
         if(StringUtils.isNotEmpty(rkldw)) {
-            Double rkl = map.get("rkl");
-            BigDecimal rklTotal = UnitTools.convert(new BigDecimal(rkl), rkldw);
-            result.put("rkl", rklTotal.toString() + rkldw);
+            QueryWrapper<GspFfjl> queryWrapper = getListCondition(form);
+            if (Arrays.asList(UnitTools.VOLUME_UNIT_LIST).contains(rkldw)) {
+                queryWrapper.in("rkldw", UnitTools.VOLUME_UNIT_LIST);
+            } else if (Arrays.asList(UnitTools.WEIGHT_UNIT_LIST).contains(rkldw)) {
+                queryWrapper.in("rkldw", UnitTools.WEIGHT_UNIT_LIST);
+            } else {
+                queryWrapper.eq("rkldw", rkldw);
+            }
+            BigDecimal rkl = baseMapper.sumRkl(queryWrapper);
+            if(rkl != null) {
+                rkl = UnitTools.convert(rkl, rkldw);
+                DecimalFormat decimalFormat = new DecimalFormat("#,###.##"); // 定义格式
+                String formatted = decimalFormat.format(rkl);
+                result.put("rkl", formatted + rkldw);
+            }
+
         }
 
         if(StringUtils.isNotEmpty(ckldw)) {
-            Double ckl = map.get("ckl");
-            BigDecimal cklTotal = UnitTools.convert(new BigDecimal(ckl), ckldw);
-            result.put("ckl", cklTotal.toString() + ckldw);
+            QueryWrapper<GspFfjl> queryWrapper = getListCondition(form);
+            if (Arrays.asList(UnitTools.VOLUME_UNIT_LIST).contains(ckldw)) {
+                queryWrapper.in("ckldw", UnitTools.VOLUME_UNIT_LIST);
+            } else if (Arrays.asList(UnitTools.WEIGHT_UNIT_LIST).contains(ckldw)) {
+                queryWrapper.in("ckldw", UnitTools.WEIGHT_UNIT_LIST);
+            } else {
+                queryWrapper.eq("ckldw", ckldw);
+            }
+            BigDecimal ckl = baseMapper.sumCkl(queryWrapper);
+            if(ckl != null) {
+                ckl = UnitTools.convert(ckl, ckldw);
+                DecimalFormat decimalFormat = new DecimalFormat("#,###.##"); // 定义格式
+                String formatted = decimalFormat.format(ckl);
+                result.put("ckl", formatted + ckldw);
+            }
         }
 
         if(StringUtils.isNotEmpty(syldw)) {
-            Double syl = map.get("syl");
-            BigDecimal sylTotal = UnitTools.convert(new BigDecimal(syl), syldw);
-            result.put("syl", sylTotal.toString() + syldw);
+            QueryWrapper<GspFfjl> queryWrapper = getListCondition(form);
+            if (Arrays.asList(UnitTools.VOLUME_UNIT_LIST).contains(syldw)) {
+                queryWrapper.in("syldw", UnitTools.VOLUME_UNIT_LIST);
+            } else if (Arrays.asList(UnitTools.WEIGHT_UNIT_LIST).contains(syldw)) {
+                queryWrapper.in("syldw", UnitTools.WEIGHT_UNIT_LIST);
+            } else {
+                queryWrapper.eq("syldw", syldw);
+            }
+            BigDecimal syl = baseMapper.sumSyl(queryWrapper);
+            if(syl != null) {
+                syl = UnitTools.convert(syl, syldw);
+                DecimalFormat decimalFormat = new DecimalFormat("#,###.##"); // 定义格式
+                String formatted = decimalFormat.format(syl);
+                result.put("syl", formatted + syldw);
+            }
         }
 
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspRkjlServiceImpl.java

@@ -1,6 +1,7 @@
 package com.hxhq.business.service.impl;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.*;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -45,14 +46,7 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
     @Autowired
     private INoticeService noticeService;
 
-    /**
-     * 查询供试品入库记录列表
-     *
-     * @return 供试品入库记录
-     */
-    @Override
-    public List<GspRkjl> queryList(GspSearchListForm form)
-    {
+    public QueryWrapper<GspRkjl> getListCondition(GspSearchListForm form) {
         QueryWrapper<GspRkjl> queryWrapper = new QueryWrapper<>();
         if(StringUtils.isNotEmpty(form.getMc())) {
             queryWrapper.like("mc", form.getMc());
@@ -78,6 +72,18 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
         if(form.getArchive() != null && form.getArchive() == DaztEnum.ygd.getValue()) {
             queryWrapper.in("jlzt", JlztEnum.dgd.getValue(), JlztEnum.gd.getValue(), JlztEnum.djd.getValue());
         }
+        return queryWrapper;
+    }
+
+    /**
+     * 查询供试品入库记录列表
+     *
+     * @return 供试品入库记录
+     */
+    @Override
+    public List<GspRkjl> queryList(GspSearchListForm form)
+    {
+        QueryWrapper<GspRkjl> queryWrapper = getListCondition(form);
         queryWrapper.orderByDesc("id");
         return this.list(queryWrapper);
     }
@@ -657,33 +663,11 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
 
     @Override
     public String getRklUnit(GspSearchListForm form) {
-        QueryWrapper<GspRkjl> queryWrapper = new QueryWrapper<>();
-        queryWrapper.isNotNull("rkdw")
-                .eq("del_flag", 0);
-        if(StringUtils.isNotEmpty(form.getMc())) {
-            queryWrapper.like("mc", form.getMc());
-        }
-        if(StringUtils.isNotEmpty(form.getPh())) {
-            queryWrapper.like("ph", form.getPh());
-        }
-        if(StringUtils.isNotEmpty(form.getGg())) {
-            queryWrapper.and(p -> p.apply("CONCAT(gg, ggdw) LIKE {0}", form.getGg()));
-        }
-        if(StringUtils.isNotEmpty(form.getStartDate())) {
-            queryWrapper.ge("rksj", form.getStartDate());
-        }
-        if(StringUtils.isNotEmpty(form.getEndDate())) {
-            queryWrapper.le("rksj", form.getEndDate());
-        }
-        if(form.getJlzt() != null) {
-            queryWrapper.eq("jlzt", form.getJlzt());
-        }
-        if(form.getJyzt() != null) {
-            queryWrapper.eq("jyzt", form.getJyzt());
-        }
-        if(form.getArchive() != null && form.getArchive() == DaztEnum.ygd.getValue()) {
-            queryWrapper.in("jlzt", JlztEnum.dgd.getValue(), JlztEnum.gd.getValue(), JlztEnum.djd.getValue());
-        }
+        QueryWrapper<GspRkjl> queryWrapper = getListCondition(form);
+        queryWrapper.isNotNull("rkl")
+                .isNotNull("rkdw")
+                .ne("rkl", "")
+                .ne("rkdw", "");
         Map<String, String> map = baseMapper.getRklUnit(queryWrapper);
         if(map == null) {
             return null;
@@ -693,46 +677,26 @@ public class GspRkjlServiceImpl extends ServiceImpl impl
 
     @Override
     public String getRkl(GspSearchListForm form) {
-        String rkdw = getRklUnit(form);
-        if(StringUtils.isEmpty(rkdw)) {
-            return null;
-        }
-        QueryWrapper<GspRkjl> queryWrapper = new QueryWrapper<>();
-        queryWrapper.isNotNull("rkdw")
-                .eq("rkdw", rkdw)
-                .eq("del_flag", 0);
-        if(StringUtils.isNotEmpty(form.getMc())) {
-            queryWrapper.like("mc", form.getMc());
-        }
-        if(StringUtils.isNotEmpty(form.getPh())) {
-            queryWrapper.like("ph", form.getPh());
-        }
-        if(StringUtils.isNotEmpty(form.getGg())) {
-            queryWrapper.and(p -> p.apply("CONCAT(gg, ggdw) LIKE {0}", form.getGg()));
-        }
-        if(StringUtils.isNotEmpty(form.getStartDate())) {
-            queryWrapper.ge("rksj", form.getStartDate());
-        }
-        if(StringUtils.isNotEmpty(form.getEndDate())) {
-            queryWrapper.le("rksj", form.getEndDate());
-        }
-        if(form.getJlzt() != null) {
-            queryWrapper.eq("jlzt", form.getJlzt());
-        }
-        if(form.getJyzt() != null) {
-            queryWrapper.eq("jyzt", form.getJyzt());
-        }
-        if(form.getArchive() != null && form.getArchive() == DaztEnum.ygd.getValue()) {
-            queryWrapper.in("jlzt", JlztEnum.dgd.getValue(), JlztEnum.gd.getValue(), JlztEnum.djd.getValue());
+        String rklUnit = getRklUnit(form);
+        if(StringUtils.isEmpty(rklUnit)) {
+            return "";
+        }
+        QueryWrapper<GspRkjl> queryWrapper = getListCondition(form);
+        if (Arrays.asList(UnitTools.VOLUME_UNIT_LIST).contains(rklUnit)) {
+            queryWrapper.in("rkdw", UnitTools.VOLUME_UNIT_LIST);
+        } else if (Arrays.asList(UnitTools.WEIGHT_UNIT_LIST).contains(rklUnit)) {
+            queryWrapper.in("rkdw", UnitTools.WEIGHT_UNIT_LIST);
+        } else {
+            queryWrapper.eq("rkdw", rklUnit);
         }
         BigDecimal rkl = baseMapper.sumRkl(queryWrapper);
-
-        // 单位转换
-        rkl = UnitTools.convert(rkl, rkdw);
         if(rkl == null) {
-            return null;
+            return "";
         }
-        return rkl.toString() + rkdw;
+        rkl = UnitTools.convert(rkl, rklUnit);
+        DecimalFormat decimalFormat = new DecimalFormat("#,###.##"); // 定义格式
+        String formatted = decimalFormat.format(rkl);
+        return formatted + rklUnit;
     }
 
     /**

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/UnitTools.java

@@ -145,7 +145,7 @@ public class UnitTools {
             }
             // 验证单位是否支持
             if (!UNIT_TO_LITER.containsKey(fromUnit)) {
-                return BigDecimal.ZERO;
+                return new BigDecimal(value);
             }
 
             String toUnit = "";

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/GspPdf.java

@@ -56,8 +56,8 @@ public class GspPdf {
             formData1.put(getName("名称"), gsp.getMc());
             formData1.put(getName("编号"), gsp.getBh());
             formData1.put(getName("批号"), gsp.getPh());
-            formData1.put(getName("规格"), gsp.getGg() + gsp.getGgdw());
-            formData1.put(getName("接收日期"), gsp.getGg() + gsp.getGgdw());
+            formData1.put(getName("规格"), gsp.getGg());
+            //formData1.put(getName("接收日期"), gsp.getGg() + gsp.getGgdw());
             formData1.put(getName("库存量"), gsp.getKc() + gsp.getKcdw());
             formData1.put(getName("有效期"), PdfExportUtil.parseDateToStr(gsp.getYxq()));
             formData1.put(getName("状态"), "en".equals(language) ? (GyzjJcnrUtil.getEn(ZjztEnum.getEnumByValue(gsp.getZjzt()).getText())) : ZjztEnum.getEnumByValue(gsp.getZjzt()).getText());

hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspFfjlMapper.xml

@@ -21,7 +21,7 @@
     </select>
     <select id="getStatisticsUnit" resultType="java.util.Map">
         SELECT * FROM
-            (SELECT ckldw, COUNT(*) AS ckldw_cnt FROM t_gsp_ffjl
+            (SELECT ckldw, COUNT(*) AS ckldw_cnt FROM t_gsp_ffjl as t
             <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
                 <where>
                     ${ew.sqlSegment}
@@ -29,18 +29,18 @@
             </if>
              GROUP BY ckldw ORDER BY ckldw_cnt DESC LIMIT 1) AS ckldw
         CROSS JOIN
-            (SELECT syldw, COUNT(*) AS syldw_cnt FROM t_gsp_ffjl
-                <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            (SELECT syldw, COUNT(*) AS syldw_cnt FROM t_gsp_ffjl as t
+                <if test="ew2.sqlSegment != '' and ew2.sqlSegment != null">
                     <where>
-                        ${ew.sqlSegment}
+                        ${ew2.sqlSegment}
                     </where>
                 </if>
             GROUP BY syldw ORDER BY syldw_cnt DESC LIMIT 1)  AS syldw
         CROSS JOIN
-            (SELECT rkldw, COUNT(*) AS rkldw_cnt FROM t_gsp_ffjl
-                <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            (SELECT rkldw, COUNT(*) AS rkldw_cnt FROM t_gsp_ffjl as t
+                <if test="ew3.sqlSegment != '' and ew3.sqlSegment != null">
                     <where>
-                        ${ew.sqlSegment}
+                        ${ew3.sqlSegment}
                     </where>
                 </if>
             GROUP BY rkldw ORDER BY rkldw_cnt DESC LIMIT 1)  AS rkldw;
@@ -48,7 +48,7 @@
 
     <select id="sumRkl" resultType="java.math.BigDecimal">
         SELECT SUM(basic_rkl + 0) AS total
-        FROM t_gsp_ffjl
+        FROM t_gsp_ffjl as t
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}
@@ -57,7 +57,7 @@
     </select>
     <select id="sumCkl" resultType="java.math.BigDecimal">
         SELECT SUM(basic_ckl + 0) AS total
-        FROM t_gsp_ffjl
+        FROM t_gsp_ffjl as t
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}
@@ -66,7 +66,7 @@
     </select>
     <select id="sumSyl" resultType="java.math.BigDecimal">
         SELECT SUM(basic_syl + 0) AS total
-        FROM t_gsp_ffjl
+        FROM t_gsp_ffjl as t
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}
@@ -85,4 +85,5 @@
             </where>
         </if>
     </select>
+
 </mapper>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/GspRkjlMapper.xml

@@ -24,4 +24,5 @@
             </where>
         </if>
     </select>
+
 </mapper>