Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-1phase

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

@@ -47,7 +47,7 @@ public class FinanceRealFundController extends BaseController {
     }
 
     /**
-     * 财务实收款认领列表
+     * 财务实收认领列表
      */
     @GetMapping("/claim")
     public RestResponse<Page<FinanceRealFundVO>> claimPage(FinanceRealFund financeRealFund, Page page,String keyword){
@@ -516,16 +516,23 @@ public class FinanceRealFundController extends BaseController {
 
     /**
      * 实收款导出
-     * @param financeRealFund
      * @param keyword
-     * @param page
      * @param response
      * @throws IOException
      */
     @GetMapping("/export")
-    public void financeRealFundExport(FinanceRealFund financeRealFund,String keyword,Page page,HttpServletResponse response) throws IOException {
-        List<FinanceRealFundExportDTO> data = financeRealFundService.exportList(financeRealFund,keyword,page);
-        exportPlus(response,"实收款导出",data, FinanceRealFundExportDTO.class);
+    public void financeRealFundExport(FinanceRealFundVO vo, String keyword,HttpServletResponse response) throws IOException {
+        List<FinanceRealFundExportDTO> data = financeRealFundService.realClaimedExport(vo,keyword);
+        exportPlus(response,"实收款已认领导出",data, FinanceRealFundExportDTO.class);
+    }
+
+    /**
+     * 财务实收款已认领列表
+     */
+    @GetMapping("/real/claimed")
+    public RestResponse<Page<FinanceRealFundVO>> realClaimed(FinanceRealFundVO vo, Page page,String keyword){
+        Page<FinanceRealFundVO> pages=financeRealFundService.realClaimed(page,vo,keyword);
+        return RestResponse.data(pages);
     }
 }
 

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

@@ -177,25 +177,23 @@ public class WorkTaskRecordController extends BaseController {
 
     /**
      * 个贷业务我的待办(入库)
-     * @param todoVO
-     * @param keyword
+     * @param nodeCode
      * @return
      */
     @GetMapping("/personal/inRep/todo")
-    public RestResponse<List<PersonalTodoVO>> personalInRepTodoList(PersonalTodoVO todoVO, String keyword){
-        List<PersonalTodoVO> ret = workTaskRecordService.personalInRepTodoList(todoVO,keyword);
+    public RestResponse<List<PersonalTodoVO>> personalInRepTodoList(String nodeCode){
+        List<PersonalTodoVO> ret = workTaskRecordService.personalInRepTodoList(nodeCode);
         return RestResponse.data(ret);
     }
 
     /**
      * 个贷业务我的待办(出库)
-     * @param todoVO
-     * @param keyword
+     * @param nodeCode
      * @return
      */
     @GetMapping("/personal/outRep/todo")
-    public RestResponse<List<PersonalTodoVO>> personalOutRepTodoList(PersonalTodoVO todoVO, String keyword){
-        List<PersonalTodoVO> ret = workTaskRecordService.personalOutRepTodoList(todoVO,keyword);
+    public RestResponse<List<PersonalTodoVO>> personalOutRepTodoList(String nodeCode){
+        List<PersonalTodoVO> ret = workTaskRecordService.personalOutRepTodoList(nodeCode);
         return RestResponse.data(ret);
     }
 }

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

@@ -161,5 +161,8 @@ public interface FinanceRealFundMapper extends CustomBaseMapper<FinanceRealFund>
 
     List<FinanceRealFundExportDTO> exportList(Page page,@Param("vo") FinanceRealFund vo,@Param("keyword") String keyword);
 
+    Page<FinanceRealFundVO> realAmountClaimed(Page page, @Param("vo") FinanceRealFundVO vo,@Param("keyword") String keyword);
 
+
+    List<FinanceRealFundExportDTO> realClaimedExport( @Param("vo")FinanceRealFundVO vo, @Param("keyword")String keyword);
 }

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

@@ -58,7 +58,7 @@ public interface WorkTaskRecordMapper extends CustomBaseMapper<WorkTaskRecord> {
 
     List<Long> getHandlerIdByLastNode(@Param("businessType")String businessType, @Param("businessId")Long businessId, @Param("businessSubId")String businessSubId, @Param("businessMinId")String businessMinId);
 
-    List<PersonalTodoVO> personalInRepTodoList(@Param("personal") PersonalTodoVO  personal, @Param("keyword")String keyword);
+    List<PersonalTodoVO> personalInRepTodoList(@Param("nodeCode")String nodeCode,@Param("currentUserId") Long currentUserId);
 
-    List<PersonalTodoVO> personalOutRepTodoList(@Param("personal") PersonalTodoVO todoVO, @Param("keyword")String keyword);
+    List<PersonalTodoVO> personalOutRepTodoList(@Param("nodeCode")String nodeCode,@Param("currentUserId") Long currentUserId);
 }

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

@@ -1981,4 +1981,69 @@
         <include refid="pageListSql" />
         ORDER BY frf.pay_datetime DESC
     </select>
+
+    <sql id="realAmountClaimedSQL">
+        SELECT
+        claimd.id,
+        fr.amount,
+        fr.payer,
+        fr.pay_datetime,
+        fr.remark,
+        claimd.claimAmount,
+        claimd.claimDate,
+        u.NAME AS creator,
+        u1.NAME AS claimUser
+        FROM
+        (
+        SELECT
+        frf.id,
+        sum( fc.claim_amount ) claimAmount,
+        max( fc.claim_datetime ) claimDate,
+        fc.claim_user_id
+        FROM
+        finance_claim fc
+        LEFT JOIN finance_real_fund frf ON frf.id = fc.real_fund_id
+        WHERE
+        frf.deleted = 0
+        AND fc.deleted = 0
+        GROUP BY
+        frf.id
+        ) claimd
+        LEFT JOIN finance_real_fund fr ON fr.id = claimd.id
+        LEFT JOIN user u ON u.id = fr.creator_id
+        LEFT JOIN user u1 ON u1.id = claimd.claim_user_id
+        <where>
+            <if test="keyword!=null and keyword!='' ">
+                and (
+                fr.payer like concat ('%',#{keyword},'%')
+                or u1.name like concat('%',#{keyword},'%')
+                or claimd.claimAmount = #{keyword}
+                or fr.amount = #{keyword}
+                or fr.remark like concat('%',#{keyword},'%')
+                )
+            </if>
+            <if test="vo!=null and vo.startDate!=null and vo.startDate!=''">
+                and fr.pay_datetime &gt;= #{vo.startDate}
+            </if>
+            <if test="vo!=null and vo.endDate!=null and vo.endDate!=''">
+                and fr.pay_datetime &lt;= #{vo.endDate}
+            </if>
+            <if test="vo!=null and vo.xStartDate!=null and vo.xStartDate!=''">
+                and claimd.claimDate &gt;= #{vo.xStartDate}
+            </if>
+            <if test="vo!=null and vo.xEndDate!=null and vo.xEndDate!=''">
+                and claimd.claimDate &lt;= #{vo.xEndDate}
+            </if>
+        </where>
+        ORDER BY
+        claimd.claimDate DESC
+    </sql>
+
+    <select id="realAmountClaimed" parameterType="com.dayou.vo.FinanceRealFundVO" resultType="com.dayou.vo.FinanceRealFundVO">
+       <include refid="realAmountClaimedSQL" />
+    </select>
+
+    <select id="realClaimedExport" parameterType="com.dayou.vo.FinanceRealFundVO" resultType="com.dayou.dto.FinanceRealFundExportDTO">
+        <include refid="realAmountClaimedSQL" />
+    </select>
 </mapper>

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

@@ -35,7 +35,8 @@
             ROUND(pt.amount/10000,2) AS amount,
             p.location AS productionName,
             p.order_id AS productionNo ,
-            CONCAT_WS('、',p.bailorA,p.bailorB) as bailor
+            p.bailorA,
+            p.bailorB
         FROM
             personal_target pt
                 LEFT JOIN personal p ON p.id = pt.personal_id

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

@@ -682,7 +682,7 @@
             )
     </select>
 
-    <select id="personalInRepTodoList"  parameterType="com.dayou.vo.TaskTodoVO" resultType="com.dayou.vo.PersonalTodoVO">
+    <select id="personalInRepTodoList"   resultType="com.dayou.vo.PersonalTodoVO">
         SELECT
         wfni.id,
         wtr.id AS taskId,
@@ -752,15 +752,18 @@
         )
         ) c on c.business_id = p.id
         WHERE
-        wtr.handler_id = #{personal.handlerId}
+        wtr.handler_id = #{currentUserId}
         AND u.deleted = 0
         AND wnt.deleted = 0
         AND wtr.deleted = 0
         AND wfni.code in ('STATEMENT_IN','REPORT_IN','LETTER_IN')
+        <if test="nodeCode!=null and nodeCode!=''">
+            and wfni.code = #{nodeCode}
+        </if>
         order by wfni.modified DESC
     </select>
 
-    <select id="personalOutRepTodoList"  parameterType="com.dayou.vo.TaskTodoVO" resultType="com.dayou.vo.PersonalTodoVO">
+    <select id="personalOutRepTodoList"  resultType="com.dayou.vo.PersonalTodoVO">
         SELECT
             wfni.id,
             wtr.id AS taskId,
@@ -830,11 +833,14 @@
                 )
             ) c on c.business_id = p.id
         WHERE
-            wtr.handler_id = #{personal.handlerId}
+            wtr.handler_id = #{currentUserId}
           AND u.deleted = 0
           AND wnt.deleted = 0
           AND wtr.deleted = 0
           AND wfni.code in ('STATEMENT_OUT','REPORT_OUT','LETTER_OUT')
+            <if test="nodeCode!=null and nodeCode!=''">
+                and wfni.code = #{nodeCode}
+            </if>
         order by wfni.modified DESC
     </select>
 </mapper>

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

@@ -21,14 +21,10 @@ public class FinanceRealFundExportDTO {
     /**
      * 付款银行
      */
-    @Excel(name = "付款银行")
+    //@Excel(name = "付款银行")
     private String payerBank;
 
-    /**
-     * 付款金额
-     */
-    @Excel(name = "付款金额")
-    private BigDecimal amount;
+
 
     /**
      * 到账时日
@@ -36,18 +32,24 @@ public class FinanceRealFundExportDTO {
     @Excel(name = "到账时日")
     private LocalDate payDatetime;
 
+    /**
+     * 付款金额
+     */
+    @Excel(name = "付款金额")
+    private BigDecimal amount;
+
     @Excel(name= "已认领（元）")
     private BigDecimal claimAmount;
 
-    @Excel(name= "未认领（元）")
-    private BigDecimal notClaimAmount;
+    @Excel(name= "认领人")
+    private String claimUser;
+
+    @Excel(name= "认领时间" ,dateFormat="yyyy-MM-dd")
+    private Date claimDate;
 
     @Excel(name= "录入人")
     private String creator;
 
-    @Excel(name= "录入时间" ,dateFormat="yyyy-MM-dd")
-    private Date created;
-
     @Excel(name = "备注")
     private String remark;
 

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

@@ -28,4 +28,6 @@ public class FinanceRealFundVO extends FinanceRealFund {
     private Long userId;
 
     private Date claimDate;
+
+    private String claimUser;
 }

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

@@ -18,6 +18,10 @@ public class ProdValidateVO {
 
     private String bailor;
 
+    private String bailorA;
+
+    private String bailorB;
+
     private String productionName;
 
     private BigDecimal acreage;

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

@@ -187,4 +187,8 @@ public interface IFinanceRealFundService extends IService<FinanceRealFund> {
     List<FinanceRealFundExportDTO> exportList(FinanceRealFund financeRealFund, String keyword,Page page);
 
     Page<FinanceRealFundVO> claimPage(Page page, FinanceRealFund financeRealFund, String keyword);
+
+    Page<FinanceRealFundVO> realClaimed(Page page, FinanceRealFundVO vo, String keyword);
+
+    List<FinanceRealFundExportDTO> realClaimedExport(FinanceRealFundVO vo, String keyword);
 }

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

@@ -121,6 +121,13 @@ public class BusinessProductionServiceImpl implements IBusinessProductionService
         ProdValidateVO prodValidateVO = null;
         if (MainBusinessEnum.PERSONAL_BUSINESS.name().equals(businessType)){
             prodValidateVO = personalTargetMapper.validateProd(businessId);
+            if (StrUtil.isNotBlank(prodValidateVO.getBailorA()) && StrUtil.isNotBlank(prodValidateVO.getBailorB())){
+                prodValidateVO.setBailor(prodValidateVO.getBailorA()+"、"+prodValidateVO.getBailorB());
+            }else if (StrUtil.isNotBlank(prodValidateVO.getBailorA()) && StrUtil.isBlank(prodValidateVO.getBailorB())){
+                prodValidateVO.setBailor(prodValidateVO.getBailorA());
+            }else {
+                prodValidateVO.setBailor(prodValidateVO.getBailorB());
+            }
         }
         if (MainBusinessEnum.MAJOR_BUSINESS.name().equals(businessType)){
             prodValidateVO = majorProductionMapper.validateProd(businessId);

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

@@ -70,6 +70,17 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
         return ret;
     }
 
+    @Override
+    public Page<FinanceRealFundVO> realClaimed(Page page, FinanceRealFundVO vo, String keyword) {
+        Page<FinanceRealFundVO> financeRealFundVOPage = financeRealFundMapper.realAmountClaimed(page, vo, keyword);
+        return financeRealFundVOPage;
+    }
+
+    @Override
+    public List<FinanceRealFundExportDTO> realClaimedExport(FinanceRealFundVO vo, String keyword) {
+        return financeRealFundMapper.realClaimedExport(vo, keyword);
+    }
+
 
     @Override
     public FinanceRealFund detail(Long id){

service/src/main/java/com/dayou/service/workflow/IWorkTaskRecordService.java

@@ -73,7 +73,7 @@ public interface IWorkTaskRecordService extends IService<WorkTaskRecord> {
      */
     Long getHandlerIdByLastNode(String businessType,Long businessId,String businessSubId,String businessMinId);
 
-    List<PersonalTodoVO> personalInRepTodoList(PersonalTodoVO todoVO, String keyword);
+    List<PersonalTodoVO> personalInRepTodoList(String nodeCode);
 
-    List<PersonalTodoVO> personalOutRepTodoList(PersonalTodoVO todoVO, String keyword);
+    List<PersonalTodoVO> personalOutRepTodoList(String nodeCode);
 }

service/src/main/java/com/dayou/service/workflow/WorkTaskRecordServiceImpl.java

@@ -195,16 +195,14 @@ public class WorkTaskRecordServiceImpl extends ServiceImpl<WorkTaskRecordMapper,
     }
 
     @Override
-    public List<PersonalTodoVO> personalInRepTodoList(PersonalTodoVO todoVO, String keyword) {
-        todoVO.setHandlerId(LoginContext.getCurrentUserId());
-        List<PersonalTodoVO> ret = workTaskRecordMapper.personalInRepTodoList(todoVO,keyword);
+    public List<PersonalTodoVO> personalInRepTodoList(String nodeCode) {
+        List<PersonalTodoVO> ret = workTaskRecordMapper.personalInRepTodoList(nodeCode,LoginContext.getCurrentUserId());
         return ret;
     }
 
     @Override
-    public List<PersonalTodoVO> personalOutRepTodoList(PersonalTodoVO todoVO, String keyword) {
-        todoVO.setHandlerId(LoginContext.getCurrentUserId());
-        List<PersonalTodoVO> ret = workTaskRecordMapper.personalOutRepTodoList(todoVO,keyword);
+    public List<PersonalTodoVO> personalOutRepTodoList(String nodeCode) {
+        List<PersonalTodoVO> ret = workTaskRecordMapper.personalOutRepTodoList(nodeCode,LoginContext.getCurrentUserId());
         return ret;
     }