ocr识别图片

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillSubsidyServiceImpl.java

@@ -784,11 +784,24 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         String code = paramsMap.get("code");
         String start = paramsMap.get("start");
         String end = paramsMap.get("end");
+        Date date = new Date();
+        String format = DateUtil.format(date, "yyyy-MM-dd");
+        if (StringUtils.isBlank(start)){
+            start = format+" 00:00:00";
+        }else {
+            start = start+" 00:00:00";
+        }
+        if (StringUtils.isBlank(end)){
+            end = format+" 23:59:59";
+        }else {
+            end = end+" 23:59:59";
+        }
         QueryWrapper<AreaAll> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id", code);
         AreaAll all = areaAllMapper.selectOne(queryWrapper);
         QueryWrapper<BillSubsidy> subsidyQueryWrapper = new QueryWrapper<>();
-        subsidyQueryWrapper.like("detailed_adress_code", code)
+
+        subsidyQueryWrapper.like(StringUtils.isNotBlank(code),"detailed_adress_code", code)
                 .between("create_time", start, end).eq("subsidy_sch", 3).eq("is_pay", 1)
                 .groupBy("id_card");
         List<BillSubsidy> subsidyList = subsidyMapper.selectList(subsidyQueryWrapper);
@@ -832,6 +845,18 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         }
         String start = paramsMap.get("startDate");
         String end = paramsMap.get("endDate");
+        Date date = new Date();
+        String format = DateUtil.format(date, "yyyy-MM-dd");
+        if (StringUtils.isBlank(start)){
+            start = format+" 00:00:00";
+        }else {
+            start = start+" 00:00:00";
+        }
+        if (StringUtils.isBlank(end)){
+            end = format+" 23:59:59";
+        }else {
+            end = end+" 23:59:59";
+        }
 
         QueryWrapper<BillSubsidy> subsidyQueryWrapper = new QueryWrapper<>();
         subsidyQueryWrapper.like(StringUtils.isNotBlank(code),"detailed_adress_code", code)

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -10,14 +10,8 @@ import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.PageUtils;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
-import com.huimv.farm.damsubsidy.entity.AccountGroup;
-import com.huimv.farm.damsubsidy.entity.BillSubsidy;
-import com.huimv.farm.damsubsidy.entity.PovertyUserRegist;
-import com.huimv.farm.damsubsidy.entity.SysUser;
-import com.huimv.farm.damsubsidy.mapper.AccountGroupMapper;
-import com.huimv.farm.damsubsidy.mapper.BaseVeterStationMapper;
-import com.huimv.farm.damsubsidy.mapper.PovertyUserRegistMapper;
-import com.huimv.farm.damsubsidy.mapper.SysUserMapper;
+import com.huimv.farm.damsubsidy.entity.*;
+import com.huimv.farm.damsubsidy.mapper.*;
 import com.huimv.farm.damsubsidy.service.ISysUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +45,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private BaseVeterStationMapper baseVeterStationMapper;
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
+    @Autowired
+    private AreaAllMapper areaAllMapper;
 
     @Autowired
     private AccountGroupMapper accountGroupMapper;
@@ -262,7 +258,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         user.setCreateTime(new Date());
         String s = paramsMap.get("detailedAdressCode");
         String[] split = s.split(",");
