1.优化资产各列表查询

2.开票审核与开票信息修改接口分开
3.开票审批列表查询新增字段businessType
4.资产流程优化
5.资产提成计算相关接口vo新增字段
6.修复资产结算项目导出内容为空的BUG

biz-base/src/main/java/com/dayou/controller/FinanceInvoiceController.java

@@ -1,5 +1,6 @@
 package com.dayou.controller;
 
+import com.dayou.vo.FinanceInvoiceVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,8 +30,8 @@ public class FinanceInvoiceController extends BaseController {
     * 财务开票列表
     */
     @GetMapping("")
-    public RestResponse<Page<FinanceInvoice>> page(FinanceInvoice financeInvoice, Page page,String keyword){
-        Page<FinanceInvoice> pages=financeInvoiceService.selectPage(page,financeInvoice,keyword);
+    public RestResponse<Page<FinanceInvoiceVo>> page(FinanceInvoice financeInvoice, Page page,String keyword){
+        Page<FinanceInvoiceVo> pages=financeInvoiceService.selectPage(page,financeInvoice,keyword);
         return RestResponse.data(pages);
     }
 
@@ -62,6 +63,17 @@ public class FinanceInvoiceController extends BaseController {
     }
 
     /**
+     * 开票审批
+     * @param financeInvoice
+     * @return
+     */
+    @PutMapping("/check")
+    public RestResponse<Boolean> invoiceCheck(@RequestBody FinanceInvoice financeInvoice) {
+        Boolean ret = financeInvoiceService.invoiceCheck(financeInvoice);
+        return RestResponse.data(ret);
+    }
+
+    /**
      * 财务开票删除
      */
     @DeleteMapping("/{id}")

biz-base/src/main/java/com/dayou/controller/FinanceRealFundController.java

@@ -315,7 +315,7 @@ public class FinanceRealFundController extends BaseController {
      * @return List<UserCommissionTotalAmountVO>
      */
     @GetMapping("/commission/assets/evaluator/detail")
-    public RestResponse<List<UserCommissionProdVO>> assetsEvaluatorCommissionDetail(UserCommissionProdVO vo) {
+    public RestResponse<List<UserCommissionProdAssetsVO>> assetsEvaluatorCommissionDetail(UserCommissionProdVO vo) {
         return RestResponse.data(financeRealFundService.assetsEvaluatorCommissionDetail(vo));
     }
 
@@ -337,14 +337,14 @@ public class FinanceRealFundController extends BaseController {
      */
     @GetMapping("/assets/evaluator/commission/current/export")
     public void assetsEvaluatorCurUserDetailExport(@Valid UserCommissionProdVO vo, HttpServletResponse response)throws IOException {
-        List<UserCommissionProdVO> result = financeRealFundService.assetsEvaluatorCurUserDetailExport(vo);
+        List<UserCommissionProdAssetsVO> result = financeRealFundService.assetsEvaluatorCurUserDetailExport(vo);
         String startDate = vo.getStartDate().split(" ")[0];
         String endDate = vo.getEndDate().split(" ")[0];
         String userName = "";
         if (CollectionUtil.isNotEmpty(result)){
             userName = result.get(0).getUserName();
         }
-        exportPlus(response,userName+"_资产评估人员提成详情"+ startDate +"至"+ endDate,result, UserCommissionProdVO.class);
+        exportPlus(response,userName+"_资产评估人员提成详情"+ startDate +"至"+ endDate,result, UserCommissionProdAssetsVO.class);
     }
 
     /**
@@ -353,10 +353,10 @@ public class FinanceRealFundController extends BaseController {
      */
     @GetMapping("/assets/evaluator/commission/all/export")
     public void assetsEvaluatorAllUserDetailExport(@Valid UserCommissionProdVO vo, HttpServletResponse response)throws IOException {
-        List<UserCommissionProdVO> result = financeRealFundService.assetsEvaluatorAllUserDetailExport(vo);
+        List<UserCommissionProdAssetsVO> result = financeRealFundService.assetsEvaluatorAllUserDetailExport(vo);
         String startDate = vo.getStartDate().split(" ")[0];
         String endDate = vo.getEndDate().split(" ")[0];
-        exportPlus(response,"资产评估人员提成详情"+ startDate +"至"+ endDate,result, UserCommissionProdVO.class);
+        exportPlus(response,"资产评估人员提成详情"+ startDate +"至"+ endDate,result, UserCommissionProdAssetsVO.class);
     }
 
     /**
@@ -461,7 +461,7 @@ public class FinanceRealFundController extends BaseController {
     @GetMapping("/assets/market/settle/export")
     public void assetsMarketSettleExport(SettleAssetsProductionVO settleVO, HttpServletResponse response)throws IOException {
         List<SettleAssetsProductionVO> result = financeRealFundService.assetsMarketSettleExport(settleVO);
-        exportPlus(response,"资产市场人员结算项目",result, SettleMajorProductionVO.class);
+        exportPlus(response,"资产市场人员结算项目",result, SettleAssetsProductionVO.class);
     }
 
     /**
@@ -483,7 +483,7 @@ public class FinanceRealFundController extends BaseController {
     @GetMapping("/assets/evaluator/settle/export")
     public void assetsEvaluatorSettleExport(SettleAssetsProductionVO settleVO, HttpServletResponse response)throws IOException {
         List<SettleAssetsProductionVO> result = financeRealFundService.assetsEvaluatorSettleExport(settleVO);
-        exportPlus(response,"资产评估人员结算项目",result, SettleMajorProductionVO.class);
+        exportPlus(response,"资产评估人员结算项目",result, SettleAssetsProductionVO.class);
     }
 }
 

dao/src/main/java/com/dayou/mapper/FinanceInvoiceMapper.java

@@ -3,6 +3,7 @@ package com.dayou.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.entity.FinanceInvoice;
 import com.dayou.dao.CustomBaseMapper;
+import com.dayou.vo.FinanceInvoiceVo;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -15,5 +16,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface FinanceInvoiceMapper extends CustomBaseMapper<FinanceInvoice> {
 
-    Page<FinanceInvoice> getPage(Page page, @Param("vo") FinanceInvoice financeInvoice,@Param("keyword") String keyword);
+    Page<FinanceInvoiceVo> getPage(Page page, @Param("vo") FinanceInvoice financeInvoice, @Param("keyword") String keyword);
 }

dao/src/main/java/com/dayou/mapper/FinanceRealFundMapper.java

@@ -64,7 +64,7 @@ public interface FinanceRealFundMapper extends CustomBaseMapper<FinanceRealFund>
      * @param vo vo
      * @return List<UserCommissionTotalAmountVO>
      */
-    List<UserCommissionProdVO> assetsEvaluatorCommissionDetail(@Param("vo") UserCommissionProdVO vo);
+    List<UserCommissionProdAssetsVO> assetsEvaluatorCommissionDetail(@Param("vo") UserCommissionProdVO vo);
 
     /**
      * 资产评估人员合计导出
@@ -78,7 +78,7 @@ public interface FinanceRealFundMapper extends CustomBaseMapper<FinanceRealFund>
      * @param vo vo
      * @return List<UserCommissionProdVO>
      */
-    List<UserCommissionProdVO> assetsEvaluatorUserDetailExport(@Param("vo")UserCommissionProdVO vo);
+    List<UserCommissionProdAssetsVO> assetsEvaluatorUserDetailExport(@Param("vo")UserCommissionProdVO vo);
 
     /**
      * 资产市场人员提成计算

dao/src/main/resources/mapper/AssetsMapper.xml

@@ -248,7 +248,7 @@
         WHERE assets.deleted = 0
         AND assets.client_manager_id = #{assetsSelectDTO.clientManagerId}
         #送达状态查询
-        <if test="assetsSelectDTO != null and assetsSelectDTO.delivery">
+        <if test="assetsSelectDTO != null and assetsSelectDTO.delivery != null">
             AND reportInfo.delivery = #{assetsSelectDTO.delivery}
         </if>
         #项目负责人查询

dao/src/main/resources/mapper/FinanceInvoiceMapper.xml

@@ -42,7 +42,7 @@
         production_fund_id, title, type, tax_no, plan_amount, real_amount, plan_make_date, real_make_date, state, reason, apply_id, checker_id, maker_id, bank_name, bank_account, bank_address, bank_tel, make_item, item_quantity, item_unit, tax_rate, tax_amount, remark
     </sql>
 
-    <select id="getPage" parameterType="com.dayou.entity.FinanceInvoice" resultType="com.dayou.entity.FinanceInvoice">
+    <select id="getPage" parameterType="com.dayou.entity.FinanceInvoice" resultType="com.dayou.vo.FinanceInvoiceVo">
         SELECT
             fi.*,
             orf.business_type,

dao/src/main/resources/mapper/FinanceRealFundMapper.xml

@@ -807,7 +807,7 @@
     </select>
 
     <!--资产评估人员提成计算详情-->
-    <select id="assetsEvaluatorCommissionDetail" resultType="com.dayou.vo.UserCommissionProdVO">
+    <select id="assetsEvaluatorCommissionDetail" resultType="com.dayou.vo.UserCommissionProdAssetsVO">
         SELECT
             ap.id,
             fc.claim_amount as realAmount,
@@ -816,8 +816,9 @@
             ( fc.claim_datetime > ap.save_file_date, fc.claim_datetime, ap.save_file_date ) AS settleDate,
             ap.assets_name AS name,
             ap.created,
-            dd.NAME AS businessCate,
-            bcr.min_ratio AS ratio,
+            dd.name AS businessCate,
+            IFNULL(cd.ratio,bcr.min_ratio) AS ratio,
+            cd.defined_low_limit_amount AS lowLimitAmount,
             bpd.member_id,
             bpd.performance_distribution AS allotRatio,
             IF(cd.defined_low_limit_amount &lt; fc.claim_amount,
@@ -936,7 +937,7 @@
     </select>
 
     <!--资产评估人员提成信息导出-->
-    <select id="assetsEvaluatorUserDetailExport" resultType="com.dayou.vo.UserCommissionProdVO">
+    <select id="assetsEvaluatorUserDetailExport" resultType="com.dayou.vo.UserCommissionProdAssetsVO">
         SELECT
         ap.id,
         ROUND(fc.claim_amount,2) as realAmount,
@@ -946,6 +947,8 @@
         ap.assets_name AS name,
         ap.created,
         dd.NAME AS businessCate,
+        IFNULL(cd.ratio,bcr.min_ratio) AS ratio,
+        cd.defined_low_limit_amount AS lowLimitAmount,
         ROUND(bcr.min_ratio,2) AS ratio,
         bpd.member_id AS userId,
         ROUND(bpd.performance_distribution,2) AS allotRatio,

dao/src/main/resources/mapper/WorkTaskRecordMapper.xml

@@ -510,8 +510,8 @@
     <!--获取资产业务已办列表-->
     <select id="getAssetsTaskDoneList" resultType="com.dayou.vo.AssetsTaskDoneVO">
         SELECT DISTINCT
-        # (@i := @i + 1) AS id,
-        instance.recordId AS id,
+        (@i := @i + 1) AS id,
+        instance.recordId,
         log.id AS logId,
         user.name AS handlerName,
         log.handler_id,
@@ -539,7 +539,7 @@
         instance.id AS instanceId,
         instance.created AS startDate
         FROM
-#             (SELECT @i := 0) AS sort,
+            (SELECT @i := 0) AS sort,
         work_flow_log AS log
         LEFT JOIN (SELECT work_flow_node_instance.id, node_id, business_id, state, business_sub_id,
         business_min_id,work_task_record.created,work_task_record.id AS recordId

domain/src/main/java/com/dayou/dto/AssetsSelectDTO.java

@@ -119,5 +119,4 @@ public class AssetsSelectDTO {
      * 部门id
      */
     private List<Long> departmentIdList;
-//    private String a;
 }

domain/src/main/java/com/dayou/vo/FinanceInvoiceVo.java

@@ -0,0 +1,14 @@
+package com.dayou.vo;
+
+import com.dayou.entity.FinanceInvoice;
+import lombok.Data;
+
+@Data
+public class FinanceInvoiceVo extends FinanceInvoice {
+
+    /**
+     * 业务类型
+     */
+    private String businessType;
+
+}

domain/src/main/java/com/dayou/vo/UserCommissionProdAssetsVO.java

@@ -0,0 +1,13 @@
+package com.dayou.vo;
+
+import com.dayou.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class UserCommissionProdAssetsVO extends UserCommissionProdVO{
+
+    @Excel(name = "提成下限(元)")
+    private BigDecimal lowLimitAmount;
+}

service/src/main/java/com/dayou/service/IFinanceInvoiceService.java

@@ -3,6 +3,7 @@ import com.dayou.entity.FinanceInvoice;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dayou.vo.FinanceInvoiceVo;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -18,7 +19,7 @@ import java.util.List;
  */
 public interface IFinanceInvoiceService extends IService<FinanceInvoice> {
 
-        Page<FinanceInvoice> selectPage(Page page,FinanceInvoice financeInvoice,String keyword);
+        Page<FinanceInvoiceVo> selectPage(Page page, FinanceInvoice financeInvoice, String keyword);
 
         FinanceInvoice detail(Long id);
 
@@ -26,6 +27,8 @@ public interface IFinanceInvoiceService extends IService<FinanceInvoice> {
 
         Boolean update(FinanceInvoice financeInvoice);
 
+        Boolean invoiceCheck(FinanceInvoice financeInvoice);
+
         Boolean delete(Long id);
 
     List<FinanceInvoice> getList(Long id);

service/src/main/java/com/dayou/service/IFinanceRealFundService.java

@@ -78,7 +78,7 @@ public interface IFinanceRealFundService extends IService<FinanceRealFund> {
      * @param vo vo
      * @return List<UserCommissionTotalAmountVO>
      */
-    List<UserCommissionProdVO> assetsEvaluatorCommissionDetail(UserCommissionProdVO vo);
+    List<UserCommissionProdAssetsVO> assetsEvaluatorCommissionDetail(UserCommissionProdVO vo);
 
     /**
      * 资产评估人员提成合计导出
@@ -92,14 +92,14 @@ public interface IFinanceRealFundService extends IService<FinanceRealFund> {
      * @param vo vo
      * @return List<UserCommissionProdVO>
      */
-    List<UserCommissionProdVO> assetsEvaluatorCurUserDetailExport(UserCommissionProdVO vo);
+    List<UserCommissionProdAssetsVO> assetsEvaluatorCurUserDetailExport(UserCommissionProdVO vo);
 
     /**
      * 资产所有评估人员提成信息导出
      * @param vo vo
      * @return List<UserCommissionProdVO>
      */
-    List<UserCommissionProdVO> assetsEvaluatorAllUserDetailExport(UserCommissionProdVO vo);
+    List<UserCommissionProdAssetsVO> assetsEvaluatorAllUserDetailExport(UserCommissionProdVO vo);
 
     /**
      * 资产市场人员提成计算

service/src/main/java/com/dayou/service/impl/AssetsServiceImpl.java

@@ -102,6 +102,10 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
                     .map(SimpleParentModel::getId)
                     .collect(Collectors.toList()));
         }
+        // 此处判断handlerId是否为空只是为了确保前端查询条件有handlerId,并不直接信任
+        if (ObjectUtil.isNotNull(assetsSelectDTO) && ObjectUtil.isNotNull(assetsSelectDTO.getHandlerId())){
+            assetsSelectDTO.setHandlerId(LoginContext.getCurrentUserId());
+        }
         return assetsMapper.selectPage(page, assetsSelectDTO);
     }
 
@@ -114,6 +118,10 @@ public class AssetsServiceImpl extends ServiceImpl<AssetsMapper, Assets> impleme
      */
     @Override
     public Page<AssetsVO> selectMyOrderPage(Page page, AssetsSelectDTO assetsSelectDTO) {
+        // 此处判断managerId是否为空只是为了确保前端查询条件有managerId,并不直接信任
+        if (ObjectUtil.isNotNull(assetsSelectDTO) && ObjectUtil.isNotNull(assetsSelectDTO.getClientManagerId())){
+            assetsSelectDTO.setClientManagerId(LoginContext.getCurrentUserId());
+        }
         return assetsMapper.selectMyOrderPage(page, assetsSelectDTO);
     }
 

service/src/main/java/com/dayou/service/impl/FinanceInvoiceServiceImpl.java

@@ -9,6 +9,7 @@ import com.dayou.mapper.FinanceInvoiceMapper;
 import com.dayou.service.IFinanceInvoiceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dayou.utils.LoginContext;
+import com.dayou.vo.FinanceInvoiceVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -46,8 +47,8 @@ public class FinanceInvoiceServiceImpl extends ServiceImpl<FinanceInvoiceMapper,
 
     @Override
     @SuppressWarnings("unchecked")
-    public Page<FinanceInvoice> selectPage(Page page,FinanceInvoice financeInvoice,String keyword){
-        Page<FinanceInvoice> ret = financeInvoiceMapper.getPage(page,financeInvoice,keyword);
+    public Page<FinanceInvoiceVo> selectPage(Page page,FinanceInvoice financeInvoice,String keyword){
+        Page<FinanceInvoiceVo> ret = financeInvoiceMapper.getPage(page,financeInvoice,keyword);
         return ret;
     }
 
@@ -65,10 +66,18 @@ public class FinanceInvoiceServiceImpl extends ServiceImpl<FinanceInvoiceMapper,
 
     @Override
     public Boolean update(FinanceInvoice financeInvoice){
+//        financeInvoice.setCheckerId(LoginContext.getCurrentUserId());
+//        financeInvoice.setMakerId(LoginContext.getCurrentUserId());
+//        financeInvoice.setState(FinanceInvoiceState.已开票.name());
+        return this.updateById(financeInvoice);
+    }
+
+    @Override
+    public Boolean invoiceCheck(FinanceInvoice financeInvoice) {
         financeInvoice.setCheckerId(LoginContext.getCurrentUserId());
         financeInvoice.setMakerId(LoginContext.getCurrentUserId());
-        financeInvoice.setState(FinanceInvoiceState.已开票.name());
-        return  this.updateById(financeInvoice);
+//        financeInvoice.setState(FinanceInvoiceState.已开票.name());
+        return this.updateById(financeInvoice);
     }
 
     @Override

service/src/main/java/com/dayou/service/impl/FinanceRealFundServiceImpl.java

@@ -204,7 +204,7 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
      * @return List<UserCommissionTotalAmountVO>
      */
     @Override
-    public List<UserCommissionProdVO> assetsEvaluatorCommissionDetail(UserCommissionProdVO vo) {
+    public List<UserCommissionProdAssetsVO> assetsEvaluatorCommissionDetail(UserCommissionProdVO vo) {
         return financeRealFundMapper.assetsEvaluatorCommissionDetail(vo);
     }
 
@@ -224,7 +224,7 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
      * @return List<UserCommissionProdVO>
      */
     @Override
-    public List<UserCommissionProdVO> assetsEvaluatorCurUserDetailExport(UserCommissionProdVO vo) {
+    public List<UserCommissionProdAssetsVO> assetsEvaluatorCurUserDetailExport(UserCommissionProdVO vo) {
         return financeRealFundMapper.assetsEvaluatorUserDetailExport(vo);
     }
 
@@ -234,7 +234,7 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
      * @return List<UserCommissionProdVO>
      */
     @Override
-    public List<UserCommissionProdVO> assetsEvaluatorAllUserDetailExport(UserCommissionProdVO vo) {
+    public List<UserCommissionProdAssetsVO> assetsEvaluatorAllUserDetailExport(UserCommissionProdVO vo) {
         vo.setUserId(null);
         return financeRealFundMapper.assetsEvaluatorUserDetailExport(vo);
     }