公司账户流水添加合计金额

fs-admin/src/main/java/com/fs/company/controller/CompanyMoneyLogsController.java

@@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -67,6 +68,8 @@ public class CompanyMoneyLogsController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(CompanyMoneyLogsParam companyMoneyLogs)
     {
+        // 计算 总金额
+        BigDecimal totalMoney = companyMoneyLogsService.selectCompanyMoneyLogsTotalMoney(companyMoneyLogs);
         startPage();
         if(!StringUtils.isEmpty(companyMoneyLogs.getCreateTimeRange())){
             companyMoneyLogs.setCreateTimeList(companyMoneyLogs.getCreateTimeRange().split("--"));
@@ -74,10 +77,16 @@ public class CompanyMoneyLogsController extends BaseController
         if(companyMoneyLogs.getLogsType()!=null){
             if(companyMoneyLogs.getLogsType()==3 || companyMoneyLogs.getLogsType()==4 || companyMoneyLogs.getLogsType()==5 || companyMoneyLogs.getLogsType()==6 || companyMoneyLogs.getLogsType()==13|| companyMoneyLogs.getLogsType()==14){
                 List<CompanyMoneyLogsVO> list = companyMoneyLogsService.selectCompanyMoneyLogsMallVOList(companyMoneyLogs);
+                if(list != null && !list.isEmpty()){
+                    list.get(0).setTotalMoney(totalMoney);
+                }
                 return getDataTable(list);
             }
         }
         List<CompanyMoneyLogsVO> list = companyMoneyLogsService.selectCompanyMoneyLogsVOList(companyMoneyLogs);
+        if(list != null && !list.isEmpty()){
+            list.get(0).setTotalMoney(totalMoney);
+        }
         return getDataTable(list);
     }
 

fs-service/src/main/java/com/fs/company/mapper/CompanyMoneyLogsMapper.java

@@ -323,4 +323,6 @@ public interface CompanyMoneyLogsMapper
     Integer selectCompanyMoneyLogsExport1Counts(@Param("maps")FsCompanyMoneyLogsExportParam param);
 
     List<CompanyRedPackage> selectCompanyRedPackageListVO(CompanyRedPackage companyRedPackage);
+
+    BigDecimal selectCompanyMoneyLogsTotalMoney(@Param("maps")CompanyMoneyLogsParam companyMoneyLogs);
 }

fs-service/src/main/java/com/fs/company/service/ICompanyMoneyLogsService.java

@@ -94,4 +94,6 @@ public interface ICompanyMoneyLogsService
     void exportData(FsCompanyMoneyLogsExportParam param);
 
     List<CompanyRedPackage> selectCompanyRedPackageListVO(CompanyRedPackage companyRedPackage);
+
+    BigDecimal selectCompanyMoneyLogsTotalMoney(CompanyMoneyLogsParam companyMoneyLogs);
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyMoneyLogsServiceImpl.java

@@ -252,4 +252,9 @@ public class CompanyMoneyLogsServiceImpl implements ICompanyMoneyLogsService
     public List<CompanyRedPackage> selectCompanyRedPackageListVO(CompanyRedPackage companyRedPackage) {
         return companyMoneyLogsMapper.selectCompanyRedPackageListVO(companyRedPackage);
     }
+
+    @Override
+    public BigDecimal selectCompanyMoneyLogsTotalMoney(CompanyMoneyLogsParam companyMoneyLogs) {
+        return companyMoneyLogsMapper.selectCompanyMoneyLogsTotalMoney(companyMoneyLogs);
+    }
 }

fs-service/src/main/java/com/fs/company/vo/CompanyMoneyLogsVO.java

@@ -69,4 +69,7 @@ public class CompanyMoneyLogsVO implements Serializable
     //支付类型
     private String payTypeCode;
 
