付费打印

ruoyi-warehouse/src/main/java/com/ruoyi/finance/domain/TFee.java

@@ -75,6 +75,33 @@ public class TFee extends BaseEntity {
     @JsonFormat(pattern = "yyy-MM-dd hh:mm:ss")
     private Date fPrintTime;
 
+    /**
+     * 付费打印次数
+     */
+    private Integer fPayNumberPrint;
+
+    /**
+     * 付费打印时间
+     */
+    @JsonFormat(pattern = "yyy-MM-dd hh:mm:ss")
+    private Date fPayPrintTime;
+
+    public Integer getfPayNumberPrint() {
+        return fPayNumberPrint;
+    }
+
+    public void setfPayNumberPrint(Integer fPayNumberPrint) {
+        this.fPayNumberPrint = fPayNumberPrint;
+    }
+
+    public Date getfPayPrintTime() {
+        return fPayPrintTime;
+    }
+
+    public void setfPayPrintTime(Date fPayPrintTime) {
+        this.fPayPrintTime = fPayPrintTime;
+    }
+
     public Integer getfNumberPrint() {
         return fNumberPrint;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/finance/mapper/TFeeMapper.java

@@ -201,4 +201,12 @@ public interface TFeeMapper {
      * @return sql执行成功次数
      */
     int setPrintTime(@Param("fId") Long fId, @Param("printDate") String printDate);
+
+    /**
+     * 确认付费打印修改打印次数与打印时间
+     * @param fId id
+     * @param printDate 时间
+     * @return sql执行成功次数
+     */
+    int payPrintTimes(@Param("fId") Long fId, @Param("printDate") String printDate);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/ITFeeService.java

@@ -13,7 +13,6 @@ import com.ruoyi.reportManagement.excel.Receivable;
 import com.ruoyi.shipping.domain.TAccount;
 import com.ruoyi.shipping.domain.TFeeInvoice;
 import com.ruoyi.shipping.excel.Account;
-import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.excel.TWareHouseExcelItem;
 
 import java.util.List;
@@ -320,4 +319,21 @@ public interface ITFeeService {
      * @return sql执行成功次数
      */
     int setPrintTime(Long fId, String printDate);
+
+    /**
+     * 确认付费打印修改打印次数与打印时间
+     * @param fId id
+     * @param printDate 时间
+     * @return sql执行成功次数
+     */
+    int payPrintTimes(Long fId, String printDate);
+
+    /**
+     * 获取打印数据中的人员信息
+     * @param dataMap
+     * @return
+     */
+    void getUserName(Map<String, Object> dataMap);
+
+    void firmIdToName(Map<String, Object> data);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -7,6 +7,8 @@ import com.ruoyi.anpin.order.OrderFacade;
 import com.ruoyi.anpin.order.OrderFacadeAgent;
 import com.ruoyi.anpin.order.dto.*;
 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.basicData.domain.TCorps;
 import com.ruoyi.basicData.domain.TFees;
@@ -14,6 +16,7 @@ import com.ruoyi.basicData.mapper.TCorpsMapper;
 import com.ruoyi.basicData.mapper.TFeesMapper;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
@@ -36,7 +39,10 @@ import com.ruoyi.shipping.domain.TFeeInvoice;
 import com.ruoyi.shipping.excel.Account;
 import com.ruoyi.shipping.mapper.TFeeInvoiceMapper;
 import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.mapper.SysConfigMapper;
+import com.ruoyi.system.mapper.SysPostMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.warehouseBusiness.domain.BillnoDel;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
@@ -102,6 +108,15 @@ public class TFeeServiceImpl implements ITFeeService {
     private ISysDictDataService iSysDictDataService;
     @Autowired
     private TFeeInvoiceMapper tFeeInvoiceMapper;
+
+    @Autowired
+    private AuditPathsLevelsMapper auditPathsLevelsMapper;
+
+    @Autowired
+    private SysUserMapper userMapper;
+
+    @Autowired
+    private SysPostMapper postMapper;
     /**
      * 查询财务数据主
      *
@@ -271,6 +286,84 @@ public class TFeeServiceImpl implements ITFeeService {
         return tFeeMapper.setPrintTime(fId, printDate);
     }
 
+    /**
+     * 确认付费打印修改打印次数与打印时间
+     * @param fId id
+     * @param printDate 时间
+     * @return sql执行成功次数
+     */
+    @Override
+    public int payPrintTimes(Long fId, String printDate) {
+        return tFeeMapper.payPrintTimes(fId, printDate);
+    }
+
+    /**
+     * 获取打印数据中的人员信息
+     * @param dataMap
+     * @return
+     */
+    @Override
+    public void getUserName(Map<String, Object> dataMap) {
+        // 提交人
+        dataMap.put("presenterName", SecurityUtils.getLoginUser().getUser().getNickName());
+
+        AuditPathsLevels auditPathsLevels = new AuditPathsLevels();
+        auditPathsLevels.setPathId(1140L);
+        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())) {
+                    // 财务主管
+                    dataMap.put("firstLevelReviewerName", sysUser.getNickName());
+                } else if ("fm".equals(sysPost.getPostCode())) {
+                    // 财务经理
+                    dataMap.put("secondaryReviewerName", sysUser.getNickName());
+                }
+            }
+
+//            if (isTreasurer) {
+//                // 财务主管
+//                dataMap.put("firstLevelReviewerName", sysUser.getNickName());
+//                isTreasurer = false;
+//            } else {
+//                // 财务经理
+//                dataMap.put("secondaryReviewerName", sysUser.getNickName());
+//            }
+
+        }
+    }
+
+    @Override
+    public void firmIdToName(Map<String, Object> data) {
+        Object tFeeObj = data.get("tFee");
+        TFee tFee = (TFee) tFeeObj;
+        TCorps corpTCorps = tCorpsMapper.selectTCorpsById(tFee.getfCorpid());
+        tFee.setfCorpidName(corpTCorps.getfName());
+        TCorps CtrlcorTCorps = tCorpsMapper.selectTCorpsById(tFee.getfCtrlcorpidLong());
+        tFee.setfCtrlcorpName(CtrlcorTCorps.getfName());
+        data.put("tFee", tFee);
+    }
+
     @Override
     public Map<String, Object> selectTFeeByIdNew(Long fId) {
         Map<String, Object> map = new HashMap<>();

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -48,6 +48,9 @@
         <result property="fAuditTypeString"    column="f_audit_type_string"    />
         <result property="fNumberPrint"    column="f_number_print"    />
         <result property="fPrintTime"    column="f_print_time"    />
+
+        <result property="fPayNumberPrint"    column="f_pay_number_print"    />
+        <result property="fPayPrintTime"    column="f_pay_print_time"    />
     </resultMap>
 
     <sql id="selectTFeeVo">
@@ -333,7 +336,9 @@
                ware.f_pdfUnsignedUrl,
                ware.f_bsdate_start,
                ware.f_bsdate_end,
-               ware.f_audit_type
+               ware.f_audit_type,
+               ware.f_pay_number_print,
+               ware.f_pay_print_time
         from t_fee as ware
         LEFT JOIN t_corps AS c ON ware.f_corpid = c.f_id
         where ware.del_flag = 0 and ware.f_id = #{fId}
@@ -2612,6 +2617,9 @@
     <update id="setPrintTime">
         update t_fee set f_number_print = f_number_print + 1, f_print_time = #{printDate} where f_id = #{fId}
     </update>
+    <update id="payPrintTimes">
+        update t_fee set f_pay_number_print = f_pay_number_print + 1, f_pay_print_time = #{printDate} where f_id = #{fId}
+    </update>
     <select id="getProjectId" parameterType="Long" resultType="Long">
         SELECT
             DISTINCT