Browse Source

财务首页会员项目审核修改开发

anderx 2 years ago
parent
commit
718fad0bff

+ 130 - 48
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -1,7 +1,5 @@
 package com.goafanti.admin.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.goafanti.admin.bo.*;
 import com.goafanti.admin.service.AdminService;
 import com.goafanti.admin.service.DepartmentService;
@@ -10,7 +8,6 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.*;
-import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.PasswordUtil;
 import com.goafanti.common.utils.StringUtils;
@@ -51,7 +48,18 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	@Autowired
 	private AdminUserCountMapper adminUserCountMapper;
 	@Autowired
-	private TaskTimeMapper taskTimeMapper;
+	private TOrderNewMapper TOrderNewMapper;
+	@Autowired
+	private ExpenseAccountMapper expenseAccountMapper;
+	@Autowired
+	private TOrderInvoiceMapper tOrderInvoiceMapper;
+	@Autowired
+	private TTaskMemberMapper tTaskMemberMapper;
+	@Autowired
+	private TOrderPaymentMapper tOrderPaymentMapper;
+	@Autowired
+	private FinanceCountMapper financeCountMapper;
+
 
 
 
@@ -581,57 +589,131 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 //		publiAdminUserCount(list);
 //		System.out.println("list="+list.size());
 //		}
