补贴报表

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillLandingInspectionController.java

@@ -9,7 +9,7 @@ import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.common.utils.UploadImage;
-import com.huimv.farm.damsubsidy.entity.Vo.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection;
 import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;

admin/src/main/java/com/huimv/farm/damsubsidy/entity/Vo/BillSubsidyVo.java

@@ -1,53 +0,0 @@
-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;
-}

admin/src/main/java/com/huimv/farm/damsubsidy/entity/Vo/BillBuyInfoVo.java

@@ -1,4 +1,4 @@
-package com.huimv.farm.damsubsidy.entity.Vo;
+package com.huimv.farm.damsubsidy.entity.vo;
 
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
 import lombok.Data;

admin/src/main/java/com/huimv/farm/damsubsidy/entity/Vo/BillLandingInspection.java

@@ -1,11 +1,9 @@
-package com.huimv.farm.damsubsidy.entity.Vo;
+package com.huimv.farm.damsubsidy.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.io.Serializable;
 

admin/src/main/java/com/huimv/farm/damsubsidy/entity/Vo/BillLandingInspectionVo.java

@@ -1,4 +1,4 @@
-package com.huimv.farm.damsubsidy.entity.Vo;
+package com.huimv.farm.damsubsidy.entity.vo;
 
 import lombok.Data;
 

admin/src/main/java/com/huimv/farm/damsubsidy/entity/Vo/BillSubsidyReportVo.java

@@ -1,4 +1,4 @@
-package com.huimv.farm.damsubsidy.entity.Vo;
+package com.huimv.farm.damsubsidy.entity.vo;
 
 import lombok.Data;
 

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillBuyInfoMapper.java

@@ -2,7 +2,7 @@ package com.huimv.farm.damsubsidy.mapper;
 
 import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.farm.damsubsidy.entity.Vo.BillBuyInfoVo;
+import com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo;
 import org.apache.ibatis.annotations.Param;
 
 /**

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillLandingInspectionMapper.java

@@ -1,6 +1,6 @@
 package com.huimv.farm.damsubsidy.mapper;
 
-import com.huimv.farm.damsubsidy.entity.Vo.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -2,7 +2,7 @@ package com.huimv.farm.damsubsidy.mapper;
 
 import com.huimv.farm.damsubsidy.entity.BillSubsidy;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.farm.damsubsidy.entity.Vo.BillSubsidyReportVo;
+import com.huimv.farm.damsubsidy.entity.vo.BillSubsidyReportVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

admin/src/main/java/com/huimv/farm/damsubsidy/service/IBillLandingInspectionService.java

@@ -1,7 +1,7 @@
 package com.huimv.farm.damsubsidy.service;
 
 import com.huimv.farm.damsubsidy.common.utils.Result;
-import com.huimv.farm.damsubsidy.entity.Vo.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;

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

@@ -1,19 +1,15 @@
 package com.huimv.farm.damsubsidy.service.impl;
 
 import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.huimv.farm.damsubsidy.common.exception.ExceptionEnum;
-import com.huimv.farm.damsubsidy.common.exception.MiException;
 import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.common.utils.UploadImage;
 import com.huimv.farm.damsubsidy.entity.*;
-import com.huimv.farm.damsubsidy.entity.Vo.BillBuyInfoVo;
-import com.huimv.farm.damsubsidy.entity.Vo.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo;
+import com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection;
 import com.huimv.farm.damsubsidy.mapper.BaseAnimalMapper;
 import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
 import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;
@@ -23,17 +19,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

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

@@ -12,7 +12,7 @@ import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.common.utils.UploadImage;
 import com.huimv.farm.damsubsidy.entity.BaseAnimal;
 import com.huimv.farm.damsubsidy.entity.BillIsolated;
-import com.huimv.farm.damsubsidy.entity.Vo.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection;
 import com.huimv.farm.damsubsidy.mapper.BaseAnimalMapper;
 import com.huimv.farm.damsubsidy.mapper.BillIsolatedMapper;
 import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;

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

@@ -9,7 +9,7 @@ import com.huimv.farm.damsubsidy.common.token.TokenSign;
 import com.huimv.farm.damsubsidy.common.utils.Result;
 import com.huimv.farm.damsubsidy.common.utils.ResultCode;
 import com.huimv.farm.damsubsidy.entity.*;
-import com.huimv.farm.damsubsidy.entity.Vo.BillLandingInspection;
+import com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection;
 import com.huimv.farm.damsubsidy.mapper.*;
 import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

@@ -21,12 +21,12 @@
         <result column="is_delete" property="isDelete" />
     </resultMap>
 
-    <select id="listDetail" resultType="com.huimv.farm.damsubsidy.entity.Vo.BillBuyInfoVo">
+    <select id="listDetail" resultType="com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo">
         SELECT l.inspection_num,l.cargo_owner,l.owner_phone,l.animal_type,l.animal_number_up,l.use_to,l.start_tran,l.reach_tran,l.eartags,b.buyer_name,b.seller_name,b.real_num_up,real_eartag
  FROM `bill_buy_info` b LEFT JOIN `bill_landing_inspection` l ON b.inspection_num = l.inspection_num WHERE b.id = #{id}
     </select>
 
-    <select id="getLast" resultType="com.huimv.farm.damsubsidy.entity.Vo.BillBuyInfoVo">
+    <select id="getLast" resultType="com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo">
         SELECT l.inspection_num,l.cargo_owner,l.owner_phone,l.animal_type,l.animal_number_up,l.use_to,l.start_tran,l.reach_tran,l.eartags,b.buyer_name,b.seller_name,b.real_num_up,real_eartag
  FROM `bill_buy_info` b LEFT JOIN `bill_landing_inspection` l ON b.inspection_num = l.inspection_num WHERE b.create_user = #{userName} and b.bill_buy_status = 1
     </select>

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.huimv.farm.damsubsidy.entity.Vo.BillLandingInspection">
+    <resultMap id="BaseResultMap" type="com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection">
         <id column="id" property="id" />
         <result column="inspection_name" property="inspectionName" />
         <result column="inspection_sch" property="inspectionSch" />

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

@@ -41,7 +41,7 @@
         <result column="is_delete" property="isDelete" />
     </resultMap>
 
-    <select id="listReport" resultType="com.huimv.farm.damsubsidy.entity.Vo.BillSubsidyReportVo">
+    <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',