Merge branch 'master' of http://219.147.85.210:8080/gmcs/HongHu-PSM

bidding-ui/src/router/index.js

@@ -217,7 +217,7 @@ router.beforeEach((to, from, next) => {
           if (needBankinfoWhite.includes(topath)) {
             next()
           } else {
-            if (data.bankinfoStatus === null) {
+            if (data.bankinfoStatus == 1 || data.bankinfoStatus === null) {
               MessageBox.alert('<span style="color:red;">请完善银行基本账户信息<span>', '提示', {
                 confirmButtonText: '确定',
                 showClose: false,

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsExpertController.java

@@ -168,6 +168,7 @@ public class BsExpertController extends BaseController {
     }
 
     // 测试 用户新增服务
+    @Log(title = "专家用户新增", businessType = BusinessType.INSERT)
     @PostMapping("/addExpertUser")
     public AjaxResult addExpertUser() {
         SysUser user = new SysUser();

ruoyi-modules/hh-basic/src/main/java/com/hh/pms/sae/controller/BsSupplierController.java

@@ -110,6 +110,7 @@ public class BsSupplierController extends BaseController {
         return AjaxResult.success(outputStream);
     }
 
+    @Log(title = "供应商登录", businessType = BusinessType.OTHER)
     @PostMapping("/loginSupplier")
     public AjaxResult login(String userName, String pass, String code, HttpServletRequest request,
                             HttpServletResponse response) {
@@ -142,6 +143,7 @@ public class BsSupplierController extends BaseController {
         return AjaxResult.error("用户名或者密码错误");
     }
 
+    @Log(title = "供应商登录2", businessType = BusinessType.OTHER)
     @PostMapping("/loginSupplier2")
     public AjaxResult login2(String userName, String pass, String code, HttpServletRequest request,
                              HttpServletResponse response) {
@@ -246,7 +248,7 @@ public class BsSupplierController extends BaseController {
     /**
      * 导出供应商列表
      */
-    @Log(title = "供应商", businessType = BusinessType.EXPORT)
+    @Log(title = "供应商导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BsSupplier bsSupplier) {
         List<BsSupplier> list = bsSupplierService.selectBsSupplierList(bsSupplier);
@@ -450,6 +452,7 @@ public class BsSupplierController extends BaseController {
     }
 
     @Transactional(rollbackFor = Exception.class)
+    @Log(title = "供应商批量导入", businessType = BusinessType.INSERT)
     @PostMapping("/leadExcel")
     public AjaxResult leadExcel(MultipartFile file) throws IOException {
         int i = 0;

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

@@ -104,6 +104,7 @@ public class BidCommitteeController extends BaseController
         return toAjax(bidCommitteeService.deleteBidCommitteeByPbIds(pbIds));
     }
 
+    @Log(title = "删除评标委员会", businessType = BusinessType.DELETE)
     @DeleteMapping("/delComBySid/{sid}")
     public AjaxResult remove(@PathVariable Long sid)
     {
@@ -130,6 +131,7 @@ public class BidCommitteeController extends BaseController
      * @param committee
      * @return
      */
+    @Log(title = "添加评标委员会", businessType = BusinessType.INSERT)
     @PostMapping("/addCommittee")
     public AjaxResult addCommittee(@RequestBody Committee committee){
         BidCommittee bidCommittee = new BidCommittee();
@@ -204,6 +206,7 @@ public class BidCommitteeController extends BaseController
         return getDataTable(list);
     }
 
+    @Log(title = "选择评标委员会组长", businessType = BusinessType.UPDATE)
     @PutMapping("/updateLeader")
     public AjaxResult updateLeader(@RequestParam("pbId") Long pbId){
         return toAjax(bidCommitteeService.updateLeader(pbId));

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

@@ -118,7 +118,6 @@ public class BidContractController extends BaseController
             if(bidWinner0.getStatus() == 2){
                 bidWinner.setStatus(3L);
             }
-            // TODO 加个定时，将合同审核通过的中标人信息，status 从2 改成 3
             int i = bidWinnerService.updateBidWinner(bidWinner);
             if(i == 0){
                 throw new Exception("修改失败");

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

@@ -260,6 +260,7 @@ public class BidInvoiceController extends BaseController
     }
 
     // 开票信息导出
+    @Log(title = "开票信息导出", businessType = BusinessType.EXPORT)
     @PostMapping("/exportList")
     public void exportList(HttpServletResponse response, String startTime,String endTime)
     {

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

@@ -131,6 +131,7 @@ public class BidIvrController extends BaseController
      * @param
      * @return
      */
+    @Log(title = "发送语音通话", businessType = BusinessType.OTHER)
     @PostMapping("/sendCall")
     public AjaxResult sendCall(@RequestBody VoiceTts voiceTts) throws Exception {
         DyvmsUtil dyvmsUtil = new DyvmsUtil();
@@ -150,6 +151,7 @@ public class BidIvrController extends BaseController
      * @param voiceReports
      * @return
      */
+    @Log(title = "电话通知回执", businessType = BusinessType.INSERT)
     @PostMapping("/saveCall")
     public AjaxResult saveCall(@RequestBody VoiceReport[] voiceReports){
         System.out.println(voiceReports[0].toString());
@@ -223,6 +225,7 @@ public class BidIvrController extends BaseController
     }
 
     // 短信回执信息地址
+    @Log(title = "短信回执", businessType = BusinessType.INSERT)
     @PostMapping("/smsMes")
     public void getSmsMessage(@RequestBody SmsMessage smsMessage){
         String mobile = smsMessage.getMobile();
@@ -243,6 +246,7 @@ public class BidIvrController extends BaseController
     }
 
     // 短信发送接口(专家）
+    @Log(title = "短信发送", businessType = BusinessType.OTHER)
     @PostMapping("/sendSmsExpert")
     public AjaxResult sendSmsExpert(SmsParam smsParam) throws UnsupportedEncodingException, NoSuchAlgorithmException {
         String[] param = new String[8];
@@ -310,6 +314,7 @@ public class BidIvrController extends BaseController
     }
 
     // 短信发送接口 (供应商)
+    @Log(title = "供应商发送短信", businessType = BusinessType.OTHER)
     @PostMapping("/sendSmsSupplier")
     public AjaxResult sendSmsSupplier(@RequestBody SmsParam smsParam) throws UnsupportedEncodingException, NoSuchAlgorithmException {
         String[] param = new String[6];

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

@@ -150,6 +150,7 @@ public class BidQuoteController extends BaseController
      * @return
      * @throws Exception
      */
+    @Log(title = "供应商报价", businessType = BusinessType.UPDATE)
     @Transactional(rollbackFor = Exception.class)
     @PutMapping("/updateQuote")
     public AjaxResult updateQuote(@RequestBody BidQuote bidQuote) throws Exception {

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

@@ -356,6 +356,7 @@ public class BidTenderController extends BaseController {
     }
 
     // 竞价+评审的手动开标
+    @Log(title = "手动开标", businessType = BusinessType.UPDATE)
     @PutMapping("/openTender")
     public AjaxResult openTender(@RequestBody BidQuote bidQuote){
         Long sid = bidQuote.getSid();
@@ -375,6 +376,7 @@ public class BidTenderController extends BaseController {
     }
 
     // 询比的手动开标
+    @Log(title = "询比手动开标", businessType = BusinessType.UPDATE)
     @PutMapping("/openTenderTwo")
     public AjaxResult openTenderTwo(@RequestBody ScoreSummary scoreSummary){
         List<ScoreSummary> scoreSummaries = scoreSummaryService.selectScoreSummaryList(scoreSummary);
@@ -417,6 +419,7 @@ public class BidTenderController extends BaseController {
      * @param sid
      * @return
      */
+    @Log(title = "招标项目更新", businessType = BusinessType.UPDATE)
     @PutMapping("/updateTender")
     public AjaxResult updateTender(@RequestParam("sid") Long sid){
         return toAjax(bidTenderService.updateTenderStatus(9L,sid));
@@ -427,6 +430,7 @@ public class BidTenderController extends BaseController {
      *
      * @return
      */
+    @Log(title = "专家抽取申请", businessType = BusinessType.INSERT)
     @PostMapping ("/updateIsApply")
     public AjaxResult updateIsApply(@RequestBody BidTender bidTender){
         Long sid = bidTender.getSid();
@@ -1116,6 +1120,7 @@ public class BidTenderController extends BaseController {
 
     // 中标终止审批
     @Transactional(rollbackFor = Exception.class)
+    @Log(title = "中标终止审批", businessType = BusinessType.UPDATE)
     @PutMapping("/updateTenderByState")
     public AjaxResult updateTenderByState(@RequestBody BidTender bidTender){
         BidTender res = bidTenderService.selectBidTenderBySid(bidTender.getSid());
@@ -1182,6 +1187,7 @@ public class BidTenderController extends BaseController {
 
     // 中标变更申请
     @Transactional(rollbackFor = Exception.class)
+    @Log(title = "中标变更申请", businessType = BusinessType.UPDATE)
     @PutMapping("/updateTenderByCState")
     public AjaxResult updateTenderByCState(@RequestBody BidTender bidTender){
         System.out.println("DDDDDDDDDDDDDD");
@@ -1502,6 +1508,7 @@ public class BidTenderController extends BaseController {
         return success(bidTender);
     }
 
+    @Log(title = "删除项目", businessType = BusinessType.INSERT)
     @DeleteMapping(value = "/deleteBySid/{sid}")
     public AjaxResult deleteBySid(@PathVariable Long sid){
         if(bidNoticeService.selectBidNoticeBySid(sid) != null){

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

@@ -441,6 +441,7 @@ public class BidWinnerController extends BaseController
     }
 
     // 同步开票信息
+    @Log(title = "同步开票信息", businessType = BusinessType.INSERT)
     @PostMapping("/addInvoice")
     public AjaxResult addInvoice(@RequestParam("wid") Long wid){
         BidWinner bidWinner = bidWinnerService.selectBidWinnerByWid(wid);

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

@@ -293,6 +293,7 @@ public class BidWinningResultsController extends BaseController {
 
     // 中标结果变更
     @Transactional(rollbackFor = Exception.class)
+    @Log(title = "中标变更", businessType = BusinessType.UPDATE)
     @PostMapping("/alterBid")
     public AjaxResult alterBid(@RequestBody BidChangeRecord param){
         Long sid = param.getSid();

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

@@ -6,6 +6,8 @@ import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.RemoteMaterialService;
 import com.ruoyi.system.api.RemotePlanService;
@@ -99,6 +101,7 @@ public class ExpertMarkController extends BaseController{
     }
 
     // 编写各表评分标准
+    @Log(title = "添加评分标准", businessType = BusinessType.INSERT)
     @PostMapping("/addReview")
     public AjaxResult addReview(@RequestBody Mark mark){
         List<BidExamine> examineList = mark.getExamineList();
@@ -143,6 +146,7 @@ public class ExpertMarkController extends BaseController{
     }
 
     // 资格审查表评分
+    @Log(title = "资格审查", businessType = BusinessType.INSERT)
     @PostMapping("/addExpertExamine")
     public AjaxResult addExpertExamine(@RequestBody Mark mark){
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
@@ -164,6 +168,7 @@ public class ExpertMarkController extends BaseController{
     }
 
     // 技术审查表评分
+    @Log(title = "技术审查", businessType = BusinessType.INSERT)
     @PostMapping("/addExpertTech")
     public AjaxResult addExpertTech(@RequestBody Mark mark){
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
@@ -185,6 +190,7 @@ public class ExpertMarkController extends BaseController{
     }
 
     // 响应性审查表评分
+    @Log(title = "响应性审查", businessType = BusinessType.INSERT)
     @PostMapping("/addExpertRespond")
     public AjaxResult addExpertRespond(@RequestBody Mark mark){
         SysUser sysUser = SecurityUtils.getLoginUser().getSysUser();
@@ -325,6 +331,7 @@ public class ExpertMarkController extends BaseController{
 
     // 专家打分
     @Transactional(rollbackFor = Exception.class)
+    @Log(title = "专家打分", businessType = BusinessType.INSERT)
     @PostMapping("/addMark")
     public AjaxResult addMark(@RequestBody Mark mark){
         Long userId = SecurityUtils.getLoginUser().getSysUser().getUserId();

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

@@ -0,0 +1,98 @@
+package com.hh.bidding.controller;
+
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+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.domain.QuoteInfo;
+import com.hh.bidding.service.IQuoteInfoService;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+
+/**
+ * QuoteInfoController
+ *
+ * @author ruoyi
+ * @date 2024-09-28
+ */
+@RestController
+@RequestMapping("/quoteInfo")
+public class QuoteInfoController extends BaseController
+{
+    @Autowired
+    private IQuoteInfoService quoteInfoService;
+
+    /**
+     * 查询QuoteInfo列表
+     */
+    // @RequiresPermissions("system:quoteInfo:list")
+    @GetMapping("/list")
+    public TableDataInfo list(QuoteInfo quoteInfo)
+    {
+        startPage();
+        List<QuoteInfo> list = quoteInfoService.selectQuoteInfoList(quoteInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出QuoteInfo列表
+     */
+    // @RequiresPermissions("system:quoteInfo:export")
+    @Log(title = "QuoteInfo", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, QuoteInfo quoteInfo)
+    {
+        List<QuoteInfo> list = quoteInfoService.selectQuoteInfoList(quoteInfo);
+        ExcelUtil<QuoteInfo> util = new ExcelUtil<QuoteInfo>(QuoteInfo.class);
+        util.exportExcel(response, list, "QuoteInfo数据");
+    }
+
+    /**
+     * 获取QuoteInfo详细信息
+     */
+    // @RequiresPermissions("system:quoteInfo:query")
+    @GetMapping(value = "/getInfo")
+    public AjaxResult getInfo(@RequestParam("id") Long id)
+    {
+        return success(quoteInfoService.selectQuoteInfoById(id));
+    }
+
+    /**
+     * 新增QuoteInfo
+     */
+    // @RequiresPermissions("system:quoteInfo:add")
+    @Log(title = "QuoteInfo", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody QuoteInfo quoteInfo)
+    {
+        return toAjax(quoteInfoService.insertQuoteInfo(quoteInfo));
+    }
+
+    /**
+     * 修改QuoteInfo
+     */
+    // @RequiresPermissions("system:quoteInfo:edit")
+    @Log(title = "QuoteInfo", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody QuoteInfo quoteInfo)
+    {
+        return toAjax(quoteInfoService.updateQuoteInfo(quoteInfo));
+    }
+
+    /**
+     * 删除QuoteInfo
+     */
+    // @RequiresPermissions("system:quoteInfo:remove")
+    @Log(title = "QuoteInfo", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(quoteInfoService.deleteQuoteInfoByIds(ids));
+    }
+}

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

@@ -0,0 +1,81 @@
+package com.hh.bidding.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * QuoteInfo对象 quote_info
+ *
+ * @author ruoyi
+ * @date 2024-09-28
+ */
+public class QuoteInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long sid;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long hid;
+
+    /** 报价详情 */
+    @Excel(name = "报价详情")
+    private String detail;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setSid(Long sid)
+    {
+        this.sid = sid;
+    }
+
+    public Long getSid()
+    {
+        return sid;
+    }
+    public void setHid(Long hid)
+    {
+        this.hid = hid;
+    }
+
+    public Long getHid()
+    {
+        return hid;
+    }
+    public void setDetail(String detail)
+    {
+        this.detail = detail;
+    }
+
+    public String getDetail()
+    {
+        return detail;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("sid", getSid())
+                .append("hid", getHid())
+                .append("detail", getDetail())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.hh.bidding.mapper;
+
+import java.util.List;
+import com.hh.bidding.domain.QuoteInfo;
+
+/**
+ * QuoteInfoMapper接口
+ *
+ * @author ruoyi
+ * @date 2024-09-28
+ */
+public interface QuoteInfoMapper
+{
+    /**
+     * 查询QuoteInfo
+     *
+     * @param id QuoteInfo主键
+     * @return QuoteInfo
+     */
+    public QuoteInfo selectQuoteInfoById(Long id);
+
+    /**
+     * 查询QuoteInfo列表
+     *
+     * @param quoteInfo QuoteInfo
+     * @return QuoteInfo集合
+     */
+    public List<QuoteInfo> selectQuoteInfoList(QuoteInfo quoteInfo);
+
+    /**
+     * 新增QuoteInfo
+     *
+     * @param quoteInfo QuoteInfo
+     * @return 结果
+     */
+    public int insertQuoteInfo(QuoteInfo quoteInfo);
+
+    /**
+     * 修改QuoteInfo
+     *
+     * @param quoteInfo QuoteInfo
+     * @return 结果
+     */
+    public int updateQuoteInfo(QuoteInfo quoteInfo);
+
+    /**
+     * 删除QuoteInfo
+     *
+     * @param id QuoteInfo主键
+     * @return 结果
+     */
+    public int deleteQuoteInfoById(Long id);
+
+    /**
+     * 批量删除QuoteInfo
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteQuoteInfoByIds(Long[] ids);
+}

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

@@ -0,0 +1,61 @@
+package com.hh.bidding.service;
+
+import java.util.List;
+import com.hh.bidding.domain.QuoteInfo;
+
+/**
+ * QuoteInfoService接口
+ *
+ * @author ruoyi
+ * @date 2024-09-28
+ */
+public interface IQuoteInfoService
+{
+    /**
+     * 查询QuoteInfo
+     *
+     * @param id QuoteInfo主键
+     * @return QuoteInfo
+     */
+    public QuoteInfo selectQuoteInfoById(Long id);
+
+    /**
+     * 查询QuoteInfo列表
+     *
+     * @param quoteInfo QuoteInfo
+     * @return QuoteInfo集合
+     */
+    public List<QuoteInfo> selectQuoteInfoList(QuoteInfo quoteInfo);
+
+    /**
+     * 新增QuoteInfo
+     *
+     * @param quoteInfo QuoteInfo
+     * @return 结果
+     */
+    public int insertQuoteInfo(QuoteInfo quoteInfo);
+
+    /**
+     * 修改QuoteInfo
+     *
+     * @param quoteInfo QuoteInfo
+     * @return 结果
+     */
+    public int updateQuoteInfo(QuoteInfo quoteInfo);
+
+    /**
+     * 批量删除QuoteInfo
+     *
+     * @param ids 需要删除的QuoteInfo主键集合
+     * @return 结果
+     */
+    public int deleteQuoteInfoByIds(Long[] ids);
+
+    /**
+     * 删除QuoteInfo信息
+     *
+     * @param id QuoteInfo主键
+     * @return 结果
+     */
+    public int deleteQuoteInfoById(Long id);
+}

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

@@ -0,0 +1,96 @@
+package com.hh.bidding.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.core.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.hh.bidding.mapper.QuoteInfoMapper;
+import com.hh.bidding.domain.QuoteInfo;
+import com.hh.bidding.service.IQuoteInfoService;
+
+/**
+ * QuoteInfoService业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-09-28
+ */
+@Service
+public class QuoteInfoServiceImpl implements IQuoteInfoService
+{
+    @Autowired
+    private QuoteInfoMapper quoteInfoMapper;
+
+    /**
+     * 查询QuoteInfo
+     *
+     * @param id QuoteInfo主键
+     * @return QuoteInfo
+     */
+    @Override
+    public QuoteInfo selectQuoteInfoById(Long id)
+    {
+        return quoteInfoMapper.selectQuoteInfoById(id);
+    }
+
+    /**
+     * 查询QuoteInfo列表
+     *
+     * @param quoteInfo QuoteInfo
+     * @return QuoteInfo
+     */
+    @Override
+    public List<QuoteInfo> selectQuoteInfoList(QuoteInfo quoteInfo)
+    {
+        return quoteInfoMapper.selectQuoteInfoList(quoteInfo);
+    }
+
+    /**
+     * 新增QuoteInfo
+     *
+     * @param quoteInfo QuoteInfo
+     * @return 结果
+     */
+    @Override
+    public int insertQuoteInfo(QuoteInfo quoteInfo)
+    {
+        quoteInfo.setCreateTime(DateUtils.getNowDate());
+        return quoteInfoMapper.insertQuoteInfo(quoteInfo);
+    }
+
+    /**
+     * 修改QuoteInfo
+     *
+     * @param quoteInfo QuoteInfo
+     * @return 结果
+     */
+    @Override
+    public int updateQuoteInfo(QuoteInfo quoteInfo)
+    {
+        quoteInfo.setUpdateTime(DateUtils.getNowDate());
+        return quoteInfoMapper.updateQuoteInfo(quoteInfo);
+    }
+
+    /**
+     * 批量删除QuoteInfo
+     *
+     * @param ids 需要删除的QuoteInfo主键
+     * @return 结果
+     */
+    @Override
+    public int deleteQuoteInfoByIds(Long[] ids)
+    {
+        return quoteInfoMapper.deleteQuoteInfoByIds(ids);
+    }
+
+    /**
+     * 删除QuoteInfo信息
+     *
+     * @param id QuoteInfo主键
+     * @return 结果
+     */
+    @Override
+    public int deleteQuoteInfoById(Long id)
+    {
+        return quoteInfoMapper.deleteQuoteInfoById(id);
+    }
+}

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

@@ -104,7 +104,7 @@
             <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 a.examine = #{examine}</if>
-            <if test="examine == 4"> and w.status = 3</if>
+            <if test="examine == 4"> and (w.status = 3 or w.status = 1)</if>
             <if test="examine != 4"> and(w.status = 2 or w.status = 1)</if>
             and r.gs_approve_state = 3
             and r.gs_state = 1

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

@@ -216,7 +216,7 @@
     <select id="selectBidTenderBySid" parameterType="Long" resultType="com.hh.bidding.domain.BidTender">
         select t.*,
                (select count(*) from bid_quote q where q.sid = #{sid} and q.status &gt;=1 ) as sign_number,
-               (select count(*) from bid_quote q where q.sid = #{sid} and q.status &gt;=2 ) as enroll_number
+               (select count(*) from bid_quote q where q.sid = #{sid} and q.status &gt;=3 ) as enroll_number
         from bid_tender t
         where sid = #{sid}
     </select>

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

@@ -0,0 +1,74 @@
+<?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.hh.bidding.mapper.QuoteInfoMapper">
+
+    <resultMap type="com.hh.bidding.domain.QuoteInfo" id="QuoteInfoResult">
+        <result property="id"    column="id"    />
+        <result property="sid"    column="sid"    />
+        <result property="hid"    column="hid"    />
+        <result property="detail"    column="detail"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectQuoteInfoVo">
+        select id, sid, hid, detail, create_time, update_time from quote_info
+    </sql>
+
+    <select id="selectQuoteInfoList" parameterType="com.hh.bidding.domain.QuoteInfo" resultMap="QuoteInfoResult">
+        <include refid="selectQuoteInfoVo"/>
+        <where>
+            <if test="sid != null "> and sid = #{sid}</if>
+            <if test="hid != null "> and hid = #{hid}</if>
+            <if test="detail != null  and detail != ''"> and detail = #{detail}</if>
+        </where>
+    </select>
+
+    <select id="selectQuoteInfoById" parameterType="Long" resultMap="QuoteInfoResult">
+        <include refid="selectQuoteInfoVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertQuoteInfo" parameterType="com.hh.bidding.domain.QuoteInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into quote_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="sid != null">sid,</if>
+            <if test="hid != null">hid,</if>
+            <if test="detail != null">detail,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="sid != null">#{sid},</if>
+            <if test="hid != null">#{hid},</if>
+            <if test="detail != null">#{detail},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateQuoteInfo" parameterType="com.hh.bidding.domain.QuoteInfo">
+        update quote_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="sid != null">sid = #{sid},</if>
+            <if test="hid != null">hid = #{hid},</if>
+            <if test="detail != null">detail = #{detail},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteQuoteInfoById" parameterType="Long">
+        delete from quote_info where id = #{id}
+    </delete>
+
+    <delete id="deleteQuoteInfoByIds" parameterType="String">
+        delete from quote_info where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/PpmProcurementDetailController.java

@@ -131,6 +131,7 @@ public class PpmProcurementDetailController extends BaseController
         return list;
     }
 
+    @Log(title = "导入采购明细", businessType = BusinessType.IMPORT)
     @PostMapping("/importDetail")
     public AjaxResult importDetail(MultipartFile file,Long materialId) throws Exception {
         ExcelUtil<PpmProcurementDetail> excelUtil = new ExcelUtil<>(PpmProcurementDetail.class);

ruoyi-modules/hh-procure/src/main/java/com/hh/procure/controller/PpmProcurementPlanController.java

@@ -369,6 +369,7 @@ public class PpmProcurementPlanController extends BaseController {
 
     // @RequiresPermissions("system:plan:edit")
     @PostMapping("/otherInformation")
+    @Log(title = "修改项目其他信息", businessType = BusinessType.UPDATE)
     @Transactional
     public AjaxResult ModifyPlanAndOtherInformation(@RequestBody PpmProcurementPlan ppmProcurementPlan) {
         List<PpmLineItems> list = ppmProcurementPlan.getItems();
@@ -398,6 +399,7 @@ public class PpmProcurementPlanController extends BaseController {
         return AjaxResult.success(ppmProcurementPlanService.updatePpmProcurementPlan(ppmProcurementPlan));
     }
 
+    @Log(title = "寻源", businessType = BusinessType.UPDATE)
     @PostMapping("/updateStateAndAddBidWinning")
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult updateStateAndAddBidWinning(@RequestBody List<PpmProcurementPlan> ppmProcurementPlan, Integer type, Integer noBidType) throws Exception {
@@ -547,6 +549,7 @@ public class PpmProcurementPlanController extends BaseController {
         return ppmProcurementPlanService.selectPpmProcurementPlanByAid(aid);
     }
 
+    @Log(title = "更新采购计划", businessType = BusinessType.UPDATE)
     @PutMapping("/recall")
     public AjaxResult recall(@RequestBody PpmProcurementPlan ppmProcurementPlan) {
         return toAjax(ppmProcurementPlanService.updatePpmProcurementPlan(ppmProcurementPlan));