-		List<TOrderTask> allTimeRecord = taskTimeMapper.getAllTimeRecord();
-		List<TaskTime> list=new ArrayList<>();
-		for (TOrderTask e : allTimeRecord) {
-			String timeRecord = e.getTimeRecord();
-			System.out.println(e.getTimeRecord());
-			if (StringUtils.isNotBlank(e.getTimeRecord())){
-				Map<String,Object> map = JSON.parseObject(timeRecord, Map.class);
-				for (String s : map.keySet()) {
-					if (s.equals("2")||s.equals("3")||s.equals("29")||s.equals("19")||(s.equals("27"))){
-						JSONObject js = JSON.parseObject(map.get(s).toString());
-						Object date = js.get("date");
-						Object suspendImg  = js.get("suspendImg") ;
-						Object title = js.get("title") ;
-						Object certificateNumber = js.get("certificateNumber") ;
-						Object setUpAmount = js.get("setUpAmount") ;
-						Object appropriation = js.get("appropriation") ;
-						TaskTime tt=new TaskTime();
-						tt.setTid(e.getId());
-						tt.setProjectStatus(Integer.parseInt(s));
-						if (!Objects.isNull(date)){
-							String dates=date.toString();
-							if (StringUtils.isNotBlank(dates)){
-								Date date1 = DateUtils.StringToDate(dates, AFTConstants.YYYYMMDD);
-								tt.setDateTime(date1);
-							}
-						}
-						if (!Objects.isNull(setUpAmount))tt.setSetUpAmount(setUpAmount.toString());
-						if (!Objects.isNull(suspendImg))tt.setSuspendImg(suspendImg.toString());
-						if (!Objects.isNull(title))tt.setTitle(title.toString());
-						if (!Objects.isNull(certificateNumber))tt.setCertificateNumber(certificateNumber.toString());
-						if (!Objects.isNull(appropriation))tt.setAppropriation(appropriation.toString());
-						list.add(tt);
-//					taskTimeMapper.insertSelective(tt);
+//咨询师统计处理
+//		List<TOrderTask> allTimeRecord = taskTimeMapper.getAllTimeRecord();
+//		List<TaskTime> list=new ArrayList<>();
+//		for (TOrderTask e : allTimeRecord) {
+//			String timeRecord = e.getTimeRecord();
+//			System.out.println(e.getTimeRecord());
+//			if (StringUtils.isNotBlank(e.getTimeRecord())){
+//				Map<String,Object> map = JSON.parseObject(timeRecord, Map.class);
+//				for (String s : map.keySet()) {
+//					if (s.equals("2")||s.equals("3")||s.equals("29")||s.equals("19")||(s.equals("27"))){
+//						JSONObject js = JSON.parseObject(map.get(s).toString());
+//						Object date = js.get("date");
+//						Object suspendImg  = js.get("suspendImg") ;
+//						Object title = js.get("title") ;
+//						Object certificateNumber = js.get("certificateNumber") ;
+//						Object setUpAmount = js.get("setUpAmount") ;
+//						Object appropriation = js.get("appropriation") ;
+//						TaskTime tt=new TaskTime();
+//						tt.setTid(e.getId());
+//						tt.setProjectStatus(Integer.parseInt(s));
+//						if (!Objects.isNull(date)){
+//							String dates=date.toString();
+//							if (StringUtils.isNotBlank(dates)){
+//								Date date1 = DateUtils.StringToDate(dates, AFTConstants.YYYYMMDD);
+//								tt.setDateTime(date1);
+//							}
+//						}
+//						if (!Objects.isNull(setUpAmount))tt.setSetUpAmount(setUpAmount.toString());
+//						if (!Objects.isNull(suspendImg))tt.setSuspendImg(suspendImg.toString());
+//						if (!Objects.isNull(title))tt.setTitle(title.toString());
+//						if (!Objects.isNull(certificateNumber))tt.setCertificateNumber(certificateNumber.toString());
+//						if (!Objects.isNull(appropriation))tt.setAppropriation(appropriation.toString());
+//						list.add(tt);
+////					taskTimeMapper.insertSelective(tt);
+//					}
+//				}
+//			}
+//		}
+//		List<TaskTime> addList = new ArrayList<>();
+//		for (int i = 0; i <list.size(); i++) {
+//			addList.add(list.get(i));
+//			if (addList.size()==50|| i==list.size() -1){
+//				taskTimeMapper.insertBatch(addList);
+//				try {
+//					addList.clear();
+//					Thread.sleep(500);
+//				} catch (InterruptedException exception) {
+//					exception.printStackTrace();
+//				}
+//			}
+//		}
+		List<String> roles=new ArrayList<>();
+		roles.add(AFTConstants.FINANCE);
+		roles.add(AFTConstants.FINANCE_MANAGER);
+		List<Admin> admins = adminMapper.selectAdminByRoleTypes(roles);
+
+		for (Admin admin : admins){
+			List<FinanceCount> list=new ArrayList<>();
+			List<FinanceCount> orderList = TOrderNewMapper.selectCountByFinance(admin.getId());
+			if (!orderList.isEmpty()){
+
+				list.addAll(orderList);
+			}
+			List<FinanceCount> expenseList = expenseAccountMapper.selectCountByFinance(admin.getId());
+			pushFinanceList(list, expenseList,0);
+			List<FinanceCount> invoiceList =tOrderInvoiceMapper.selectCountByFinance(admin.getId());
+			pushFinanceList(list, invoiceList,1);
+			List<FinanceCount> memberList =tTaskMemberMapper.selectCountByFinance(admin.getId());
+			pushFinanceList(list, memberList,2);
+			List<FinanceCount> paymentList =tOrderPaymentMapper.selectCountByFinance(admin.getId());
+			pushFinanceList(list, paymentList,3);
+			List<FinanceCount> addList=new ArrayList<>();
+			for (int i = 0; i <list.size(); i++) {
+				FinanceCount financeCount = list.get(i);
+				FinanceCount newFc=FinanceCount.initialization(financeCount);
+				addList.add(newFc);
+				if (addList.size()==50||i==list.size()-1){
+					financeCountMapper.insetBatch(addList);
+					addList.clear();
+					try {
+						Thread.sleep(500);
+					} catch (InterruptedException exception) {
+						exception.printStackTrace();
 					}
 				}
 			}
+
+
 		}
-		List<TaskTime> addList = new ArrayList<>();
-		for (int i = 0; i <list.size(); i++) {
-			addList.add(list.get(i));
-			if (addList.size()==50|| i==list.size() -1){
-				taskTimeMapper.insertBatch(addList);
-				try {
-					addList.clear();
-					Thread.sleep(500);
-				} catch (InterruptedException exception) {
-					exception.printStackTrace();
+		return 1;
+	}
+
+	/**
+	 *
+	 * @param list
+	 * @param minList
+	 * @param type
+	 */
+	private void pushFinanceList(List<FinanceCount> list, List<FinanceCount> minList,Integer type) {
+		if (!minList.isEmpty()){
+			for (FinanceCount expense : minList) {
+				boolean flag=true;
+				for (FinanceCount e : list) {
+					if (e.getDateTime().getTime()==expense.getDateTime().getTime()){
+						if (type==0){
+							e.setExpenseCount(expense.getExpenseCount());
+							e.setExpenseUnauditedCount(expense.getExpenseUnauditedCount());
+						}else if (type==1){
+							e.setInvoiceCount(expense.getInvoiceCount());
+							e.setInvoiceUnauditedCount(expense.getInvoiceUnauditedCount());
+						}else if (type==2){
+							e.setMemberCount(expense.getMemberCount());
+							e.setMemberUnauditedCount(expense.getMemberUnauditedCount());
+						}else if (type==3){
+							e.setPaymentCount(expense.getPaymentCount());
+							e.setPaymentUnauditedCount(expense.getPaymentUnauditedCount());
+						}
+						flag=false;
+					}
+				}
+				if (flag){
+					list.add(expense);
 				}
 			}
 		}
-		return 1;
 	}
 
 	private void publiAdminUserCount(List<AdminUserCount> list) {

+ 1 - 1
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -941,7 +941,7 @@ public class PublicController extends CertifyApiController {
 	}
 
 
-	@RequestMapping("/pushStatistics2")
+	@RequestMapping("/pushStatistics3")
 	public Result pushStatistics (){
 		Result res =new Result();
 		res.data(adminService.pushStatistics());

+ 2 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -199,4 +199,6 @@ public interface AdminMapper {
                                                       @Param("aid")String aid);
 
     Admin selectOrderByFinanace(String orderNo);
+
+    List<Admin> selectAdminByRoleTypes(List<String> roles);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/ExpenseAccountMapper.java

@@ -1,6 +1,7 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.ExpenseAccount;
+import com.goafanti.common.model.FinanceCount;
 import com.goafanti.expenseAccount.bo.InputExpenseAccount;
 import com.goafanti.expenseAccount.bo.OutExpenseAccount;
 import com.goafanti.expenseAccount.bo.OutMyEAStatistics;
@@ -39,4 +40,5 @@ public interface ExpenseAccountMapper {
     List<ExpenseAccount> selectByCheckNoNot();
 
 
+    List<FinanceCount> selectCountByFinance(String id);
 }

+ 4 - 0
src/main/java/com/goafanti/common/dao/FinanceCountMapper.java

@@ -3,6 +3,8 @@ package com.goafanti.common.dao;
 import com.goafanti.common.model.FinanceCount;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 public interface FinanceCountMapper {
     int deleteByPrimaryKey(Integer id);
 
@@ -23,4 +25,6 @@ public interface FinanceCountMapper {
     void updateOrderUnauditedSubtraction(@Param("aid") String aid, @Param("startTime") String startTime,@Param("type") Integer type);
 
     FinanceCount selectByAidAndDates(@Param("aid") String aid, @Param("startTime") String startTime);
+
+    void insetBatch(List<FinanceCount> addList);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderInvoiceMapper.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.dao;
 
+import com.goafanti.common.model.FinanceCount;
 import com.goafanti.common.model.TOrderInvoice;
 import com.goafanti.order.bo.InvoiceBo;
 import com.goafanti.order.bo.OutInvoiceLog;
@@ -34,4 +35,5 @@ public interface TOrderInvoiceMapper {
 
     List<OutInvoiceLog>  selectInvoiceLog(Integer id);
 
+    List<FinanceCount> selectCountByFinance(String id);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -89,4 +89,6 @@ public interface TOrderNewMapper {
                          @Param("endTime")String endTime);
 
 
+
+    List<FinanceCount> selectCountByFinance(String id);
 }

+ 4 - 2
src/main/java/com/goafanti/common/dao/TOrderPaymentMapper.java

@@ -1,10 +1,11 @@
 package com.goafanti.common.dao;
 
+import com.goafanti.common.model.FinanceCount;
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.organization.bo.outOrderPayment;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Param;
 
 public interface TOrderPaymentMapper {
 
@@ -67,4 +68,5 @@ public interface TOrderPaymentMapper {
 
 	void deleteByParam(@Param("tid")Integer tid, @Param("chooseType")Integer chooseType);
 
-}
+    List<FinanceCount> selectCountByFinance(String id);
+}

+ 5 - 0
src/main/java/com/goafanti/common/dao/TTaskMemberMapper.java

@@ -1,8 +1,11 @@
 package com.goafanti.common.dao;
 
+import com.goafanti.common.model.FinanceCount;
 import com.goafanti.common.model.TTaskMember;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 public interface TTaskMemberMapper {
     int deleteByPrimaryKey(Integer id);
@@ -26,4 +29,6 @@ public interface TTaskMemberMapper {
                           @Param("contractTerm") String contractTerm);
 
     void updateServiceYearBySplitSuper(Integer tid);
+
+    List<FinanceCount> selectCountByFinance(String id);
 }

+ 10 - 0
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1391,4 +1391,14 @@
     left join admin c on b.finance_id=c.id
     where a.order_no =#{orderNo};
   </select>
+  <select id="selectAdminByRoleTypes" resultType="com.goafanti.common.model.Admin">
+    SELECT a.id,a.name ,a.mobile ,a.email,a.department_id departmentId,a.open_id openId,a.expense_open_id expenseOpenId
+    FROM admin a left join user_role b on a.id=b.uid
+    left join `role` c on b.rid =c.id
+    where a.status='0'
+    and c.role_type  in
+    <foreach collection="list" item="e" open="(" close=")" separator=",">
+      #{e}
+    </foreach>
+  </select>
 </mapper>

+ 9 - 0
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -616,5 +616,14 @@
   from expense_account
     where check_no =''
   </select>
+    <select id="selectCountByFinance" resultType="com.goafanti.common.model.FinanceCount">
+      select x.aid, x.dates dateTime, count(*)expenseCount, sum(if(x.process_status = 1, 1, 0))expenseUnauditedCount
+      from (select a.aid , a.process_status, DATE_FORMAT(a.create_time , '%Y-%m-%d') dates
+            from expense_account a
+            where status in (1, 2)
+              and process_status >0
+              and a.aid = #{aid})x
+      group by x.aid, x.dates;
+    </select>
 
 </mapper>

+ 24 - 20
src/main/java/com/goafanti/common/mapper/FinanceCountMapper.xml

@@ -14,14 +14,13 @@
     <result column="member_unaudited_count" jdbcType="INTEGER" property="memberUnauditedCount" />
     <result column="payment_count" jdbcType="INTEGER" property="paymentCount" />
     <result column="payment_unaudited_count" jdbcType="INTEGER" property="paymentUnauditedCount" />
-    <result column="public_release_count" jdbcType="INTEGER" property="publicReleaseCount" />
     <result column="date_time" jdbcType="DATE" property="dateTime" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <sql id="Base_Column_List">
     id, aid, order_count, order_unaudited_count, expense_count, expense_unaudited_count,
     invoice_count, invoice_unaudited_count, member_count, member_unaudited_count, payment_count,
-    payment_unaudited_count, public_release_count, date_time, create_time
+    payment_unaudited_count, date_time, create_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -29,7 +28,7 @@
     from finance_count
     where id = #{id,jdbcType=INTEGER}
   </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from finance_count
     where id = #{id,jdbcType=INTEGER}
   </delete>
@@ -37,13 +36,13 @@
     insert into finance_count (aid, order_count, order_unaudited_count,
       expense_count, expense_unaudited_count, invoice_count,
       invoice_unaudited_count, member_count, member_unaudited_count,
-      payment_count, payment_unaudited_count, public_release_count,
-      date_time, create_time)
+      payment_count, payment_unaudited_count, date_time,
+      create_time)
     values (#{aid,jdbcType=VARCHAR}, #{orderCount,jdbcType=INTEGER}, #{orderUnauditedCount,jdbcType=INTEGER},
       #{expenseCount,jdbcType=INTEGER}, #{expenseUnauditedCount,jdbcType=INTEGER}, #{invoiceCount,jdbcType=INTEGER},
       #{invoiceUnauditedCount,jdbcType=INTEGER}, #{memberCount,jdbcType=INTEGER}, #{memberUnauditedCount,jdbcType=INTEGER},
-      #{paymentCount,jdbcType=INTEGER}, #{paymentUnauditedCount,jdbcType=INTEGER}, #{publicReleaseCount,jdbcType=INTEGER},
-      #{dateTime,jdbcType=DATE}, #{createTime,jdbcType=TIMESTAMP})
+      #{paymentCount,jdbcType=INTEGER}, #{paymentUnauditedCount,jdbcType=INTEGER}, #{dateTime,jdbcType=DATE},
+      #{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.FinanceCount" useGeneratedKeys="true">
     insert into finance_count
@@ -81,9 +80,6 @@
       <if test="paymentUnauditedCount != null">
         payment_unaudited_count,
       </if>
-      <if test="publicReleaseCount != null">
-        public_release_count,
-      </if>
       <if test="dateTime != null">
         date_time,
       </if>
@@ -125,9 +121,6 @@
       <if test="paymentUnauditedCount != null">
         #{paymentUnauditedCount,jdbcType=INTEGER},
       </if>
-      <if test="publicReleaseCount != null">
-        #{publicReleaseCount,jdbcType=INTEGER},
-      </if>
       <if test="dateTime != null">
         #{dateTime,jdbcType=DATE},
       </if>
@@ -172,9 +165,6 @@
       <if test="paymentUnauditedCount != null">
         payment_unaudited_count = #{paymentUnauditedCount,jdbcType=INTEGER},
       </if>
-      <if test="publicReleaseCount != null">
-        public_release_count = #{publicReleaseCount,jdbcType=INTEGER},
-      </if>
       <if test="dateTime != null">
         date_time = #{dateTime,jdbcType=DATE},
       </if>
@@ -197,7 +187,6 @@
       member_unaudited_count = #{memberUnauditedCount,jdbcType=INTEGER},
       payment_count = #{paymentCount,jdbcType=INTEGER},
       payment_unaudited_count = #{paymentUnauditedCount,jdbcType=INTEGER},
-      public_release_count = #{publicReleaseCount,jdbcType=INTEGER},
       date_time = #{dateTime,jdbcType=DATE},
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
@@ -236,9 +225,7 @@
       <if test="paymentUnauditedCount != null">
         payment_unaudited_count = #{paymentUnauditedCount,jdbcType=INTEGER},
       </if>
-      <if test="publicReleaseCount != null">
-        public_release_count = #{publicReleaseCount,jdbcType=INTEGER},
-      </if>
+
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -275,4 +262,21 @@
     from finance_count
     where aid = #{aid} and date_time = #{startTime}
   </select>
+
+
+  <insert id="insetBatch">
+    insert into finance_count (aid, order_count, order_unaudited_count,
+    expense_count, expense_unaudited_count, invoice_count,
+    invoice_unaudited_count, member_count, member_unaudited_count,
+    payment_count, payment_unaudited_count,
+    date_time, create_time)
+    values
+    <foreach item="e" index="index" collection="list" separator=",">
+      (#{e.aid,jdbcType=VARCHAR}, #{e.orderCount,jdbcType=INTEGER}, #{e.orderUnauditedCount,jdbcType=INTEGER},
+      #{e.expenseCount,jdbcType=INTEGER}, #{e.expenseUnauditedCount,jdbcType=INTEGER}, #{e.invoiceCount,jdbcType=INTEGER},
+      #{e.invoiceUnauditedCount,jdbcType=INTEGER}, #{e.memberCount,jdbcType=INTEGER}, #{e.memberUnauditedCount,jdbcType=INTEGER},
+      #{e.paymentCount,jdbcType=INTEGER}, #{e.paymentUnauditedCount,jdbcType=INTEGER},
+      #{e.dateTime,jdbcType=DATE}, now())
+    </foreach>
+  </insert>
 </mapper>

+ 12 - 0
src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml

@@ -625,6 +625,18 @@ where a.status=2 and a.order_no=  #{orderNo,jdbcType=VARCHAR}
     from invoice_log a left join admin b on a.aid =b.id
     where a.invoice_id =#{id} order by a.create_time
   </select>
+    <select id="selectCountByFinance" resultType="com.goafanti.common.model.FinanceCount">
+      select x.aid,x.dates dateTime,count(*)invoiceCount,sum(if(x.status=1,1,0))invoiceUnauditedCount
+      from (select c.finance_id aid,a.status ,DATE_FORMAT(a.create_time , '%Y-%m-%d') dates
+            from t_order_invoice a
+                   left join t_order_new b on
+              a.order_no = b.order_no
+                   left join department c on
+              b.order_dep = c.id
+            where a.status in (1, 2) and a.approval in (0,2)
+              and c.finance_id = '060583e4-82a2-4f72-8141-ae44806844e7')x
+      group by x.aid,x.dates
+    </select>
 
 
 </mapper>

+ 8 - 0
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -2135,5 +2135,13 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     and salesman_id = #{aid}
     and create_time  BETWEEN #{startTime} and  #{endTime}
   </select>
+    <select id="selectCountByFinance" resultType="com.goafanti.common.model.FinanceCount">
+      select x.aid, x.dates dateTime, count(*)orderCount, sum(if(x.process_status = 3, 1, 0))orderUnauditedCount
+      from (SELECT b.finance_id aid, a.process_status, DATE_FORMAT(a.create_time , '%Y-%m-%d') dates
+            from t_order_new a left join department b on a.order_dep = b.id
+            where a.delete_sign in (0, 2, 3) and process_status >2
+              and b.finance_id = #{aid})x
+      group by x.aid, x.dates;
+    </select>
 
 </mapper>

+ 11 - 1
src/main/java/com/goafanti/common/mapper/TOrderPaymentMapper.xml

@@ -437,8 +437,18 @@ select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name com
   <select id="selectByCid" resultType="java.lang.Integer">
   select count(*) from t_order_payment where tpc_id = #{tpcId}
   </select>
+    <select id="selectCountByFinance" resultType="com.goafanti.common.model.FinanceCount">
+      select x.aid,x.dates dateTime,count(*) paymentCount,sum(if(x.status=0,1,0))paymentUnauditedCount
+      from (select d.finance_id aid,a.status ,DATE_FORMAT(a.create_time , '%Y-%m-%d') dates
+            from t_order_payment a left join t_order_task b on a.tid =b.id
+                                   left join t_order_new c on b.order_no =c.order_no
+                                   left join department d on c.order_dep =d.id
+            where c.delete_sign in (0,2,3) and a.status in (0,2,3)
+              and d.finance_id = #{aid})x
+      group by x.aid,x.dates
+    </select>
 
-  <delete id="deleteByParam">
+    <delete id="deleteByParam">
   delete from t_order_payment
     where 1=1
     and tid= #{tid}

+ 11 - 1
src/main/java/com/goafanti/common/mapper/TTaskMemberMapper.xml

@@ -162,8 +162,18 @@
     from t_task_member
     where tid = #{id,jdbcType=INTEGER}
   </select>
+    <select id="selectCountByFinance" resultType="com.goafanti.common.model.FinanceCount">
+      SELECT x.aid,x.dates,count(*) memberCount,sum(if(x.process_status=1,1,0))memberUnauditedCount
+      from (select d.finance_id aid ,b.process_status ,DATE_FORMAT(a.create_time , '%Y-%m-%d') dates
+            from t_task_member a left join t_order_task b on a.tid =b.id
+                                 left join t_order_new c on b.order_no =c.order_no
+                                 left join department d on c.order_dep =d.id
+            where c.delete_sign in (0,2,3) and b.process_status in (1,2,3)
+              and d.finance_id = #{aid})x
+      group by x.aid,x.dates
+    </select>
 
-  <update id="updateServiceYearBySplitSuper">
+    <update id="updateServiceYearBySplitSuper">
     update t_task_member a,(select a.split_super,GROUP_CONCAT(b.service_year) counts
         from t_order_task a left join t_task_member b on a.id=b.tid
         where a.split_status =2 and a.split_super= #{tid}

+ 14 - 14
src/main/java/com/goafanti/common/model/FinanceCount.java

@@ -69,11 +69,6 @@ public class FinanceCount implements Serializable {
     private Integer paymentUnauditedCount;
 
     /**
-     * 公出数
-     */
-    private Integer publicReleaseCount;
-
-    /**
      * 日期
      */
     private Date dateTime;
@@ -102,11 +97,24 @@ public class FinanceCount implements Serializable {
         financeCount.memberUnauditedCount=0;
         financeCount.paymentCount=0;
         financeCount.paymentUnauditedCount=0;
-        financeCount.publicReleaseCount=0;
         financeCount.dateTime= DateUtils.StringToDate(date, AFTConstants.YYYYMMDD);
         return financeCount;
     }
 
+    public static FinanceCount initialization(FinanceCount in) {
+        if (in.getOrderCount()==null)in.setOrderCount(0);
+        if (in.getOrderUnauditedCount()==null)in.setOrderUnauditedCount(0);
+        if (in.getExpenseCount()==null)in.setExpenseCount(0);
+        if (in.getExpenseUnauditedCount()==null)in.setExpenseUnauditedCount(0);
+        if (in.getInvoiceCount()==null)in.setInvoiceCount(0);
+        if (in.getInvoiceUnauditedCount()==null)in.setInvoiceUnauditedCount(0);
+        if (in.getMemberCount()==null)in.setMemberCount(0);
+        if (in.getMemberUnauditedCount()==null)in.setMemberUnauditedCount(0);
+        if (in.getPaymentCount()==null)in.setPaymentCount(0);
+        if (in.getPaymentUnauditedCount()==null)in.setPaymentUnauditedCount(0);
+        return in;
+    }
+
     public Integer getId() {
         return id;
     }
@@ -203,14 +211,6 @@ public class FinanceCount implements Serializable {
         this.paymentUnauditedCount = paymentUnauditedCount;
     }
 
-    public Integer getPublicReleaseCount() {
-        return publicReleaseCount;
-    }
-
-    public void setPublicReleaseCount(Integer publicReleaseCount) {
-        this.publicReleaseCount = publicReleaseCount;
-    }
-
     public Date getDateTime() {
         return dateTime;
     }

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1205,6 +1205,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 						t.setId(i);
 						tArrearsDunMapper.updateByPrimaryKeySelective(t);
 					}
+
 					addNewDunNoticAndSendEmail(b.getOrderNo(),o);
 				}
 			}