合作单位全职资源

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/FinancialExpenditureDao.java

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.entity.FinancialExpenditure;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -20,18 +21,19 @@ public interface FinancialExpenditureDao extends BaseDAO<Long, FinancialExpendit
 
     /**
      * 统计合作单位各类型的支出
+     *
      * @return
      */
-    List<FinancialExpenditure> getCooperationExpenditure();
+    List<FinancialExpenditure> getCooperationExpenditure(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
 
     /**
+     * @param collect:
+     * @return java.lang.Integer
      * @describe
      * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
      * @author zouxuan
      * @date 2020/9/16
      * @time 11:38
-     * @param collect:
-     * @return java.lang.Integer
      */
     List<String> countBydingTalk(@Param("collect") List<Object> collect);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OperatingReportServiceImpl.java

@@ -42,7 +42,7 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
     public Boolean statistics() {
         Date nowDate = new Date();
         Date startTime = DateUtil.getFirstDayOfMonth(DateUtil.addDays1(nowDate, -1));
-        Date endTime = DateUtil.getLastDayOfMonth(startTime);
+        Date endTime = DateUtil.getLastTimeWithDay(DateUtil.getLastDayOfMonth(startTime));
 
         Map<Integer, OperatingReport> cooperationOperating = new HashMap<>();
         Map<Integer, OperatingReport> organOperating = new HashMap<>();
@@ -68,7 +68,7 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
         }
 
         //2、获取支出费用
-        List<FinancialExpenditure> cooperationExpenditures = financialExpenditureDao.getCooperationExpenditure();
+        List<FinancialExpenditure> cooperationExpenditures = financialExpenditureDao.getCooperationExpenditure(startTime, endTime);
         for (FinancialExpenditure cooperationExpenditure : cooperationExpenditures) {
             OperatingReport organOperatingReport = new OperatingReport();
             if (organOperating.containsKey(cooperationExpenditure.getOrganId())) {
@@ -188,7 +188,7 @@ public class OperatingReportServiceImpl extends BaseServiceImpl<Integer, Operati
         }
         Date nowDate = new Date();
         Date startTime = DateUtil.getFirstDayOfMonth(DateUtil.addDays1(nowDate, -1));
-        Date endTime = DateUtil.getLastDayOfMonth(startTime);
+        Date endTime = DateUtil.getLastTimeWithDay(DateUtil.getLastDayOfMonth(startTime));
         Map<String, Object> params = new HashMap<>();
         params.put("startTime", startTime);
         params.put("endTime", endTime);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentRouteOrderServiceImpl.java

@@ -89,6 +89,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
         studentPaymentRouteOrderDto.setRouteOrganId(studentPaymentRouteOrderDto.getOrganId());
         studentPaymentRouteOrderDto.setExpectAmount(studentPaymentRouteOrderDto.getActualAmount());
         studentPaymentRouteOrderDto.setStatus(DealStatusEnum.SUCCESS);
+        studentPaymentRouteOrderDto.setCreateTime(studentPaymentRouteOrderDto.getPayTime());
         studentPaymentRouteOrderDto.setUpdateTime(nowDate);
 
         studentPaymentOrderDao.insert(studentPaymentRouteOrderDto);
@@ -147,8 +148,8 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                 sellOrder.setPaymentChannel(studentPaymentRouteOrderDto.getPaymentChannel());
                 sellOrder.setMerNo(studentPaymentRouteOrderDto.getMerNos());
                 sellOrder.setSellTime(studentPaymentRouteOrderDto.getCreateTime());
-                sellOrder.setCreateIme(new Date());
-                sellOrder.setUpdateTime(new Date());
+                sellOrder.setCreateIme(nowDate);
+                sellOrder.setUpdateTime(nowDate);
                 sellOrder.setType(SellTypeEnum.SCHOOL_BUY);
                 sellOrders.add(sellOrder);
             }

mec-biz/src/main/resources/config/mybatis/FinancialExpenditureMapper.xml

@@ -27,22 +27,31 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="FinancialExpenditure">
-		SELECT * FROM financial_expenditure WHERE id_ = #{id}
-	</select>
+        SELECT *
+        FROM financial_expenditure
+        WHERE id_ = #{id}
+    </select>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="FinancialExpenditure">
-		SELECT * FROM financial_expenditure WHERE del_flag_ = 0 ORDER BY id_
-	</select>
+        SELECT *
+        FROM financial_expenditure
+        WHERE del_flag_ = 0
+        ORDER BY id_
+    </select>
 
     <!-- 向数据库增加一条记录 -->
-    <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.FinancialExpenditure" useGeneratedKeys="true" keyColumn="id"
+    <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.FinancialExpenditure" useGeneratedKeys="true"
+            keyColumn="id"
             keyProperty="id">
-        INSERT INTO financial_expenditure (batch_no_,financial_process_no_,dingtalk_process_no_,
-        organ_id_,cooperation_organ_id_,apply_user_,amount_,item_detail_,payment_time_,cause_,create_time_,update_time_,fee_project_,type_)
-        VALUES(#{batchNo},#{financialProcessNo},#{dingtalkProcessNo},#{organId},#{cooperationOrganId},#{applyUser},#{amount},
-        #{itemDetail},#{paymentTime},#{cause},now(),now(),#{feeProject,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+        INSERT INTO financial_expenditure (batch_no_, financial_process_no_, dingtalk_process_no_,
+                                           organ_id_, cooperation_organ_id_, apply_user_, amount_, item_detail_,
+                                           payment_time_, cause_, create_time_, update_time_, fee_project_, type_)
+        VALUES (#{batchNo}, #{financialProcessNo}, #{dingtalkProcessNo}, #{organId}, #{cooperationOrganId},
+                #{applyUser}, #{amount},
+                #{itemDetail}, #{paymentTime}, #{cause}, now(), now(),
+                #{feeProject,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
 
     <insert id="batchInsert">
@@ -105,10 +114,14 @@
 
     <!-- 根据主键删除一条记录 -->
     <update id="delete">
-		UPDATE financial_expenditure SET del_flag_ = 1 WHERE id_ = #{id}
-	</update>
+        UPDATE financial_expenditure
+        SET del_flag_ = 1
+        WHERE id_ = #{id}
+    </update>
     <update id="batchDel">
-        UPDATE financial_expenditure SET del_flag_ = 1 WHERE FIND_IN_SET(id_,#{ids})
+        UPDATE financial_expenditure
+        SET del_flag_ = 1
+        WHERE FIND_IN_SET(id_, #{ids})
     </update>
 
     <sql id="queryPageSql">
@@ -131,7 +144,8 @@
             </if>
             <if test="search != null and search != ''">
                 AND (fe.id_ LIKE CONCAT('%',#{search},'%') OR fe.financial_process_no_ LIKE CONCAT('%',#{search},'%')
-                OR fe.dingtalk_process_no_ LIKE CONCAT('%',#{search},'%') OR fe.apply_user_ LIKE CONCAT('%',#{search},'%'))
+                OR fe.dingtalk_process_no_ LIKE CONCAT('%',#{search},'%') OR fe.apply_user_ LIKE
+                CONCAT('%',#{search},'%'))
             </if>
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(fe.organ_id_,#{organId})
@@ -160,11 +174,12 @@
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(DISTINCT fe.id_) FROM financial_expenditure fe
+        SELECT COUNT(DISTINCT fe.id_) FROM financial_expenditure fe
         <include refid="queryPageSql"/>
-	</select>
+    </select>
 
-    <resultMap type="com.ym.mec.biz.dal.dto.FinancialExpenditureDto" id="FinancialExpenditureDto" extends="FinancialExpenditure">
+    <resultMap type="com.ym.mec.biz.dal.dto.FinancialExpenditureDto" id="FinancialExpenditureDto"
+               extends="FinancialExpenditure">
         <result column="organ_name_" property="organName"/>
         <result column="cooperation_name_" property="cooperationName"/>
     </resultMap>
@@ -183,10 +198,14 @@
     </select>
 
     <!-- 统计合作单位的支出 -->
-    <select id="getCooperationExpenditure" resultMap="FinancialExpenditure">
-        SELECT organ_id_,cooperation_organ_id_, type_, SUM(amount_) amount_ FROM financial_expenditure WHERE del_flag_ =0
-        GROUP BY organ_id_,cooperation_organ_id_,type_
-    </select>
+    <select id="getCooperationExpenditure" resultMap="FinancialExpenditure"><![CDATA[
+        SELECT organ_id_, cooperation_organ_id_, type_, SUM(amount_) amount_
+        FROM financial_expenditure
+        WHERE payment_time_ >= #{startTime}
+          AND payment_time_ <= #{endTime}
+          AND del_flag_ = 0
+        GROUP BY organ_id_, cooperation_organ_id_, type_
+        ]]></select>
     <select id="countBydingTalk" resultType="java.lang.String">
         SELECT dingtalk_process_no_ FROM financial_expenditure WHERE del_flag_ = 0 AND dingtalk_process_no_ IN
         <foreach collection="collect" separator="," open="(" close=")" item="item">