ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/domain/BsExpert.java

@@ -169,6 +169,8 @@ public class BsExpert extends BaseEntity {
 
     private String jMain;
 
+    private String jSign;
+
     public BsExperience getExperience() {
         return experience;
     }
@@ -497,6 +499,14 @@ public class BsExpert extends BaseEntity {
         this.jMain = jMain;
     }
 
+    public String getjSign() {
+        return jSign;
+    }
+
+    public void setjSign(String jSign) {
+        this.jSign = jSign;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/domain/BsSupplier.java

@@ -214,6 +214,8 @@ public class BsSupplier extends BaseEntity {
 
     private Integer pType;
 
+    private Integer hSms;
+
     public String gethLoginAccount() {
         return hLoginAccount;
     }
@@ -502,6 +504,14 @@ public class BsSupplier extends BaseEntity {
         this.pType = pType;
     }
 
+    public Integer gethSms() {
+        return hSms;
+    }
+
+    public void sethSms(Integer hSms) {
+        this.hSms = hSms;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

ruoyi-modules/hh-basic/src/main/resources/mapper/BsExpertMapper.xml

@@ -79,7 +79,8 @@
                j_profession,
                j_other,
                user_id,
-               j_main
+               j_main,
+               j_sign
         from bs_expert
     </sql>
 
@@ -136,6 +137,7 @@
             <if test="jOther != null">j_other,</if>
             <if test="userId != null">user_id,</if>
             <if test="jMain != null">j_main,</if>
+            <if test="jSign != null">j_sign,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jid != null">#{jid},</if>
@@ -170,6 +172,7 @@
             <if test="jOther != null">#{jOther},</if>
             <if test="userId != null">#{userId},</if>
             <if test="jMain != null">#{jMain},</if>
+            <if test="jSign != null">#{jSign},</if>
         </trim>
     </insert>
 
@@ -207,6 +210,7 @@
             <if test="jOther!= null">j_other = #{jOther},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="jMain != null">j_main = #{jMain},</if>
+            <if test="jSign != null">j_sign = #{jSign},</if>
         </trim>
         where jid = #{jid}
     </update>

ruoyi-modules/hh-basic/src/main/resources/mapper/BsSupplierMapper.xml

@@ -125,7 +125,8 @@
                need_to_uppwd,
                bankinfo_status,
                h_encode,
-               p_type
+               p_type,
+               h_sms
         from bs_supplier
     </sql>
 
@@ -388,6 +389,7 @@
             <if test="bankinfoStatus != null">bankinfo_status = #{bankinfoStatus},</if>
             <if test="hEncode != null">h_encode = #{hEncode},</if>
             <if test="pType != null">p_type = #{pType},</if>
+            <if test="hSms != null">h_sms = #{hSms},</if>
         </trim>
         where hid = #{hid}
     </update>

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

@@ -209,6 +209,16 @@ public class BidCommitteeController extends BaseController
     @Log(title = "选择评标委员会组长", businessType = BusinessType.UPDATE)
     @PutMapping("/updateLeader")
     public AjaxResult updateLeader(@RequestParam("pbId") Long pbId){
+        BidCommittee bidCommittee = bidCommitteeService.selectBidCommitteeByPbId(pbId);
+        Long sid = bidCommittee.getSid();
+
+        BidCommittee item = new BidCommittee();
+        item.setSid(sid);
+        item.setIsLeader(1);
+        List<BidCommittee> bidCommittees = bidCommitteeService.selectBidCommitteeList(item);
+        if(bidCommittees.size() > 0){
+            return AjaxResult.error("组长不能重复选择");
+        }
         return toAjax(bidCommitteeService.updateLeader(pbId));
     }
 

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

@@ -501,6 +501,9 @@ public class BidNoticeController extends BaseController {
     @GetMapping("/getBankAccount")
     public AjaxResult getBankAccount(@RequestParam("uid") Long uid){
         BidNotice bidNotice = bidNoticeService.selectBidNoticeByUid(uid);
+        if(bidNotice.getuTitle().length() > 75){
+            bidNotice.setuTitle(bidNotice.getuTitle().substring(0,75));
+        }
 
         /**添加标段银行接口*/
         BidTender bt = bidTenderService.selectBidTenderBySid(bidNotice.getSid());

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

@@ -114,12 +114,32 @@ public class BidQuoteController extends BaseController
     }
 
     /**
-     * 新增报价
+     * 报名项目
      */
     @Log(title = "报名", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@RequestBody BidQuote bidQuote)
     {
+        String contact = bidQuote.getContact();
+        String contactPhone = bidQuote.getContactPhone();
+        Long sid = bidQuote.getSid();
+
+        BidQuote item1 = new BidQuote();
+        item1.setSid(sid);
+        item1.setContact(contact);
+        List<BidQuote> bidQuotes = bidQuoteService.selectQuoteList(item1);
+        if(bidQuotes.size() > 0){
+            return AjaxResult.error("同一个项目供应商联系人不能是同一个人");
+        }
+
+        BidQuote item2 = new BidQuote();
+        item2.setSid(sid);
+        item2.setContactPhone(contactPhone);
+        List<BidQuote> quotes = bidQuoteService.selectQuoteList(item2);
+        if(quotes.size() > 0){
+            return AjaxResult.error("同一个项目供应商联系方式不能相同");
+        }
+
         if(bidQuoteService.selectQuoteList(bidQuote).size()>0){
             return toAjax(0);
         }

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

@@ -528,6 +528,7 @@ public class BidTenderController extends BaseController {
 
     // 短信发送接口 (供应商)
     @InnerAuth
+    @Transactional
     @GetMapping("/sendSmsSupplier")
     public int sendSmsSupplier() throws Exception {
         List<BidNoticeAndSms> noticeList = bidTenderService.selectNoticeByMes();

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

@@ -7,9 +7,7 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
 import com.hh.bidding.domain.*;
-import com.hh.bidding.service.IBidInvoiceService;
-import com.hh.bidding.service.IBidTenderService;
-import com.hh.bidding.service.IBidWinningResultsService;
+import com.hh.bidding.service.*;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.RemotePlanService;
@@ -25,7 +23,6 @@ import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.hh.bidding.service.IBidWinnerService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -60,6 +57,9 @@ public class BidWinnerController extends BaseController
     @Autowired
     private IBidWinningResultsService bidWinningResultsService;
 
+    @Autowired
+    private IBidNoticeService bidNoticeService;
+
 
     public Long getOwnerdept() {
         Long r = 0L;
@@ -446,6 +446,9 @@ public class BidWinnerController extends BaseController
             Long ownerDept = bidTender.getOwnerDept();
             SysDept sysDept = remoteUserService.getInfoById(ownerDept, SecurityConstants.INNER);
             item.setsUnit(sysDept.getDeptName());
+
+            BidNotice bidNotice = bidNoticeService.selectBidNoticeBySid(item.getSid());
+            item.setuKaiTime(bidNotice.getuKaiTime());
         }
         return getDataTable(list);
     }

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

@@ -685,4 +685,86 @@ public class ExpertMarkController extends BaseController{
         return success(list);
     }
 
+    // 获取待评分供应商列表及状态
+    @GetMapping("/getToMarkList")
+    public AjaxResult getToMarkList(@RequestParam("sid") Long sid){
+        List<BidQuote> bidQuoteList = bidQuoteService.selectQuoteListBySid(sid);
+        Long userId = SecurityUtils.getLoginUser().getUserid();
+
+        for(BidQuote item : bidQuoteList){
+            Long hid = item.getHid();
+            BsSupplier bsSupplier = bidTenderService.selectSupplierByHid(hid);
+            item.sethName(bsSupplier.gethName());
+        }
+
+        BidExpertExamine bidExpertExamine = new BidExpertExamine();
+        BidExpertTech bidExpertTech = new BidExpertTech();
+        BidExpertRespond bidExpertRespond = new BidExpertRespond();
+
+        bidExpertExamine.setSid(sid);
+        bidExpertExamine.setUserId(userId);
+
+        bidExpertTech.setSid(sid);
+        bidExpertTech.setUserId(userId);
+
+        bidExpertRespond.setSid(sid);
+        bidExpertRespond.setUserId(userId);
+
+        // 增加状态
+        for(BidQuote item : bidQuoteList){
+            // 标记 当前供应商资质 合格不合格的状态
+            Boolean flag = false;
+            Long hid = item.getHid();
+
+            bidExpertExamine.setHid(hid);
+            bidExpertTech.setHid(hid);
+            bidExpertRespond.setHid(hid);
+
+            List<BidExpertExamine> bidExpertExamines = bidExpertExamineService.selectBidExpertExamineList(bidExpertExamine);
+            List<BidExpertTech> bidExpertTeches = bidExpertTechService.selectBidExpertTechList(bidExpertTech);
+            List<BidExpertRespond> bidExpertResponds = bidExpertRespondService.selectBidExpertRespondList(bidExpertRespond);
+
+            // 合格项 都没评分的情况
+            if(bidExpertExamines.size() == 0){
+                item.setState(false);
+                continue;
+            }
+            if(bidExpertResponds.size() == 0){
+                item.setState(false);
+                continue;
+            }
+
+            // 有不合格的即为评分完的
+            for(BidExpertExamine examine : bidExpertExamines){
+                if("不合格".equals(examine.getIsOk())){
+                    item.setState(true);
+                    flag = true;
+                    break;
+                }
+            }
+
+            if(flag){
+                continue;
+            }
+
+            for(BidExpertRespond respond : bidExpertResponds){
+                if("不合格".equals(respond.getIsOk())){
+                    item.setState(true);
+                    break;
+                }
+            }
+
+            if(flag){
+                continue;
+            }
+
+            if(bidExpertTeches.size() == 0){
+                item.setState(false);
+            }else {
+                item.setState(true);
+            }
+        }
+
+        return success(bidQuoteList);
+    }
 }

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/domain/BidQuote.java

@@ -88,6 +88,8 @@ public class BidQuote extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date thirdTime;
 
+    private Boolean state;
+
     public void setQid(Long qid)
     {
         this.qid = qid;
@@ -281,6 +283,14 @@ public class BidQuote extends BaseEntity
         this.thirdTime = thirdTime;
     }
 
+    public Boolean getState() {
+        return state;
+    }
+
+    public void setState(Boolean state) {
+        this.state = state;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/domain/BidWinner.java

@@ -1,6 +1,8 @@
 package com.hh.bidding.domain;
 
 import java.math.BigDecimal;
+import java.util.Date;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -69,6 +71,8 @@ public class BidWinner extends BaseEntity
 
     private String sUnit;
 
+    private Date uKaiTime;
+
     public void setWid(Long wid)
     {
         this.wid = wid;
@@ -230,6 +234,14 @@ public class BidWinner extends BaseEntity
         this.sUnit = sUnit;
     }
 
+    public Date getuKaiTime() {
+        return uKaiTime;
+    }
+
+    public void setuKaiTime(Date uKaiTime) {
+        this.uKaiTime = uKaiTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -36,6 +36,7 @@
             <if test="jid != null "> and jid = #{jid}</if>
             <if test="sid != null "> and sid = #{sid}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="isLeader != null "> and is_leader = #{isLeader}</if>
         </where>
     </select>
 

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

@@ -157,6 +157,8 @@
             <if test="audit != null "> and audit = #{audit}</if>
             <if test="quoteNumber != null "> and quote_number = #{quoteNumber}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="contact != null "> and contact = #{contact}</if>
+            <if test="contactPhone != null "> and contact_phone = #{contactPhone}</if>
         </where>
     </select>
 

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

@@ -572,7 +572,7 @@ public class BankDepositController extends BaseController {
     @InnerAuth
     @PostMapping("/refundBankUnlear")
     public void refundBankUnlear(){
-        List<BankUncleardeposit> bankUncleardeposits = bankUncleardepositService.refundBankUnclearList();
+        List<BankUncleardeposit> bankUncleardeposits = bankUncleardepositService.refundBankUnclearList(new BankUncleardeposit());
 
         for(BankUncleardeposit bankUncleardeposit : bankUncleardeposits){
             bankUncleardepositController.getInfo(bankUncleardeposit.getUncleardepositid());
@@ -585,15 +585,29 @@ public class BankDepositController extends BaseController {
      * @return
      */
     @GetMapping("/refundBankUnclearList")
-    public AjaxResult refundBankUnclearList(){
-        return success(bankUncleardepositService.refundBankUnclearList());
+    public TableDataInfo refundBankUnclearList(BankUncleardeposit bankUncleardeposit){
+        startPage();
+        List<BankUncleardeposit> bankUncleardeposits = bankUncleardepositService.refundBankUnclearList(bankUncleardeposit);
+
+        for(BankUncleardeposit item : bankUncleardeposits){
+            if(item.getRtnXferprccode() == null){
+                item.setStatus("未申请退款");
+            } else if("PAYOUT".equals(item.getRtnXferprccode())){
+                item.setStatus("退款成功");
+            }else{
+                item.setStatus("已申请");
+            }
+        }
+
+        return getDataTable(bankUncleardeposits);
     }
 
     @GetMapping("/refundBankUnclearInfo")
-    public AjaxResult refundBankUnclearInfo(){
+    public TableDataInfo refundBankUnclearInfo(BankUncleardeposit bankUncleardeposit){
         List<BankUncleardeposit> list = new ArrayList<>();
+        startPage();
 
-        List<BankUncleardeposit> bankUncleardeposits = bankUncleardepositService.refundBankUnclearInfo();
+        List<BankUncleardeposit> bankUncleardeposits = bankUncleardepositService.refundBankUnclearInfo(bankUncleardeposit);
         for(BankUncleardeposit item : bankUncleardeposits){
             String company = item.getRtnOppassetname();
             String bankAccount = item.getRtnOppbankno();
@@ -608,7 +622,18 @@ public class BankDepositController extends BaseController {
                 list.add(item);
             }
         }
-        return success(list);
+
+        for(BankUncleardeposit item : bankUncleardeposits){
+            if(item.getRtnXferprccode() == null){
+                item.setStatus("未申请退款");
+            } else if("PAYOUT".equals(item.getRtnXferprccode())){
+                item.setStatus("退款成功");
+            }else{
+                item.setStatus("已申请");
+            }
+        }
+
+        return getDataTable(list);
     }
 
     // 线下退款状态更新

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

@@ -65,9 +65,9 @@ public interface BankUncleardepositMapper
     public List<BankUncleardeposit> selectExportList(Map map);
 
     //  查询不是服务费的不明保证金
-    public List<BankUncleardeposit> refundBankUnclearList();
+    public List<BankUncleardeposit> refundBankUnclearList(BankUncleardeposit bankUncleardeposit);
 
     // 查询退款款申请表中不存在的退款内容（）
-    public List<BankUncleardeposit> refundBankUnclearInfo();
+    public List<BankUncleardeposit> refundBankUnclearInfo(BankUncleardeposit bankUncleardeposit);
 
 }

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

@@ -65,8 +65,8 @@ public interface IBankUncleardepositService
     public List<BankUncleardeposit> selectExportList(Map map);
 
     //  查询不是服务费的不明保证金
-    public List<BankUncleardeposit> refundBankUnclearList();
+    public List<BankUncleardeposit> refundBankUnclearList(BankUncleardeposit bankUncleardeposit);
 
     // 查询退款款申请表中不存在的退款内容（）
-    public List<BankUncleardeposit> refundBankUnclearInfo();
+    public List<BankUncleardeposit> refundBankUnclearInfo(BankUncleardeposit bankUncleardeposit);
 }

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

@@ -99,12 +99,12 @@ public class BankUncleardepositServiceImpl implements IBankUncleardepositService
     }
 
     @Override
-    public List<BankUncleardeposit> refundBankUnclearList() {
-        return bankUncleardepositMapper.refundBankUnclearList();
+    public List<BankUncleardeposit> refundBankUnclearList(BankUncleardeposit bankUncleardeposit) {
+        return bankUncleardepositMapper.refundBankUnclearList(bankUncleardeposit);
     }
 
     @Override
-    public List<BankUncleardeposit> refundBankUnclearInfo() {
-        return bankUncleardepositMapper.refundBankUnclearInfo();
+    public List<BankUncleardeposit> refundBankUnclearInfo(BankUncleardeposit bankUncleardeposit) {
+        return bankUncleardepositMapper.refundBankUnclearInfo(bankUncleardeposit);
     }
 }

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

@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rtnPrjno != null  and rtnPrjno != ''"> and rtn_prjno like concat('%',#{rtnPrjno},'%')</if>
             <if test="rtnPrjnm != null  and rtnPrjnm != ''"> and rtn_prjnm like concat('%',#{rtnPrjnm},'%') </if>
             <if test="rtnRfndst != null  and rtnRfndst != ''"> and rtn_rfndst = #{rtnRfndst}</if>
-            <if test="rtnTdracctno != null  and rtnTdracctno != ''"> and rtn_tdracctno = #{rtnTdracctno}</if>
+            <if test="rtnTdracctno != null  and rtnTdracctno != ''"> and rtn_tdracctno like concat('%',#{rtnTdracctno},'%') </if>
             <if test="rtnTdracctnoccycd != null  and rtnTdracctnoccycd != ''"> and rtn_tdracctnoccycd = #{rtnTdracctnoccycd}</if>
             <if test="rtnTdracctnm != null  and rtnTdracctnm != ''"> and rtn_tdracctnm like concat('%',#{rtnTdracctnm},'%')</if>
             <if test="rtnTdracctnobnkno != null  and rtnTdracctnobnkno != ''"> and rtn_tdracctnobnkno = #{rtnTdracctnobnkno}</if>

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

@@ -210,17 +210,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from bank_uncleardeposit where rtn_tradedate between #{startTime} and #{endTime}
     </select>
 
-    <select id="refundBankUnclearList">
-        select u.uncleardepositid, u.ppid, u.trnuid, u.rqbody, u.acctno, u.ccycd, u.begdt, u.enddt, u.rtn_trnuid, u.rtn_status, u.rtn_code, u.rtn_severity, u.rtn_message, u.rtn_rsbody, u.rtn_rcrdtotnum, u.rtn_crnpgno, u.rtn_pgrcrdnum, u.rtn_totpgnum, u.rtn_content, u.rtn_tradedate, u.rtn_serialno, u.rtn_assetno, u.rtn_assetname, u.rtn_oppassetno, u.rtn_oppassetname, u.rtn_oppbankno, u.rtn_oppbankname, u.rtn_amt, u.rtn_selfbal, u.rtn_summary,
+    <select id="refundBankUnclearList" parameterType="com.ruoyi.mast.bank.domain.BankUncleardeposit">
+        select u.uncleardepositid, u.ppid, u.trnuid, u.acctno, u.ccycd, u.begdt, u.enddt, u.rtn_trnuid, u.rtn_status, u.rtn_code, u.rtn_severity, u.rtn_message, u.rtn_rcrdtotnum, u.rtn_crnpgno, u.rtn_pgrcrdnum, u.rtn_totpgnum, u.rtn_content, u.rtn_tradedate, u.rtn_serialno, u.rtn_assetno, u.rtn_assetname, u.rtn_oppassetno, u.rtn_oppassetname, u.rtn_oppbankno, u.rtn_oppbankname, u.rtn_amt, u.rtn_selfbal, u.rtn_summary,
                u.rtn_adjustreason,r.rtn_xferprccode,u.is_apply
         from bank_uncleardeposit u left join bank_uncleardepositrfnd r on u.rtn_serialno = r.serialno
-        where u.rtn_summary not like CONCAT('%','服务费','%') and u.rtn_adjustreason not like CONCAT('%','进入不明 原虚户=999999','%') and r.rtn_xferprccode is null and u.is_apply &lt; 3
+        <where>
+            <if test="rtnOppassetname != null">and rtn_oppassetname like concat('%',#{rtnOppassetname},'%') </if>
+            <if test="rtnOppassetno != null">and rtn_oppassetno like concat('%',#{rtnOppassetno},'%') </if>
+            and u.rtn_summary not like CONCAT('%','服务费','%') and u.rtn_adjustreason not like CONCAT('%','进入不明 原虚户=999999','%') and r.rtn_xferprccode is null and u.is_apply &lt; 3
+        </where>
     </select>
 
-    <select id="refundBankUnclearInfo">
-        select u.uncleardepositid, u.ppid, u.trnuid, u.rqbody, u.acctno, u.ccycd, u.begdt, u.enddt, u.rtn_trnuid, u.rtn_status, u.rtn_code, u.rtn_severity, u.rtn_message, u.rtn_rsbody, u.rtn_rcrdtotnum, u.rtn_crnpgno, u.rtn_pgrcrdnum, u.rtn_totpgnum, u.rtn_content, u.rtn_tradedate, u.rtn_serialno, u.rtn_assetno, u.rtn_assetname, u.rtn_oppassetno, u.rtn_oppassetname, u.rtn_oppbankno, u.rtn_oppbankname, u.rtn_amt, u.rtn_selfbal, u.rtn_summary,
+    <select id="refundBankUnclearInfo" parameterType="com.ruoyi.mast.bank.domain.BankUncleardeposit">
+        select u.uncleardepositid, u.ppid, u.trnuid, u.acctno, u.ccycd, u.begdt, u.enddt, u.rtn_trnuid, u.rtn_status, u.rtn_code, u.rtn_severity, u.rtn_message, u.rtn_rcrdtotnum, u.rtn_crnpgno, u.rtn_pgrcrdnum, u.rtn_totpgnum, u.rtn_content, u.rtn_tradedate, u.rtn_serialno, u.rtn_assetno, u.rtn_assetname, u.rtn_oppassetno, u.rtn_oppassetname, u.rtn_oppbankno, u.rtn_oppbankname, u.rtn_amt, u.rtn_selfbal, u.rtn_summary,
                u.rtn_adjustreason,r.rtn_xferprccode,u.is_apply
         from bank_uncleardeposit u left join bank_uncleardepositrfnd r on u.rtn_serialno = r.serialno
-        where u.rtn_summary not like CONCAT('%','服务费','%') and u.rtn_adjustreason not like CONCAT('%','进入不明 原虚户=999999','%') and r.rtn_xferprccode is null and u.is_apply = 3
+        <where>
+            <if test="rtnOppassetname != null">and rtn_oppassetname like concat('%',#{rtnOppassetname},'%') </if>
+            <if test="rtnOppassetno != null">and rtn_oppassetno like concat('%',#{rtnOppassetno},'%') </if>
+            and u.rtn_summary not like CONCAT('%','服务费','%') and u.rtn_adjustreason not like CONCAT('%','进入不明 原虚户=999999','%') and r.rtn_xferprccode is null and u.is_apply = 3
+        </where>
     </select>
 </mapper>

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java

@@ -4,7 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.ruoyi.common.security.annotation.InnerAuth;
+import com.ruoyi.system.api.domain.SysDictData;
 import com.ruoyi.system.domain.vo.TreeSelect;
+import com.ruoyi.system.service.ISysDictDataService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -32,6 +34,9 @@ public class SysDeptController extends BaseController
     @Autowired
     private ISysDeptService deptService;
 
+    @Autowired
+    private ISysDictDataService dictDataService;
+
     /**
      * 获取部门列表
      */
@@ -79,6 +84,21 @@ public class SysDeptController extends BaseController
             return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(SecurityUtils.getUsername());
+
+        if(dept.getDeptName().matches(".*公司$")){
+            SysDictData dict = new SysDictData();
+
+            dict.setDictType("mast_enterprise");
+            List<SysDictData> sysDictDatas = dictDataService.selectDictDataList(dict);
+            dict.setListClass("default");
+            dict.setDictLabel(dept.getDeptName());
+            dict.setDictSort((long) (sysDictDatas.size()+1));
+            dict.setDictValue(String.valueOf(sysDictDatas.size()+1));
+            dict.setStatus("0");
+
+            dictDataService.insertDictData(dict);
+        }
+
         return toAjax(deptService.insertDept(dept));
     }
 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -8,7 +8,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.system.api.RemoteExpertService;
-import com.ruoyi.system.api.domain.BsExpert;
+import com.ruoyi.system.api.domain.*;
+import com.ruoyi.system.service.*;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -25,16 +26,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.InnerAuth;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysDept;
-import com.ruoyi.system.api.domain.SysRole;
-import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysPermissionService;
-import com.ruoyi.system.service.ISysPostService;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserService;
 
 /**
  * 用户信息
@@ -66,6 +58,9 @@ public class SysUserController extends BaseController
     @Autowired
     private RemoteExpertService remoteExpertService;
 
+    @Autowired
+    private ISysDictDataService dictDataService;
+
 
     /**
      * 获取用户列表