搜索公司

src/main/java/com/winhc/repal/controller/RepalRoleController.java

@@ -57,4 +57,6 @@ public class RepalRoleController {
         return BeanResponse.success(CodeMsg.SUCCESS, repalGroupRoleService.getPermissionList(roleId));
     }
 
+
+
 }

src/main/java/com/winhc/repal/model/bo/BillPageBO.java

@@ -49,4 +49,7 @@ public class BillPageBO {
     @ApiModelProperty(value = "是否查询账本下所有")
     private Boolean allFlag;
 
+    @ApiModelProperty(value = "关键词")
+    private String keyword;
+
 }

src/main/java/com/winhc/repal/model/dto/GetRepalBillPageDTO.java

@@ -48,6 +48,8 @@ public class GetRepalBillPageDTO extends PageRequest {
     @ApiModelProperty(value = "账款类型。[1]应收，[2]应付", required = true)
     private Integer repalBillType;
 
+    @ApiModelProperty(value = "关键词")
+    private String keyword;
 
 
 

src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

@@ -337,9 +337,9 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         RepalChangeRecord changeRecord = new RepalChangeRecord();
         changeRecord.setRepalBookId(repalBill.getRepalBookId());
         changeRecord.setRepalBillId(repalBill.getId());
-        changeRecord.setAfterMoney(BigDecimal.ZERO);
+        changeRecord.setAfterMoney(repalBill.getTotalMoney().subtract(repalBill.getReceipt()));
         changeRecord.setPreMoney(repalBill.getReceivable());
-        changeRecord.setTransMoney(repalBill.getReceivable());
+        changeRecord.setTransMoney(dto.getMoney());
         changeRecord.setOperUserId(UserContextUtil.getUser().getUserId());
         changeRecord.setRecordDate(dto.getRecordDate());
         UserExt userExt = userExtService.getById(changeRecord.getOperUserId());

src/main/resources/mapper/RepalBillMapper.xml

@@ -46,6 +46,9 @@
         <if test="param2.endDate != null">
             AND bill.END_DATE <![CDATA[<=]]> #{param2.endDate}
         </if>
+        <if test="param2.keyword != null">
+            AND bill.CUSTOMER_NAME LIKE concat('%', #{param2.keyword}, '%')
+        </if>
         <if test="param2.dynamicType != null">
             AND EXISTS (SELECT 1 FROM REPAL_REMIND_HISTORY his WHERE
             <if test="param2.dynamicType == 1">

src/main/resources/mapper/RepalBookMapper.xml

@@ -9,15 +9,17 @@
         LEFT JOIN REPAL_BOOK AS repalBook ON repalBill.REPAL_BOOK_ID = repalBook.ID
         WHERE repalBill.REPAL_GROUP_ID = #{repalGroupId} AND
             <if test="!receivableFlag or !receiptFlag">
+                (
                 <if test="!receivableFlag and !receiptFlag">
-                    rPerson.USER = #{userId} AND
+                    rPerson.USER = #{userId} OR
                 </if>
                 <if test="!receiptFlag and receiptFlag">
-                    ((repalBill.REPAL_BILL_TYPE = 1 AND rPerson.USER = #{userId}) or repalBill.REPAL_BILL_TYPE = 2) AND
+                    ((repalBill.REPAL_BILL_TYPE = 1 AND rPerson.USER = #{userId}) or repalBill.REPAL_BILL_TYPE = 2) OR
                 </if>
                 <if test="receiptFlag and !receiptFlag">
-                    ((repalBill.REPAL_BILL_TYPE = 2 AND rPerson.USER = #{userId}) or repalBill.REPAL_BILL_TYPE = 1) AND
+                    ((repalBill.REPAL_BILL_TYPE = 2 AND rPerson.USER = #{userId}) or repalBill.REPAL_BILL_TYPE = 1) OR
                 </if>
+                repalBook.USER_ID = #{userId}) AND
             </if>
               repalBill.DELETED = 0)
         AS tmp