更新自定义不明插入条件，更新供应商银行信息审核流程

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidContractController.java

@@ -153,7 +153,6 @@ public class BidContractController extends BaseController
     public TableDataInfo selectContractByBid(BidContract bidContract)
     {
         startPage();
-        bidContract.setOwnerDepts(this.getOwnerdepts());
         List<BidContract> list = bidContractService.selectContractByBid(bidContract);
         return getDataTable(list);
     }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidTenderController.java

@@ -664,6 +664,7 @@ public class BidTenderController extends BaseController {
     public int getDeposit(){
         List<BidNotice> bidNotices = bidNoticeService.selectBidNoticeList(new BidNotice());
         int i = 0;
+        //TODO
         // 优化，通知公告查询 不用同步当前时间大于开标时间的
         System.out.println("22222222222222222222");
         for(BidNotice bidNotice : bidNotices){
@@ -696,6 +697,12 @@ public class BidTenderController extends BaseController {
             BigDecimal earnestMoney = plan.getEarnestMoney();
             Long hid = bidTenderService.selectHidByAccount(map);
 
+            Map<String,String> dmap = new HashMap<>();
+            dmap.put("uid",item.getPpid().toString());
+            dmap.put("account",item.getRtnTdracctno());
+            dmap.put("date",item.getRtnTdrdt());
+            dmap.put("time",item.getRtnTdrtm());
+
             if(hid == null){
                 com.ruoyi.system.api.domain.BankDepositdescr bankDepositdescr = new com.ruoyi.system.api.domain.BankDepositdescr();
                 bankDepositdescr.setDepositdescid(item.getDepositdescid());
@@ -804,6 +811,60 @@ public class BidTenderController extends BaseController {
                 continue;
             }
 
+            if(bidTenderService.selectDespositCount(dmap) > 0){
+                com.ruoyi.system.api.domain.BankDepositdescr bankDepositdescr = new com.ruoyi.system.api.domain.BankDepositdescr();
+                bankDepositdescr.setDepositdescid(item.getDepositdescid());
+                bankDepositdescr.setPpid(item.getPpid());
+                bankDepositdescr.setTrnuid(item.getTrnuid());
+                bankDepositdescr.setRqbody(item.getRqbody());
+                bankDepositdescr.setSgtid(item.getSgtid());
+                bankDepositdescr.setSgtno(item.getSgtno());
+                bankDepositdescr.setPrjno(item.getPrjno());
+                bankDepositdescr.setPltfmcstno(item.getPltfmcstno());
+                bankDepositdescr.setEntpnm(item.getEntpnm());
+                bankDepositdescr.setPgno(item.getPgno());
+                bankDepositdescr.setVersion(item.getVersion());
+                bankDepositdescr.setRtnTrnuid(item.getRtnTrnuid());
+                bankDepositdescr.setRtnStatus(item.getRtnStatus());
+                bankDepositdescr.setRtnCode(item.getRtnCode());
+                bankDepositdescr.setRtnSeverity(item.getRtnSeverity());
+                bankDepositdescr.setRtnMessage(item.getRtnMessage());
+                bankDepositdescr.setRtnRsbody(item.getRtnRsbody());
+                bankDepositdescr.setRtnRcrdtotnum(item.getRtnRcrdtotnum());
+                bankDepositdescr.setRtnCrnpgno(item.getRtnCrnpgno());
+                bankDepositdescr.setRtnPgrcrdnum(item.getRtnPgrcrdnum());
+                bankDepositdescr.setRtnTotpgnum(item.getRtnTotpgnum());
+                bankDepositdescr.setRtnContent(item.getRtnContent());
+                bankDepositdescr.setRtnLescstno(item.getRtnLescstno());
+                bankDepositdescr.setRtnTdrno(item.getRtnTdrno());
+                bankDepositdescr.setRtnCstno(item.getRtnCstno());
+                bankDepositdescr.setRtnPrjno(item.getRtnPrjno());
+                bankDepositdescr.setRtnPrjnm(item.getRtnPrjnm());
+                bankDepositdescr.setRtnSgtno(item.getRtnSgtno());
+                bankDepositdescr.setRtnSgtst(item.getRtnSgtst());
+                bankDepositdescr.setRtnMrgnst(item.getRtnMrgnst());
+                bankDepositdescr.setRtnTdracctno(item.getRtnTdracctno());
+                bankDepositdescr.setRtnTdracctnoccycd(item.getRtnTdracctnoccycd());
+                bankDepositdescr.setRtnTdracctnm(item.getRtnTdracctnm());
+                bankDepositdescr.setRtnTdracctnobnkno(item.getRtnTdracctnobnkno());
+                bankDepositdescr.setRtnTdracctnobnknm(item.getRtnTdracctnobnknm());;
+                bankDepositdescr.setRtnTdrnum(item.getRtnTdrnum());
+                bankDepositdescr.setRtnMrgnamt(item.getRtnMrgnamt());
+                bankDepositdescr.setRtnTdramt(item.getRtnTdramt());
+                bankDepositdescr.setRtnAgncsvcfee(item.getRtnAgncsvcfee());
+                bankDepositdescr.setRtnFrzamt(item.getRtnFrzamt());
+                bankDepositdescr.setRtnFineamt(item.getRtnFineamt());
+                bankDepositdescr.setRtnTdrdt(item.getRtnTdrdt());
+                bankDepositdescr.setRtnTdrtm(item.getRtnTdrtm());
+                bankDepositdescr.setRtnDuetp(item.getRtnDuetp());
+                bankDepositdescr.setRtnMbrshpno(item.getRtnMbrshpno());
+                bankDepositdescr.setRtnSvcfee(item.getRtnSvcfee());
+                bankDepositdescr.setRtnRemark(item.getRtnRemark());
+                bankDepositdescr.setReason("供应商修改信息异常");
+                remoteDepositService.insertDepositReason(bankDepositdescr,SecurityConstants.INNER);
+                continue;
+            }
+
             BidQuote bidQuote = new BidQuote();
             bidQuote.setSid(sid);
             bidQuote.setHid(hid);
@@ -826,6 +887,8 @@ public class BidTenderController extends BaseController {
     @Transactional
     @PostMapping("/refund")
     public int refund(){
+        //TODO
+        // 筛选条件优化
         List<BidQuote> bidQuotes = bidQuoteService.selectQuoteList2(new BidQuote());
         List<String> ids = new ArrayList<>();
         for(BidQuote item : bidQuotes){

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/mapper/BidTenderMapper.java

@@ -214,4 +214,7 @@ public interface BidTenderMapper
 
     // 根据打款银行账户获取供应商ID
     public Long selectHidByAccount(Map map);
+
+    // 查询自定义不明保证金数量
+    public int selectDespositCount(Map map);
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/IBidTenderService.java

@@ -212,4 +212,7 @@ public interface IBidTenderService
 
     // 根据打款银行账户获取供应商ID
     public Long selectHidByAccount(Map map);
+
+    // 查询自定义不明保证金数量
+    public int selectDespositCount(Map map);
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/impl/BidTenderServiceImpl.java

@@ -238,4 +238,9 @@ public class BidTenderServiceImpl implements IBidTenderService {
     public Long selectHidByAccount(Map map) {
         return bidTenderMapper.selectHidByAccount(map);
     }
+
+    @Override
+    public int selectDespositCount(Map map) {
+        return bidTenderMapper.selectDespositCount(map);
+    }
 }

ruoyi-modules/hh-bidding/src/main/resources/mapper/BidContractMapper.xml

@@ -127,7 +127,6 @@
             <if test="sCode != null">and w.s_code LIKE CONCAT('%', #{sCode}, '%')</if>
             <if test="sName != null">and w.s_name LIKE CONCAT('%', #{sName}, '%')</if>
             <if test="examine != null"> and i.examine = #{examine}</if>
-            and w.status &gt; 1
             and r.gs_state = 1
             and r.gs_approve_state = 3
             and r.gs_res_date &lt;= now()

ruoyi-modules/hh-bidding/src/main/resources/mapper/BidTenderMapper.xml

@@ -569,4 +569,8 @@
         select hid from bs_supplier where h_account = #{account} and h_name = #{company}
     </select>
 
+    <select id="selectDespositCount" parameterType="map">
+        select count(depositdescid) from bank_depositdescr where ppid = #{uid} and rtn_tdracctno = #{account} and rtn_tdrdt = #{date} and rtn_tdrtm = #{time}
+    </select>
+
 </mapper>

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/controller/BankDepositController.java

@@ -364,7 +364,6 @@ public class BankDepositController extends BaseController {
         t.setRtnTdracctnm(bankDepositdescr.getRtnTdracctnm());
         t.setRtnTdracctnobnkno(bankDepositdescr.getRtnTdracctnobnkno());
         t.setRtnTdracctnobnknm(bankDepositdescr.getRtnTdracctnobnknm());
-        ;
         t.setRtnTdrnum(bankDepositdescr.getRtnTdrnum());
         t.setRtnMrgnamt(bankDepositdescr.getRtnMrgnamt());
         t.setRtnTdramt(bankDepositdescr.getRtnTdramt());
@@ -378,8 +377,14 @@ public class BankDepositController extends BaseController {
         t.setRtnSvcfee(bankDepositdescr.getRtnSvcfee());
         t.setRtnRemark(bankDepositdescr.getRtnRemark());
         t.setReason(bankDepositdescr.getReason());
-        if (bankDepositdescrService.selectBankDepositdescrList(t).size() == 0) {
+        if (bankDepositdescrService.selectBankDepositdescrList2(t).size() == 0) {
             bankDepositdescrService.insertBankDepositdescr(t);
+        } else {
+            List<BankDepositdescr> bankDepositdescrs = bankDepositdescrService.selectBankDepositdescrList2(t);
+            for(BankDepositdescr item : bankDepositdescrs){
+                t.setDepositdescid(item.getDepositdescid());
+                bankDepositdescrService.updateBankDepositdescr(t);
+            }
         }
         return 1;
     }

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/mapper/BankDepositMapper.java

@@ -58,4 +58,6 @@ public interface BankDepositMapper
      * @return 结果
      */
     public int deleteBankDepositByDepositids(String[] depositids);
+
+
 }

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/mapper/BankDepositdescrMapper.java

@@ -62,4 +62,6 @@ public interface BankDepositdescrMapper
     public int deleteBankDepositdescrByDepositdescids(String[] depositdescids);
 
     public List<BankDepositdescr> selectExportList(Map map);
+
+    public List<BankDepositdescr> selectBankDepositdescrList2(BankDepositdescr bankDepositdescr);
 }

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/service/IBankDepositdescrService.java

@@ -62,4 +62,6 @@ public interface IBankDepositdescrService
     public int deleteBankDepositdescrByDepositdescid(String depositdescid);
 
     public List<BankDepositdescr> selectExportList(Map map);
+
+    public List<BankDepositdescr> selectBankDepositdescrList2(BankDepositdescr bankDepositdescr);
 }

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/bank/service/impl/BankDepositdescrServiceImpl.java

@@ -97,4 +97,9 @@ public class BankDepositdescrServiceImpl implements IBankDepositdescrService
     public List<BankDepositdescr> selectExportList(Map map) {
         return bankDepositdescrMapper.selectExportList(map);
     }
+
+    @Override
+    public List<BankDepositdescr> selectBankDepositdescrList2(BankDepositdescr bankDepositdescr) {
+        return bankDepositdescrMapper.selectBankDepositdescrList2(bankDepositdescr);
+    }
 }

ruoyi-modules/hh-mast/src/main/java/com/ruoyi/mast/materiel/controller/MastMaterielController.java

@@ -55,17 +55,6 @@ public class MastMaterielController extends BaseController
         util.exportExcel(response, list, "物料组信息数据");
     }
 
-    /**
-     * 批量获取物料组信息详细信息
-     */
-    @InnerAuth
-    @GetMapping(value = "/getInfos/{materielIds}")
-    public List<MastMateriel> getInfos(@PathVariable("materielIds") Integer[] materielIds)
-    {
-        List<MastMateriel> mlist = mastMaterielService.selectMastMaterielByIds(materielIds);
-        return mlist;
-    }
-
     /**
      * 新增物料组信息
      */
@@ -124,6 +113,17 @@ public class MastMaterielController extends BaseController
         return map;
     }
 
+    /**
+     * 批量获取物料组信息详细信息
+     */
+    @InnerAuth
+    @GetMapping(value = "/getInfos/{materielIds}")
+    public List<MastMateriel> getInfos(@PathVariable("materielIds") Integer[] materielIds)
+    {
+        List<MastMateriel> mlist = mastMaterielService.selectMastMaterielByIds(materielIds);
+        return mlist;
+    }
+
     /**
      * 获取物料组信息详细信息
      */
@@ -133,4 +133,6 @@ public class MastMaterielController extends BaseController
     {
         return success(mastMaterielService.selectMastMaterielByMaterielId(materielId));
     }
+
+
 }

ruoyi-modules/hh-mast/src/main/resources/mapper/bank/BankDepositdescrMapper.xml

@@ -297,4 +297,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectExportList" parameterType="Map">
         select * from bank_depositdescr where rtn_tdrdt between #{startTime} and #{endTime}
     </select>
+
+    <select id="selectBankDepositdescrList2" parameterType="BankDepositdescr" resultType="com.ruoyi.mast.bank.domain.BankDepositdescr">
+        select b.*,r.rtn_rfndst
+        from bank_depositdescr b left join bank_refund r on (b.sgtid = r.sgtid and b.rtn_tdracctno = r.rtn_tdracctno)
+        <where>
+            <if test="ppid != null "> and b.ppid = #{ppid}</if>
+            <if test="rtnTdracctno != null  and rtnTdracctno != ''"> and b.rtn_tdracctno like concat('%', #{rtnTdracctno}, '%')</if>
+            <if test="rtnTdrdt != null  and rtnTdrdt != ''"> and b.rtn_tdrdt = #{rtnTdrdt}</if>
+            <if test="rtnTdrtm != null  and rtnTdrtm != ''"> and b.rtn_tdrtm = #{rtnTdrtm}</if>
+        </where>
+    </select>
+
 </mapper>