申报修改

yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TStatisticsDeclarer.java

@@ -17,6 +17,7 @@
 
 package com.yifu.cloud.plus.v1.yifu.salary.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -46,6 +47,7 @@ public class TStatisticsDeclarer {
 	 * ID
 	 */
 	@TableId(type = IdType.ASSIGN_ID)
+	@ExcelIgnore
 	private String id;
 	/**
 	 * 申报单位
@@ -86,9 +88,8 @@ public class TStatisticsDeclarer {
 	/**
 	 * 任职受雇从业类型
 	 */
-	@ExcelAttribute(name = "任职受雇从业类型", maxLength = 2,readConverterExp = "0=雇员,1=其他")
 	@Length(max = 2, message = "任职受雇从业类型不能超过2个字符")
-	@ExcelProperty("任职受雇从业类型")
+	@ExcelIgnore
 	private String occupationType;
 	/**
 	 * 任职受雇从业日期

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsDeclarerServiceImpl.java

@@ -73,7 +73,7 @@ public class TStatisticsDeclarerServiceImpl extends ServiceImpl<TStatisticsDecla
      */
     @Override
     public void listExport(HttpServletResponse response, TStatisticsDeclarerSearchVo searchVo){
-        String fileName = "个税申报对象" + DateUtil.getThisTime() + ".xlsx";
+        String fileName = "申报对象批量导出" + DateUtil.getThisTime() + ".xlsx";
         //获取要导出的列表
         List<TStatisticsDeclarer> list = new ArrayList<>();
         long count = noPageCountDiy(searchVo);

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsDeclarerMapper.xml

@@ -97,10 +97,10 @@
 	<select id="doStatisticsTaxDeclarer" resultMap="tStatisticsDeclarerMap">
 		select
 			#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,a.EMP_PHONE,a.INVOICE_TITLE DECLARE_UNIT,
-			if(a.FORM_TYPE=0,'雇员',if(a.FORM_TYPE=3 or a.FORM_TYPE=4,'其他','-')) OCCUPATION_TYPE
+			if(a.FORM_TYPE=0,'0',if(a.FORM_TYPE=3 or a.FORM_TYPE=4,'1','-')) OCCUPATION_TYPE
 		from t_salary_account a
 	    left join t_salary_employee b on b.id = a.EMP_ID
 		where a.DELETE_FLAG = '0' and a.SETTLEMENT_MONTH like '${lastYear}%'
-		GROUP BY a.EMP_IDCARD,OCCUPATION_TYPE,b.UNIT_ID,a.SETTLEMENT_MONTH
+		GROUP BY a.EMP_IDCARD,OCCUPATION_TYPE,DECLARE_UNIT,a.SETTLEMENT_MONTH
 	</select>
 </mapper>