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

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

@@ -3,6 +3,7 @@ package com.dayou.controller;
 import cn.hutool.core.collection.CollectionUtil;
 import com.dayou.annotation.DataPermission;
 import com.dayou.dto.FinanceRealFundExportDTO;
+import com.dayou.dto.FinanceRealNotClaimDTO;
 import com.dayou.utils.ExcelOneToManyExportUtils;
 import com.dayou.vo.*;
 import lombok.extern.slf4j.Slf4j;
@@ -515,7 +516,7 @@ public class FinanceRealFundController extends BaseController {
     }
 
     /**
-     * 实收款导出
+     * 实收款已认领导出
      * @param keyword
      * @param response
      * @throws IOException
@@ -527,6 +528,18 @@ public class FinanceRealFundController extends BaseController {
     }
 
     /**
+     * 实收款未认领导出
+     * @param keyword
+     * @param response
+     * @throws IOException
+     */
+    @GetMapping("/not/claim/export")
+    public void financeRealFundNotClaimExport(FinanceRealFundVO vo, String keyword,HttpServletResponse response) throws IOException {
+        List<FinanceRealNotClaimDTO> data = financeRealFundService.financeRealFundNotClaimExport(vo,keyword);
+        exportPlus(response,"实收款未认领导出",data, FinanceRealNotClaimDTO.class);
+    }
+
+    /**
      * 财务实收款已认领列表
      */
     @GetMapping("/real/claimed")

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

@@ -2,6 +2,7 @@ package com.dayou.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.dto.FinanceRealFundExportDTO;
+import com.dayou.dto.FinanceRealNotClaimDTO;
 import com.dayou.entity.FinanceRealFund;
 import com.dayou.dao.CustomBaseMapper;
 import com.dayou.vo.*;
@@ -165,4 +166,6 @@ public interface FinanceRealFundMapper extends CustomBaseMapper<FinanceRealFund>
 
 
     List<FinanceRealFundExportDTO> realClaimedExport( @Param("vo")FinanceRealFundVO vo, @Param("keyword")String keyword);
+
+    List<FinanceRealNotClaimDTO> financeRealFundNotClaimExport(@Param("vo") FinanceRealFundVO vo, @Param("keyword")String keyword);
 }

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

@@ -2046,4 +2046,10 @@
     <select id="realClaimedExport" parameterType="com.dayou.vo.FinanceRealFundVO" resultType="com.dayou.dto.FinanceRealFundExportDTO">
         <include refid="realAmountClaimedSQL" />
     </select>
+
+    <select id="financeRealFundNotClaimExport" parameterType="com.dayou.entity.FinanceRealFund" resultType="com.dayou.dto.FinanceRealNotClaimDTO">
+        <include refid="pageListSql" />
+        ORDER BY
+        ifnull(t.ca,0) ASC ,frf.created DESC
+    </select>
 </mapper>

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

