wangzhuo пре 1 година
родитељ
комит
618b07cbec
18 измењених фајлова са 804 додато и 16 уклоњено
  1. 8 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/invoice/FInvoicePaymentController.java
  2. 96 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserBankController.java
  3. 4 6
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TCorpsController.java
  4. 1 1
      ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/ITCorpsService.java
  5. 20 1
      ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TCorpsServiceImpl.java
  6. 106 3
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/FInvoicePayment.java
  7. 10 0
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseBills.java
  8. 121 0
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/UserBank.java
  9. 3 0
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/FInvoicePaymentMapper.java
  10. 65 0
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/UserBankMapper.java
  11. 3 0
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/IFInvoicePaymentService.java
  12. 69 0
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/IUserBankService.java
  13. 2 2
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/FInvoicePaymentDetailServiceImpl.java
  14. 88 2
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/FInvoicePaymentServiceImpl.java
  15. 92 0
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/UserBankServiceImpl.java
  16. 18 1
      ruoyi-warehouse/src/main/resources/mapper/invoice/FInvoicePaymentMapper.xml
  17. 94 0
      ruoyi-warehouse/src/main/resources/mapper/invoice/UserBankMapper.xml
  18. 4 0
      ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

+ 8 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/invoice/FInvoicePaymentController.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 收费管理Controller
@@ -122,4 +123,11 @@ public class FInvoicePaymentController extends BaseController {
         List<BankStatementsVO> bankStatementsVOList = fInvoicePaymentService.bankStatements(bankStatementsVO);
         return getDataTable(bankStatementsVOList);
     }
+
+    @PostMapping("/confirmprinting")
+    public AjaxResult confirmPrinting(@RequestBody() Map<String, String> data) {
+
+
+        return toAjax(fInvoicePaymentService.confirmPrinting(data));
+    }
 }

+ 96 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserBankController.java

@@ -0,0 +1,96 @@
+package com.ruoyi.web.controller.system;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.warehouseBusiness.domain.UserBank;
+import com.ruoyi.warehouseBusiness.service.IUserBankService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 用户银行信息Controller
+ *
+ * @author ruoyi
+ * @date 2023-10-27
+ */
+@RestController
+@RequestMapping("/warehouse/bank")
+public class UserBankController extends BaseController {
+    @Autowired
+    private IUserBankService userBankService;
+
+    /**
+     * 查询用户银行信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:bank:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(UserBank userBank) {
+        startPage();
+        List<UserBank> list = userBankService.selectUserBankList(userBank);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用户银行信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:bank:export')")
+    @Log(title = "用户银行信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(UserBank userBank) {
+        List<UserBank> list = userBankService.selectUserBankList(userBank);
+        ExcelUtil<UserBank> util = new ExcelUtil<UserBank>(UserBank.class);
+        return util.exportExcel(list, "bank");
+    }
+
+    /**
+     * 获取用户银行信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:bank:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(userBankService.selectUserBankById(id));
+    }
+
+    /**
+     * 新增用户银行信息
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:bank:add')")
+    @Log(title = "用户银行信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UserBank userBank) {
+        return toAjax(userBankService.insertUserBank(userBank));
+    }
+
+    /**
+     * 修改用户银行信息
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:bank:edit')")
+    @Log(title = "用户银行信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UserBank userBank) {
+        return toAjax(userBankService.updateUserBank(userBank));
+    }
+
+    /**
+     * 删除用户银行信息
+     */
+    @PreAuthorize("@ss.hasPermi('warehouse:bank:remove')")
+    @Log(title = "用户银行信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(userBankService.deleteUserBankByIds(ids));
+    }
+
+
+    @GetMapping(value = "/user/{id}")
+    public AjaxResult getListBankByUserId(@PathVariable("id") Long id) {
+        return AjaxResult.success(userBankService.getListBankByUserId(id));
+    }
+}

+ 4 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TCorpsController.java