-        user.setBriefAddressCode(split[split.length - 1]);
+        String s1 = split[split.length - 1];
+        user.setBriefAddressCode(s1);
+        AreaAll id = areaAllMapper.selectById(new QueryWrapper<AreaAll>().eq("id", s1));
+
+        user.setBriefAddress(id.getName());
 
 
         if (Integer.parseInt(paramsMap.get("type")) == 1) {

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BillSubsidyMapper.xml

@@ -43,58 +43,58 @@
 
     <select id="listReport" resultType="com.huimv.farm.damsubsidy.entity.vo.BillSubsidyReportVo">
         SELECT DISTINCT aa.name AS 'villageName',
-        (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 0 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'jcdx',
-        (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 1 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ytph',
-        (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 2 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qt',
-        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 0 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'rnhs',
-        (SELECT COALESCE(SUM(s1.reward_num),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 0 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'rnts',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 0 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'rnje',
-        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 1 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ryhs',
-        (SELECT COALESCE(SUM(s1.reward_num),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 1 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ryts',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 1 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ryje',
-        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 2 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'szhs',
-        (SELECT COALESCE(SUM(s1.reward_num),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 2 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'szts',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 2 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'szje',
-        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 6 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'lgshs',
-        (SELECT COALESCE(SUM(s1.reward_area),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 6 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'lgsmj',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 6 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'lgsje',
-        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 3 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qzchs',
-        (SELECT COALESCE(SUM(s1.reward_area),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 3 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qzcmj',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 3 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qzcje',
-        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 4 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'sths',
-        (SELECT COALESCE(SUM(s1.reward_area),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 4 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'stmj',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 4 AND s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'stje',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.detailed_adress_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'je'
-        FROM `area_all` aa LEFT JOIN `bill_subsidy` s ON aa.id = s.detailed_adress_code
+        (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 0 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'jcdx',
+        (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 1 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ytph',
+        (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 2 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qt',
+        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 0 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'rnhs',
+        (SELECT COALESCE(SUM(s1.reward_num),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 0 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'rnts',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 0 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'rnje',
+        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 1 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ryhs',
+        (SELECT COALESCE(SUM(s1.reward_num),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 1 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ryts',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 1 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ryje',
+        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 2 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'szhs',
+        (SELECT COALESCE(SUM(s1.reward_num),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 2 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'szts',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 2 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'szje',
+        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 6 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'lgshs',
+        (SELECT COALESCE(SUM(s1.reward_area),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 6 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'lgsmj',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 6 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'lgsje',
+        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 3 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qzchs',
+        (SELECT COALESCE(SUM(s1.reward_area),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 3 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qzcmj',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 3 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qzcje',
+        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 4 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'sths',
+        (SELECT COALESCE(SUM(s1.reward_area),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 4 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'stmj',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 4 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'stje',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'je'
+        FROM `area_all` aa LEFT JOIN `bill_subsidy` s ON aa.id = s.brief_address_code
         WHERE aa.id LIKE concat(#{townCode},'%')  AND aa.id &lt;&gt; #{townCode}
         ORDER BY aa.id ASC
     </select>
 
     <select id="lisTowntReport" resultType="com.huimv.farm.damsubsidy.entity.vo.BillSubsidyReportVo">
         SELECT DISTINCT aa.name AS 'villageName',
-        (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 0 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'jcdx',
-        (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 1 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ytph',
-        (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 2 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qt',
-        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 0 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'rnhs',
-        (SELECT COALESCE(SUM(s1.reward_num),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 0 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'rnts',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 0 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'rnje',
-        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 1 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ryhs',
-        (SELECT COALESCE(SUM(s1.reward_num),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 1 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ryts',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 1 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ryje',
-        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 2 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'szhs',
-        (SELECT COALESCE(SUM(s1.reward_num),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 2 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'szts',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 2 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'szje',
-        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 6 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'lgshs',
-        (SELECT COALESCE(SUM(s1.reward_area),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 6 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'lgsmj',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 6 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'lgsje',
-        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 3 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qzchs',
-        (SELECT COALESCE(SUM(s1.reward_area),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 3 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qzcmj',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 3 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qzcje',
-        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 4 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'sths',
-        (SELECT COALESCE(SUM(s1.reward_area),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 4 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'stmj',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 4 AND s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'stje',
-        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.detailed_adress_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'je'
-        FROM `area_all` aa LEFT JOIN `bill_subsidy` s ON aa.id = s.detailed_adress_code
+        (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 0 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'jcdx',
+        (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 1 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ytph',
+        (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 2 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qt',
+        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 0 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'rnhs',
+        (SELECT COALESCE(SUM(s1.reward_num),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 0 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'rnts',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 0 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'rnje',
+        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 1 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ryhs',
+        (SELECT COALESCE(SUM(s1.reward_num),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 1 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ryts',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 1 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ryje',
+        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 2 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'szhs',
+        (SELECT COALESCE(SUM(s1.reward_num),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 2 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'szts',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 2 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'szje',
+        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 6 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'lgshs',
+        (SELECT COALESCE(SUM(s1.reward_area),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 6 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'lgsmj',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 6 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'lgsje',
+        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 3 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qzchs',
+        (SELECT COALESCE(SUM(s1.reward_area),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 3 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qzcmj',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 3 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qzcje',
+        (SELECT COUNT(DISTINCT s1.create_user) FROM `bill_subsidy` s1 WHERE s1.reward_type = 4 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'sths',
+        (SELECT COALESCE(SUM(s1.reward_area),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 4 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'stmj',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.reward_type = 4 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'stje',
+        (SELECT COALESCE(SUM(s1.pay_money),0) FROM `bill_subsidy` s1 WHERE s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'je'
+        FROM `area_all` aa LEFT JOIN `bill_subsidy` s ON aa.id = s.brief_address_code
         WHERE aa.id LIKE concat(#{townCode},'%')  AND aa.level = '4+'
         ORDER BY aa.id ASC
     </select>