@@ -0,0 +1,50 @@
+package com.dayou.dto;
+
+import com.dayou.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+
+@Data
+public class FinanceRealNotClaimDTO {
+
+    private Long id;
+
+    /**
+     * 付款方
+     */
+    @Excel(name = "付款方")
+    private String payer;
+
+    /**
+     * 付款金额
+     */
+    @Excel(name = "付款金额")
+    private BigDecimal amount;
+
+    /**
+     * 到账时日
+     */
+    @Excel(name = "到账时日")
+    private LocalDate payDatetime;
+
+
+
+    @Excel(name= "已认领（元）")
+    private BigDecimal claimAmount;
+
+    @Excel(name= "未认领（元）")
+    private BigDecimal notClaimAmount;
+
+
+    @Excel(name= "录入人")
+    private String creator;
+
+    @Excel(name= "录入时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date created;
+
+    @Excel(name = "备注")
+    private String remark;
+}

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

@@ -1,5 +1,6 @@
 package com.dayou.service;
 import com.dayou.dto.FinanceRealFundExportDTO;
+import com.dayou.dto.FinanceRealNotClaimDTO;
 import com.dayou.entity.FinanceRealFund;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -191,4 +192,6 @@ public interface IFinanceRealFundService extends IService<FinanceRealFund> {
     Page<FinanceRealFundVO> realClaimed(Page page, FinanceRealFundVO vo, String keyword);
 
     List<FinanceRealFundExportDTO> realClaimedExport(FinanceRealFundVO vo, String keyword);
+
+    List<FinanceRealNotClaimDTO> financeRealFundNotClaimExport(FinanceRealFundVO vo, String keyword);
 }

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

@@ -37,7 +37,7 @@ public interface IPersonalService extends IService<Personal> {
 
     Boolean allotOutwardStaff(TaskRecordDTO<Personal> taskRecordDTO);
 
-    void updateCertificates(Long targetId, CertificateEnum cer,String location);
+    void updateCertificates(Long targetId, CertificateEnum cer,String location,String bailorA,String bailorB);
 
     Boolean doRecall(Long id);
 

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.dayou.common.BaseEntity;
 import com.dayou.dto.FinanceRealFundExportDTO;
+import com.dayou.dto.FinanceRealNotClaimDTO;
 import com.dayou.entity.FinanceClaim;
 import com.dayou.entity.FinanceRealFund;
 import com.dayou.exception.ErrorCode;
@@ -81,6 +82,11 @@ public class FinanceRealFundServiceImpl extends ServiceImpl<FinanceRealFundMappe
         return financeRealFundMapper.realClaimedExport(vo, keyword);
     }
 
+    @Override
+    public List<FinanceRealNotClaimDTO> financeRealFundNotClaimExport(FinanceRealFundVO vo, String keyword) {
+        return financeRealFundMapper.financeRealFundNotClaimExport(vo,keyword);
+    }
+
 
     @Override
     public FinanceRealFund detail(Long id){

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

@@ -166,12 +166,13 @@ public class PersonalServiceImpl extends ServiceImpl<PersonalMapper, Personal> i
     }
 
     @Override
-    public void updateCertificates(Long targetId, CertificateEnum cer,String location) {
+    public void updateCertificates(Long targetId, CertificateEnum cer,String location,String bailorA,String bailorB) {
         Personal personal = personalMapper.getByTargetId(targetId);
         //更新订单上面的location
-        if (StrUtil.isNotBlank(location)){
-            personalService.update(new LambdaUpdateWrapper<Personal>().set(Personal::getLocation,location).eq(BaseEntity::getId,personal.getId()));
-        }
+        personalService.update(new LambdaUpdateWrapper<Personal>()
+                        .set(StrUtil.isNotBlank(bailorA),Personal::getBailorA,bailorA)
+                        .set(StrUtil.isNotBlank(bailorB),Personal::getBailorB,bailorB)
+                .set(StrUtil.isNotBlank(location),Personal::getLocation,location).eq(BaseEntity::getId,personal.getId()));
         if (personal!=null && StrUtil.isNotEmpty(personal.getCredentials())){
             List<String> credentials = JSON.parseArray(personal.getCredentials(), String.class);
             if (!credentials.contains(cer.name())){

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

@@ -129,8 +129,11 @@ public class PersonalTargetServiceImpl extends ServiceImpl<PersonalTargetMapper,
     public Boolean houseCertificate(PersonalHouseCertificateVO houseCertificateVO) {
         Long targetId = houseCertificateVO.getId();
         String location = houseCertificateVO.getLocation();
-        personalService.updateCertificates(targetId,HOUSE_CERTIFICATE,location);
+        String bailor1 = houseCertificateVO.getBailor1();
+        String bailor2 = houseCertificateVO.getBailor2();
+        personalService.updateCertificates(targetId,HOUSE_CERTIFICATE,location,bailor1,bailor2);
         return this.update(new LambdaUpdateWrapper<PersonalTarget>().eq(BaseEntity::getId,targetId)
+                        .set(PersonalTarget::getLocation,location)
                 .set(PersonalTarget::getHouseCertificate,JSON.toJSONString(houseCertificateVO)));
     }
 
@@ -138,7 +141,7 @@ public class PersonalTargetServiceImpl extends ServiceImpl<PersonalTargetMapper,
     @Override
     public Boolean landCertificate(PersonalLandCertificateVO landCertificateVO) {
         Long targetId = landCertificateVO.getId();
-        personalService.updateCertificates(targetId,LAND_CERTIFICATE,null);
+        personalService.updateCertificates(targetId,LAND_CERTIFICATE,null,null,null);
         return this.update(new LambdaUpdateWrapper<PersonalTarget>().eq(BaseEntity::getId,targetId)
                 .set(PersonalTarget::getLandCertificate,JSON.toJSONString(landCertificateVO)));
     }
@@ -149,8 +152,11 @@ public class PersonalTargetServiceImpl extends ServiceImpl<PersonalTargetMapper,
         Long targetId = immovableCertificateVO.getId();
         //证件上面的坐落
         String location = immovableCertificateVO.getLocation();
-        personalService.updateCertificates(targetId,IMMOVABLE_CERTIFICATE,location);
+        String bailor1 = immovableCertificateVO.getBailor1();
+        String bailor2 = immovableCertificateVO.getBailor2();
+        personalService.updateCertificates(targetId,IMMOVABLE_CERTIFICATE,location,bailor1,bailor2);
         return this.update(new LambdaUpdateWrapper<PersonalTarget>().eq(BaseEntity::getId,targetId)
+                        .set(PersonalTarget::getLocation,location)
                 .set(PersonalTarget::getImmovableCertificate,JSON.toJSONString(immovableCertificateVO)));
     }