Newspaper 2 роки тому
батько
коміт
93c0c56bcf

+ 53 - 0
admin/src/main/java/com/huimv/farm/damsubsidy/entity/vo/BillSubsidyVo.java

@@ -0,0 +1,53 @@
+package com.huimv.farm.damsubsidy.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.huimv.farm.damsubsidy.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+
+/**
+ * <p>
+ * 补贴信息表
+ * </p>
+ *
+ * @author author
+ * @since 2023-04-26
+ */
+@Data
+public class BillSubsidyVo extends BaseEntity implements Serializable {
+
+
+    private Integer id;
+
+    private String name;
+
+    private String type1;
+    private String type2;
+    private String type3;
+
+    private Integer count;
+    private Integer number;
+    private Integer money;
+    private Integer count1;
+    private Integer number1;
+    private Integer money1;
+    private Integer count2;
+    private Integer number2;
+    private Integer money2;
+    private Integer count3;
+    private Integer number3;
+    private Integer money3;
+    private Integer count4;
+    private Integer number4;
+    private Integer money4;
+    private Integer moneycount;
+}

+ 1 - 1
admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillSubsidyMapper.java

@@ -16,6 +16,6 @@ import java.util.List;
  * @since 2023-04-26
  */
 public interface BillSubsidyMapper extends BaseMapper<BillSubsidy> {
-    List<BillSubsidyReportVo> listReport(@Param("townCode") String townCode);
+    List<BillSubsidyReportVo> listReport(@Param("townCode") String townCode,@Param("startTime") String startTime,@Param("endTime") String endTime);
 
 }

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

@@ -43,28 +43,28 @@
 
     <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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) 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 ) AS 'je'
+        (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
         WHERE aa.id LIKE '#{townCode}%'  AND aa.id &lt;&gt; '#{townCode}'
         ORDER BY aa.id ASC