+    // 合计金额
+    private BigDecimal totalMoney;
+
 }

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -693,7 +693,7 @@ public class FsUserServiceImpl implements IFsUserService {
                     item.setWatchCourseCount(byUserId.getWatchCourseCount());
                     item.setMissCourseCount(byUserId.getMissCourseCount());
                     item.setMissCourseStatus(byUserId.getMissCourseStatus());
-                    if (StringUtils.isNotEmpty(byUserId.getPartCourseCount())) {
+                    if (StringUtils.isNotEmpty(byUserId.getPartCourseCount())) {// 营期数统计不正确 不要使用
                         item.setPartCourseCount(new BigDecimal(byUserId.getPartCourseCount()).longValue());
                     }
 //                    item.setCourseCountStatus(byUserId.getStatus());
@@ -727,6 +727,7 @@ public class FsUserServiceImpl implements IFsUserService {
                 Map<String, Object> map = new HashMap<>();
                 map.put("userId", item.getUserId());
                 map.put("companyUserId", item.getCompanyUserId());
+                map.put("projectId", item.getProjectId());
                 // 获取小程序标签
                 List<CompanyTag> companyTags = companyTagMapper.selectCompanyTagByUserId(map);
                 if (companyTags != null && companyTags.size() > 0) {

fs-service/src/main/resources/mapper/company/CompanyMoneyLogsMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fs.company.mapper.CompanyMoneyLogsMapper">
-    
+
     <resultMap type="CompanyMoneyLogs" id="CompanyMoneyLogsResult">
         <result property="logsId"    column="logs_id"    />
         <result property="companyId"    column="company_id"    />
@@ -21,12 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCompanyMoneyLogsList" parameterType="CompanyMoneyLogs" resultMap="CompanyMoneyLogsResult">
         <include refid="selectCompanyMoneyLogsVo"/>
-        <where>  
+        <where>
             <if test="companyId != null "> and company_id = #{companyId}</if>
             <if test="money != null "> and money = #{money}</if>
         </where>
     </select>
-    
+
     <select id="selectCompanyMoneyLogsById" parameterType="Long" resultMap="CompanyMoneyLogsResult">
         <include refid="selectCompanyMoneyLogsVo"/>
         where logs_id = #{logsId}
@@ -47,6 +47,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY l.company_user_id
         order by c.company_id,u.user_id
     </select>
+    <select id="selectCompanyMoneyLogsTotalMoney" resultType="java.math.BigDecimal">
+        select sum(money) from company_money_logs
+        <where>
+            <if test="maps.companyId != null "> and company_id = #{maps.companyId}</if>
+            <if test="maps.logsType != null"> and logs_type = #{maps.logsType}</if>
+            <if test="maps.createTimeList != null">
+                AND date_format(create_time,'%y%m%d') &gt;= date_format(#{maps.createTimeList[0]},'%y%m%d')
+                AND date_format(create_time,'%y%m%d') &lt;= date_format(#{maps.createTimeList[1]},'%y%m%d')
+            </if>
+        </where>
+
+    </select>
 
     <insert id="insertCompanyMoneyLogs" parameterType="CompanyMoneyLogs" useGeneratedKeys="true" keyProperty="logsId">
         insert into company_money_logs
@@ -89,10 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCompanyMoneyLogsByIds" parameterType="String">
-        delete from company_money_logs where logs_id in 
+        delete from company_money_logs where logs_id in
         <foreach item="logsId" collection="array" open="(" separator="," close=")">
             #{logsId}
         </foreach>
     </delete>
-    
-</mapper>
+
+</mapper>

fs-service/src/main/resources/mapper/company/CompanyTagMapper.xml

@@ -100,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         inner join fs_user_project_tag ft on ct.tag_id =ft.tag_id
         inner join fs_user_company_user fucu on fucu.id = ft.user_company_user_id
         <where>
+            project_id = #{projectId}
             <if test="params.companyUserId != null">
                 and fucu.company_user_id = #{params.companyUserId}
             </if>