@@ -8,15 +8,11 @@ import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -90,7 +86,9 @@ public class TCorpsController extends BaseController {
     @Log(title = "客户详情", businessType = BusinessType.INSERT)
     @PostMapping
     @RepeatSubmit
-    public AjaxResult add(@RequestParam("corps") String tCorps, @RequestParam("customerContacts") String tCustomerContacts) {
+    public AjaxResult add(@RequestParam("corps") String tCorps,
+                          @RequestParam("customerContacts") String tCustomerContacts,
+                          @RequestParam("bankList") String bankList) {
         // 检验编号、名称、简称 唯一
         TCorps tCorps1 = JSONArray.parseObject(tCorps, TCorps.class);
         if (UserConstants.NOT_UNIQUE.equals(tCorpsService.checkUFNoUnique(tCorps1))) {
@@ -107,7 +105,7 @@ public class TCorpsController extends BaseController {
                 return AjaxResult.error("未找到客户联系人信息,请确认");
             }
         }
-        return tCorpsService.insertTCorps(tCorps, tCustomerContacts, SecurityUtils.getLoginUser());
+        return tCorpsService.insertTCorps(tCorps, tCustomerContacts, bankList, SecurityUtils.getLoginUser());
     }
 
     /**

+ 1 - 1
ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/ITCorpsService.java

@@ -37,7 +37,7 @@ public interface ITCorpsService {
      * @param tCorps 客户详情
      * @return 结果
      */
-    public AjaxResult insertTCorps(String tCorps, String tCustomerContacts, LoginUser loginUser);
+    public AjaxResult insertTCorps(String tCorps, String tCustomerContacts, String bankList, LoginUser loginUser);
 
     /**
      * 修改客户详情

+ 20 - 1
ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TCorpsServiceImpl.java

@@ -22,7 +22,9 @@ import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.mapper.SysUserRoleMapper;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
+import com.ruoyi.warehouseBusiness.domain.UserBank;
 import com.ruoyi.warehouseBusiness.mapper.TWarehouseBillsMapper;
+import com.ruoyi.warehouseBusiness.mapper.UserBankMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -59,6 +61,9 @@ public class TCorpsServiceImpl implements ITCorpsService {
     @Autowired
     private TWarehouseBillsMapper tWarehouseBillsMapper;
 
+    @Autowired
+    private UserBankMapper userBankMapper;
+
     /**
      * 查询客户详情
      *
@@ -80,6 +85,10 @@ public class TCorpsServiceImpl implements ITCorpsService {
         if (StringUtils.isNotEmpty(customerContactList)) {
             map.put("customerContact", customerContactList);
         }
+        List<UserBank> userBanksList = userBankMapper.selectUserBankByUserId(fId);
+        if (StringUtils.isNotEmpty(userBanksList)) {
+            map.put("userBanksList", userBanksList);
+        }
         return map;
     }
 
@@ -127,7 +136,7 @@ public class TCorpsServiceImpl implements ITCorpsService {
      */
     @Override
     @Transactional
-    public AjaxResult insertTCorps(String tCorps, String tCustomerContacts, LoginUser loginUser) {
+    public AjaxResult insertTCorps(String tCorps, String tCustomerContacts, String bankList, LoginUser loginUser) {
         if (StringUtils.isEmpty(tCorps)) {
             return AjaxResult.error("提交失败:客户信息为空");
         }
@@ -250,6 +259,16 @@ public class TCorpsServiceImpl implements ITCorpsService {
                 tCustomerContactMapper.insertTCustomerContact(cc);
             }
         }
+
+        JSONArray bankListJsonArray = JSONArray.parseArray(bankList);
+        List<UserBank> userBanks = JSONObject.parseArray(bankListJsonArray.toJSONString(), UserBank.class);
+        userBankMapper.deleteUserBankByUserId(corps.getfId());
+
+        for (UserBank userBank : userBanks) {
+            userBank.setUserId(corps.getfId());
+            userBankMapper.insertUserBank(userBank);
+        }
+
         return AjaxResult.success();
     }
 

+ 106 - 3
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/FInvoicePayment.java

@@ -36,7 +36,7 @@ public class FInvoicePayment extends BaseEntity
 
     /** 开票公司id */
     @Excel(name = "开票公司id")
-    private Long kpCoId;
+    private String kpCoId;
 
     /**
      * 类型
@@ -55,6 +55,11 @@ public class FInvoicePayment extends BaseEntity
     @Excel(name = "金额合计")
     private BigDecimal sumMoney;
 
+    /**
+     * 合计金额大写
+     */
+    private String sumMoneyZh;
+
     /** 开票日期起 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "开票日期起", width = 30, dateFormat = "yyyy-MM-dd")
@@ -90,6 +95,38 @@ public class FInvoicePayment extends BaseEntity
      */
     private Integer auditType;
 
+    /**
+     * 收款银行名称
+     */
+    private String skCdbName;
+    /**
+     * 收款银行账号
+     */
+    private String skCdbNo;
+    /**
+     * 收款开户名称
+     */
+    private String skAccountTitle;
+
+    /**
+     * 打印次数
+     */
+    private Integer printQuantity;
+
+    /**
+     * 打印时间
+     */
+    private Date printTime;
+
+    /**
+     * 财务主管
+     */
+    private String firstLevelReviewerName;
+
+    /**
+     * 财务经理
+     */
+    private String secondaryReviewerName;
 
 
     private List<FInvoicePaymentDetail> invoicePaymentDetailList;
@@ -99,6 +136,71 @@ public class FInvoicePayment extends BaseEntity
      */
     private List<String> timeInterval;
 
+
+    public String getFirstLevelReviewerName() {
+        return firstLevelReviewerName;
+    }
+
+    public void setFirstLevelReviewerName(String firstLevelReviewerName) {
+        this.firstLevelReviewerName = firstLevelReviewerName;
+    }
+
+    public String getSecondaryReviewerName() {
+        return secondaryReviewerName;
+    }
+
+    public void setSecondaryReviewerName(String secondaryReviewerName) {
+        this.secondaryReviewerName = secondaryReviewerName;
+    }
+
+    public String getSumMoneyZh() {
+        return sumMoneyZh;
+    }
+
+    public void setSumMoneyZh(String sumMoneyZh) {
+        this.sumMoneyZh = sumMoneyZh;
+    }
+
+    public Integer getPrintQuantity() {
+        return printQuantity;
+    }
+
+    public void setPrintQuantity(Integer printQuantity) {
+        this.printQuantity = printQuantity;
+    }
+
+    public Date getPrintTime() {
+        return printTime;
+    }
+
+    public void setPrintTime(Date printTime) {
+        this.printTime = printTime;
+    }
+
+    public String getSkCdbName() {
+        return skCdbName;
+    }
+
+    public void setSkCdbName(String skCdbName) {
+        this.skCdbName = skCdbName;
+    }
+
+    public String getSkCdbNo() {
+        return skCdbNo;
+    }
+
+    public void setSkCdbNo(String skCdbNo) {
+        this.skCdbNo = skCdbNo;
+    }
+
+    public String getSkAccountTitle() {
+        return skAccountTitle;
+    }
+
+    public void setSkAccountTitle(String skAccountTitle) {
+        this.skAccountTitle = skAccountTitle;
+    }
+
     public Integer getAuditType() {
         return auditType;
     }
@@ -166,11 +268,12 @@ public class FInvoicePayment extends BaseEntity
         this.type = type;
     }
 
-    public Long getKpCoId() {
+
+    public String getKpCoId() {
         return kpCoId;
     }
 
-    public void setKpCoId(Long kpCoId) {
+    public void setKpCoId(String kpCoId) {
         this.kpCoId = kpCoId;
     }
 

+ 10 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseBills.java

@@ -670,6 +670,16 @@ public class TWarehouseBills extends BaseEntity {
 
     private Integer isKp;
 
+    private String remarkInquire;
+
+    public String getRemarkInquire() {
+        return remarkInquire;
+    }
+
+    public void setRemarkInquire(String remarkInquire) {
+        this.remarkInquire = remarkInquire;
+    }
+
     public Integer getIsKp() {
         return isKp;
     }

+ 121 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/UserBank.java

@@ -0,0 +1,121 @@
+package com.ruoyi.warehouseBusiness.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 用户银行信息对象 user_bank
+ * 
+ * @author ruoyi
+ * @date 2023-10-27
+ */
+public class UserBank extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 收款银行名称 */
+    @Excel(name = "收款银行名称")
+    private String cdbName;
+
+    /** 收款银行账号 */
+    @Excel(name = "收款银行账号")
+    private String cdbNo;
+
+    /** 收款开户名称 */
+    @Excel(name = "收款开户名称")
+    private String accountTitle;
+
+    /** 是否禁用 0否 1是 */
+    @Excel(name = "是否禁用 0否 1是")
+    private Long isDisable;
+
+    /** 删除标志(0代表存在 2代表删除) */
+    private String delFlag;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCdbName(String cdbName) 
+    {
+        this.cdbName = cdbName;
+    }
+
+    public String getCdbName() 
+    {
+        return cdbName;
+    }
+    public void setCdbNo(String cdbNo) 
+    {
+        this.cdbNo = cdbNo;
+    }
+
+    public String getCdbNo() 
+    {
+        return cdbNo;
+    }
+    public void setAccountTitle(String accountTitle) 
+    {
+        this.accountTitle = accountTitle;
+    }
+
+    public String getAccountTitle() 
+    {
+        return accountTitle;
+    }
+    public void setIsDisable(Long isDisable) 
+    {
+        this.isDisable = isDisable;
+    }
+
+    public Long getIsDisable() 
+    {
+        return isDisable;
+    }
+    public void setDelFlag(String delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("cdbName", getCdbName())
+            .append("cdbNo", getCdbNo())
+            .append("accountTitle", getAccountTitle())
+            .append("isDisable", getIsDisable())
+            .append("delFlag", getDelFlag())
+            .append("userId", getUserId())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

+ 3 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/FInvoicePaymentMapper.java

@@ -112,4 +112,7 @@ public interface FInvoicePaymentMapper
      * @param id
      */
     void updateAuditTypeById(@Param("id") Long id, @Param("auditType") Integer auditType, @Param("username") String username, @Param("nowDate") Date nowDate);
+
+    int confirmPrinting(@Param("ids") Long ids, @Param("printTime") String printTime);
+
 }

+ 65 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/UserBankMapper.java

@@ -0,0 +1,65 @@
+package com.ruoyi.warehouseBusiness.mapper;
+
+import com.ruoyi.warehouseBusiness.domain.UserBank;
+
+import java.util.List;
+
+/**
+ * 用户银行信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-10-27
+ */
+public interface UserBankMapper {
+    /**
+     * 查询用户银行信息
+     *
+     * @param id 用户银行信息ID
+     * @return 用户银行信息
+     */
+    public UserBank selectUserBankById(Long id);
+
+    /**
+     * 查询用户银行信息列表
+     *
+     * @param userBank 用户银行信息
+     * @return 用户银行信息集合
+     */
+    public List<UserBank> selectUserBankList(UserBank userBank);
+
+    /**
+     * 新增用户银行信息
+     *
+     * @param userBank 用户银行信息
+     * @return 结果
+     */
+    public int insertUserBank(UserBank userBank);
+
+    /**
+     * 修改用户银行信息
+     *
+     * @param userBank 用户银行信息
+     * @return 结果
+     */
+    public int updateUserBank(UserBank userBank);
+
+    /**
+     * 删除用户银行信息
+     *
+     * @param id 用户银行信息ID
+     * @return 结果
+     */
+    public int deleteUserBankById(Long id);
+
+    /**
+     * 批量删除用户银行信息
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteUserBankByIds(Long[] ids);
+
+    void deleteUserBankByUserId(Long userId);
+
+    List<UserBank> selectUserBankByUserId(Long id);
+}

+ 3 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/IFInvoicePaymentService.java

@@ -5,6 +5,7 @@ import com.ruoyi.warehouseBusiness.domain.FInvoicePayment;
 import com.ruoyi.warehouseBusiness.vo.BankStatementsVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 收费管理Service接口
@@ -82,4 +83,6 @@ public interface IFInvoicePaymentService
      * @return
      */
     List<BankStatementsVO> bankStatements(BankStatementsVO bankStatementsVO);
+
+    int confirmPrinting(Map<String, String> fInvoicePayment);
 }

+ 69 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/IUserBankService.java

@@ -0,0 +1,69 @@
+package com.ruoyi.warehouseBusiness.service;
+
+import com.ruoyi.warehouseBusiness.domain.UserBank;
+
+import java.util.List;
+
+/**
+ * 用户银行信息Service接口
+ *
+ * @author ruoyi
+ * @date 2023-10-27
+ */
+public interface IUserBankService {
+    /**
+     * 查询用户银行信息
+     *
+     * @param id 用户银行信息ID
+     * @return 用户银行信息
+     */
+    public UserBank selectUserBankById(Long id);
+
+    /**
+     * 查询用户银行信息列表
+     *
+     * @param userBank 用户银行信息
+     * @return 用户银行信息集合
+     */
+    public List<UserBank> selectUserBankList(UserBank userBank);
+
+    /**
+     * 新增用户银行信息
+     *
+     * @param userBank 用户银行信息
+     * @return 结果
+     */
+    public int insertUserBank(UserBank userBank);
+
+    /**
+     * 修改用户银行信息
+     *
+     * @param userBank 用户银行信息
+     * @return 结果
+     */
+    public int updateUserBank(UserBank userBank);
+
+    /**
+     * 批量删除用户银行信息
+     *
+     * @param ids 需要删除的用户银行信息ID
+     * @return 结果
+     */
+    public int deleteUserBankByIds(Long[] ids);
+
+    /**
+     * 删除用户银行信息信息
+     *
+     * @param id 用户银行信息ID
+     * @return 结果
+     */
+    public int deleteUserBankById(Long id);
+
+    /**
+     * 根据用户id查询银行信息
+     *
+     * @param id
+     * @return
+     */
+    List<UserBank> getListBankByUserId(Long id);
+}

+ 2 - 2
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/FInvoicePaymentDetailServiceImpl.java

@@ -89,9 +89,9 @@ public class FInvoicePaymentDetailServiceImpl implements IFInvoicePaymentDetailS
             if (fInvoicePaymentDetail1 == null) {
                 return new AjaxResult(401, "数据不存在");
             }
-            FInvoicePaymentDetail fInvoicePaymentDetail = fInvoicePaymentDetailMapper.selectFInvoicePaymentDetailById(id);
+//            FInvoicePaymentDetail fInvoicePaymentDetail = fInvoicePaymentDetailMapper.selectFInvoicePaymentDetailById(id);
             i = fInvoicePaymentDetailMapper.deleteById(id, nowDate, SecurityUtils.getUsername());
-            tInvoiceMapper.quashProceedsById(fInvoicePaymentDetail, SecurityUtils.getUsername(), nowDate);
+//            tInvoiceMapper.quashProceedsById(fInvoicePaymentDetail, SecurityUtils.getUsername(), nowDate);
         }
         return new AjaxResult(200, "删除成功!");
     }

+ 88 - 2
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/FInvoicePaymentServiceImpl.java

@@ -1,10 +1,17 @@
 package com.ruoyi.warehouseBusiness.service.impl;
 
 import com.ruoyi.approvalFlow.domain.AuditItems;
+import com.ruoyi.approvalFlow.domain.AuditPathsLevels;
+import com.ruoyi.approvalFlow.mapper.AuditPathsLevelsMapper;
 import com.ruoyi.approvalFlow.service.impl.AuditItemsServiceImpl;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.mapper.SysPostMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.warehouseBusiness.domain.FInvoicePayment;
 import com.ruoyi.warehouseBusiness.domain.FInvoicePaymentDetail;
 import com.ruoyi.warehouseBusiness.mapper.FInvoicePaymentDetailMapper;
@@ -19,8 +26,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 收费管理Service业务层处理
@@ -43,6 +49,15 @@ public class FInvoicePaymentServiceImpl implements IFInvoicePaymentService {
     @Autowired
     private AuditItemsServiceImpl auditItemsService;
 
+    @Autowired
+    private AuditPathsLevelsMapper auditPathsLevelsMapper;
+
+    @Autowired
+    private SysUserMapper userMapper;
+
+    @Autowired
+    private SysPostMapper postMapper;
+
     /**
      * 查询收费管理
      *
@@ -54,10 +69,72 @@ public class FInvoicePaymentServiceImpl implements IFInvoicePaymentService {
         FInvoicePayment fInvoicePayment = fInvoicePaymentMapper.selectFInvoicePaymentById(id);
         List<FInvoicePaymentDetail> invoicePaymentDetailList = fInvoicePaymentDetailMapper.selectByPid(id);
         fInvoicePayment.setInvoicePaymentDetailList(invoicePaymentDetailList);
+
+        fInvoicePayment.setSumMoneyZh(Convert.digitUppercase(fInvoicePayment.getSumMoney().doubleValue()));
+
+        getUserName(fInvoicePayment);
+
         return fInvoicePayment;
     }
 
     /**
+     * 获取打印数据中的人员信息
+     * @param fInvoicePayment
+     * @return
+     */
+    public void getUserName(FInvoicePayment fInvoicePayment) {
+        // 提交人
+//        dataMap.put("presenterName", SecurityUtils.getLoginUser().getUser().getNickName());
+
+        AuditPathsLevels auditPathsLevels = new AuditPathsLevels();
+        auditPathsLevels.setPathId(1141L);
+        List<AuditPathsLevels> pathsLevelsList = auditPathsLevelsMapper.selectAuditPathsLevelsList(auditPathsLevels);
+
+        boolean isTreasurer = true;
+
+        for (AuditPathsLevels pathsLevels : pathsLevelsList) {
+            String auditUserId = pathsLevels.getAuditUserId();
+            if (auditUserId.contains("[")) {
+                auditUserId = auditUserId.substring(1);
+            }
+            if (auditUserId.contains("]")) {
+                auditUserId = auditUserId.substring(0, auditUserId.length() - 1);
+            }
+
+            List<String> idList = new ArrayList<>();
+            if (auditUserId.contains(",")) {
+                idList = Arrays.asList(auditUserId.split(","));
+            } else {
+                idList.add(auditUserId);
+            }
+            SysUser sysUser = userMapper.selectUserById(Long.valueOf(idList.get(0)));
+            List<SysPost> sysPosts = postMapper.selectPostsByUserName(sysUser.getUserName());
+
+            for (SysPost sysPost : sysPosts) {
+                if ("fs".equals(sysPost.getPostCode())) {
+                    // 财务主管
+                    fInvoicePayment.setFirstLevelReviewerName(sysUser.getNickName());
+//                    dataMap.put("firstLevelReviewerName", sysUser.getNickName());
+                } else if ("fm".equals(sysPost.getPostCode())) {
+                    // 财务经理
+//                    dataMap.put("secondaryReviewerName", sysUser.getNickName());
+                    fInvoicePayment.setSecondaryReviewerName(sysUser.getNickName());
+                }
+            }
+
+//            if (isTreasurer) {
+//                // 财务主管
+//                dataMap.put("firstLevelReviewerName", sysUser.getNickName());
+//                isTreasurer = false;
+//            } else {
+//                // 财务经理
+//                dataMap.put("secondaryReviewerName", sysUser.getNickName());
+//            }
+
+        }
+    }
+
+    /**
      * 查询收费管理列表
      *
      * @param fInvoicePayment 收费管理
@@ -316,4 +393,13 @@ public class FInvoicePaymentServiceImpl implements IFInvoicePaymentService {
 
         return bankStatementsVOList;
     }
+
+    @Override
+    public int confirmPrinting(Map<String, String> fInvoicePayment) {
+        String id = fInvoicePayment.get("id");
+        Long ids = Long.valueOf(id);
+        String printDate = fInvoicePayment.get("printTime");
+
+        return fInvoicePaymentMapper.confirmPrinting(ids, printDate);
+    }
 }

+ 92 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/UserBankServiceImpl.java

@@ -0,0 +1,92 @@
+package com.ruoyi.warehouseBusiness.service.impl;
+
+import com.ruoyi.warehouseBusiness.domain.UserBank;
+import com.ruoyi.warehouseBusiness.mapper.UserBankMapper;
+import com.ruoyi.warehouseBusiness.service.IUserBankService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 用户银行信息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-10-27
+ */
+@Service
+public class UserBankServiceImpl implements IUserBankService {
+    @Autowired
+    private UserBankMapper userBankMapper;
+
+    /**
+     * 查询用户银行信息
+     *
+     * @param id 用户银行信息ID
+     * @return 用户银行信息
+     */
+    @Override
+    public UserBank selectUserBankById(Long id) {
+        return userBankMapper.selectUserBankById(id);
+    }
+
+    /**
+     * 查询用户银行信息列表
+     *
+     * @param userBank 用户银行信息
+     * @return 用户银行信息
+     */
+    @Override
+    public List<UserBank> selectUserBankList(UserBank userBank) {
+        return userBankMapper.selectUserBankList(userBank);
+    }
+
+    /**
+     * 新增用户银行信息
+     *
+     * @param userBank 用户银行信息
+     * @return 结果
+     */
+    @Override
+    public int insertUserBank(UserBank userBank) {
+        return userBankMapper.insertUserBank(userBank);
+    }
+
+    /**
+     * 修改用户银行信息
+     *
+     * @param userBank 用户银行信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserBank(UserBank userBank) {
+        return userBankMapper.updateUserBank(userBank);
+    }
+
+    /**
+     * 批量删除用户银行信息
+     *
+     * @param ids 需要删除的用户银行信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteUserBankByIds(Long[] ids) {
+        return userBankMapper.deleteUserBankByIds(ids);
+    }
+
+    /**
+     * 删除用户银行信息信息
+     *
+     * @param id 用户银行信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteUserBankById(Long id) {
+        return userBankMapper.deleteUserBankById(id);
+    }
+
+    @Override
+    public List<UserBank> getListBankByUserId(Long id) {
+        return userBankMapper.selectUserBankByUserId(id);
+    }
+}

+ 18 - 1
ruoyi-warehouse/src/main/resources/mapper/invoice/FInvoicePaymentMapper.xml

@@ -27,10 +27,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="payTypes"    column="pay_types"    />
         <result property="chequeNo"    column="cheque_no"    />
         <result property="auditType"    column="audit_type"    />
+        <result property="skCdbName"    column="sk_cdb_name"    />
+        <result property="skCdbNo"    column="sk_cdb_no"    />
+        <result property="skAccountTitle"    column="sk_account_title"    />
+        <result property="printQuantity"    column="print_quantity"    />
+        <result property="printTime"    column="print_time"    />
     </resultMap>
 
     <sql id="selectFInvoicePaymentVo">
-        select id, sys_no, f_corpid, tt_co_id, kp_co_id, audit_type, pay_types, cheque_no, pay_type, account_title, type, cdb_name, cdb_no, sum_money, kp_time_start, kp_time_terminate, remark, del_flag, create_by, create_time, update_by, update_time from f_Invoice_payment
+        select id, sys_no, f_corpid, tt_co_id, sk_cdb_name, print_quantity, print_time, sk_cdb_no, sk_account_title, kp_co_id, audit_type, pay_types, cheque_no, pay_type, account_title, type, cdb_name, cdb_no, sum_money, kp_time_start, kp_time_terminate, remark, del_flag, create_by, create_time, update_by, update_time from f_Invoice_payment
     </sql>
 
     <select id="selectFInvoicePaymentList" parameterType="FInvoicePayment" resultMap="FInvoicePaymentResult">
@@ -157,6 +162,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payTypes != null">pay_types,</if>
             <if test="chequeNo != null">cheque_no,</if>
             <if test="auditType != null">audit_type,</if>
+            <if test="skCdbName != null">sk_cdb_name,</if>
+            <if test="skCdbNo != null">sk_cdb_no,</if>
+            <if test="skAccountTitle != null">sk_account_title,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -181,6 +189,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payTypes != null">#{payTypes},</if>
             <if test="chequeNo != null">#{chequeNo},</if>
             <if test="auditType != null">#{auditType},</if>
+            <if test="skCdbName != null">#{skCdbName},</if>
+            <if test="skCdbNo != null">#{skCdbNo},</if>
+            <if test="skAccountTitle != null">#{skAccountTitle},</if>
          </trim>
     </insert>
 
@@ -208,6 +219,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="payTypes != null">pay_types = #{payTypes},</if>
             <if test="chequeNo != null">cheque_no = #{chequeNo},</if>
             <if test="auditType != null">audit_type = #{auditType},</if>
+            <if test="skCdbName != null">sk_cdb_name = #{skCdbName},</if>
+            <if test="skCdbNo != null">sk_cdb_no = #{skCdbNo},</if>
+            <if test="skAccountTitle != null">sk_account_title = #{skAccountTitle},</if>
         </trim>
         where id = #{id}
     </update>
@@ -223,6 +237,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateAuditTypeById">
         update f_Invoice_payment set audit_type = #{auditType}, update_by = #{username},update_time = #{nowDate} where id = #{id}
     </update>
+    <update id="confirmPrinting">
+        update f_Invoice_payment set print_quantity = print_quantity + 1, print_time = #{printTime} where id = #{ids}
+    </update>
 
 
     <delete id="deleteFInvoicePaymentById" parameterType="Long">

+ 94 - 0
ruoyi-warehouse/src/main/resources/mapper/invoice/UserBankMapper.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.warehouseBusiness.mapper.UserBankMapper">
+    
+    <resultMap type="UserBank" id="UserBankResult">
+        <result property="id"    column="id"    />
+        <result property="cdbName"    column="cdb_name"    />
+        <result property="cdbNo"    column="cdb_no"    />
+        <result property="accountTitle"    column="account_title"    />
+        <result property="isDisable"    column="is_disable"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="userId"    column="user_id"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectUserBankVo">
+        select id, cdb_name, cdb_no, account_title, is_disable, del_flag, user_id, remark from user_bank
+    </sql>
+
+    <select id="selectUserBankList" parameterType="UserBank" resultMap="UserBankResult">
+        <include refid="selectUserBankVo"/>
+        <where>  
+            <if test="cdbName != null  and cdbName != ''"> and cdb_name like concat('%', #{cdbName}, '%')</if>
+            <if test="cdbNo != null  and cdbNo != ''"> and cdb_no = #{cdbNo}</if>
+            <if test="accountTitle != null  and accountTitle != ''"> and account_title = #{accountTitle}</if>
+            <if test="isDisable != null "> and is_disable = #{isDisable}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+        </where>
+    </select>
+    
+    <select id="selectUserBankById" parameterType="Long" resultMap="UserBankResult">
+        <include refid="selectUserBankVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectUserBankByUserId" parameterType="Long" resultMap="UserBankResult">
+        <include refid="selectUserBankVo"/>
+        where user_id = #{id}
+    </select>
+
+    <insert id="insertUserBank" parameterType="UserBank">
+        insert into user_bank
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="cdbName != null">cdb_name,</if>
+            <if test="cdbNo != null">cdb_no,</if>
+            <if test="accountTitle != null">account_title,</if>
+            <if test="isDisable != null">is_disable,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="cdbName != null">#{cdbName},</if>
+            <if test="cdbNo != null">#{cdbNo},</if>
+            <if test="accountTitle != null">#{accountTitle},</if>
+            <if test="isDisable != null">#{isDisable},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateUserBank" parameterType="UserBank">
+        update user_bank
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cdbName != null">cdb_name = #{cdbName},</if>
+            <if test="cdbNo != null">cdb_no = #{cdbNo},</if>
+            <if test="accountTitle != null">account_title = #{accountTitle},</if>
+            <if test="isDisable != null">is_disable = #{isDisable},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteUserBankById" parameterType="Long">
+        delete from user_bank where id = #{id}
+    </delete>
+
+    <delete id="deleteUserBankByIds" parameterType="String">
+        delete from user_bank where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteUserBankByUserId" parameterType="Long">
+        delete from user_bank where user_id = #{id}
+    </delete>
+
+</mapper>

+ 4 - 0
ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -2551,6 +2551,10 @@
             <if test="fCustomsdeclartion != null  and fCustomsdeclartion != ''">and tw.f_customsdeclartion =
                 #{fCustomsdeclartion}
             </if>
+            <if test="remarkInquire != null  and remarkInquire != ''">and tw.remark like concat('%',
+                #{remarkInquire},
+                '%')
+            </if>
             <if test="fOriginalbillno != null  and fOriginalbillno != ''">and tw.f_originalbillno = #{fOriginalbillno}
             </if>
             <if test="fDeptid != null ">and tw.f_deptid = #{fDeptid}</if>