雷海东 / factory-java · 提交

转到一个项目

作者 lixiang
提交 ad70208305f442498e1ecc295282b37b4fadbe75 1 个父辈 e3174c49

1、贸易综合管理

内嵌 并排对比
正在显示 8 个修改的文件 包含 112 行增加 和 6 行删除
@@ -168,4 +168,15 @@ public class TblTradeBidMaterialDetailsController extends JeecgController<TblTra @@ -168,4 +168,15 @@ public class TblTradeBidMaterialDetailsController extends JeecgController<TblTra
168 return super.importExcel(request, response, TblTradeBidMaterialDetails.class); 168 return super.importExcel(request, response, TblTradeBidMaterialDetails.class);
169 } 169 }
170 170
  171 +
  172 + /**
  173 + *历史中标信息
  174 + */
  175 + @ApiOperation(value="历史中标信息", notes="历史中标信息")
  176 + @GetMapping(value = "/getHistoryBidInfo")
  177 + public Result<Map<String,Object>> getHistoryBidInfo(TblTradeBidMaterialDetails tblTradeBidMaterialDetails ) {
  178 + String materialCode = tblTradeBidMaterialDetails.getMaterialCode();
  179 + Map<String,Object> map = tblTradeBidMaterialDetailsService.getHistoryBidInfo(materialCode);
  180 + return Result.OK(map);
  181 + }
171 } 182 }
@@ -496,4 +496,39 @@ public class TblTradeBidSubController { @@ -496,4 +496,39 @@ public class TblTradeBidSubController {
496 496
497 return Result.OK(data); 497 return Result.OK(data);
498 } 498 }
  499 +
  500 +
  501 + /**
  502 + * 获取本次投标信息
  503 + */
  504 + @RequestMapping("getBidInfo")
  505 + public Result<TblTradeBidSub> getBidInfo(TblTradeBidSub tenderInfo){
  506 + TblTradeBidSub info = tblTradeBidSubService
  507 + .getOne(Wrappers.lambdaQuery(TblTradeBidSub.class)
  508 + .eq(TblTradeBidSub::getXjbswjh, tenderInfo.getXjbswjh())
  509 + .eq(TblTradeBidSub::getWlbm, tenderInfo.getWlbm())
  510 + );
  511 + return Result.OK(info);
  512 + }
  513 +
  514 +
  515 + /**
  516 + * 获取询价信息
  517 + */
  518 + @RequestMapping("getTenderInfo")
  519 + public Result<List<TblTradeInquiryInfo>> getTenderInfo(TblTradeBidSub tenderInfo){
  520 + TblTradeBidSub bidSub = tblTradeBidSubService
  521 + .getOne(Wrappers.lambdaQuery(TblTradeBidSub.class)
  522 + .eq(TblTradeBidSub::getXjbswjh, tenderInfo.getXjbswjh())
  523 + .eq(TblTradeBidSub::getWlbm, tenderInfo.getWlbm())
  524 + );
  525 +
  526 + List<TblTradeInquiryInfo> tblTradeInquiryInfoList = tblTradeInquiryInfoService.list(
  527 + Wrappers.lambdaQuery(TblTradeInquiryInfo.class)
  528 + .eq(TblTradeInquiryInfo::getTradeId, bidSub.getTradeId())
  529 + );
  530 +
  531 + return Result.OK(tblTradeInquiryInfoList);
  532 + }
  533 +
499 } 534 }
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
4 import com.alibaba.excel.ExcelReader; 4 import com.alibaba.excel.ExcelReader;
5 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 5 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
6 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 6 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  7 +import org.apache.commons.lang3.StringUtils;
7 import org.apache.poi.ss.usermodel.Sheet; 8 import org.apache.poi.ss.usermodel.Sheet;
8 import org.apache.poi.ss.usermodel.Workbook; 9 import org.apache.poi.ss.usermodel.Workbook;
9 import org.apache.poi.ss.usermodel.WorkbookFactory; 10 import org.apache.poi.ss.usermodel.WorkbookFactory;
@@ -14,8 +15,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -14,8 +15,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
14 import lombok.extern.slf4j.Slf4j; 15 import lombok.extern.slf4j.Slf4j;
15 import org.jeecg.common.system.base.controller.JeecgController; 16 import org.jeecg.common.system.base.controller.JeecgController;
16 import org.jeecg.common.api.vo.Result; 17 import org.jeecg.common.api.vo.Result;
17 -import org.jeecg.modules.erp.trade.entity.TblTradePriceInquiry; 18 +import org.jeecg.modules.erp.trade.entity.*;
18 import org.jeecg.modules.erp.trade.mapper.TblTradePriceInquiryMapper; 19 import org.jeecg.modules.erp.trade.mapper.TblTradePriceInquiryMapper;
  20 +import org.jeecg.modules.erp.trade.service.ITblTradeBidMaterialDetailsService;
19 import org.jeecg.modules.erp.trade.vo.TblTradeBidSubPage; 21 import org.jeecg.modules.erp.trade.vo.TblTradeBidSubPage;
20 import org.jeecgframework.poi.util.ExcelUtil; 22 import org.jeecgframework.poi.util.ExcelUtil;
21 import org.springframework.beans.BeanUtils; 23 import org.springframework.beans.BeanUtils;
@@ -26,9 +28,6 @@ import javax.servlet.http.HttpServletResponse; @@ -26,9 +28,6 @@ import javax.servlet.http.HttpServletResponse;
26 import org.springframework.web.servlet.ModelAndView; 28 import org.springframework.web.servlet.ModelAndView;
27 import java.util.Arrays; 29 import java.util.Arrays;
28 import org.jeecg.common.util.oConvertUtils; 30 import org.jeecg.common.util.oConvertUtils;
29 -import org.jeecg.modules.erp.trade.entity.TblTradeInquiryInfo;  
30 -import org.jeecg.modules.erp.trade.entity.TblTradeBidSub;  
31 -import org.jeecg.modules.erp.trade.entity.TblTradeTenderInfo;  
32 import org.jeecg.modules.erp.trade.service.ITblTradeTenderInfoService; 31 import org.jeecg.modules.erp.trade.service.ITblTradeTenderInfoService;
33 import org.jeecg.modules.erp.trade.service.ITblTradeInquiryInfoService; 32 import org.jeecg.modules.erp.trade.service.ITblTradeInquiryInfoService;
34 import org.jeecg.modules.erp.trade.service.ITblTradeBidSubService; 33 import org.jeecg.modules.erp.trade.service.ITblTradeBidSubService;
@@ -69,7 +68,8 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender @@ -69,7 +68,8 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender
69 68
70 @Autowired 69 @Autowired
71 private ITblTradeBidSubService tblTradeBidSubService; 70 private ITblTradeBidSubService tblTradeBidSubService;
72 - 71 + @Autowired
  72 + private ITblTradeBidMaterialDetailsService tblTradeBidMaterialDetailsService;
73 73
74 @Autowired 74 @Autowired
75 private TblTradePriceInquiryMapper tblTradePriceInquiryMapper; 75 private TblTradePriceInquiryMapper tblTradePriceInquiryMapper;
@@ -95,6 +95,15 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender @@ -95,6 +95,15 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender
95 QueryWrapper<TblTradeTenderInfo> queryWrapper = QueryGenerator.initQueryWrapper(tblTradeTenderInfo, req.getParameterMap()); 95 QueryWrapper<TblTradeTenderInfo> queryWrapper = QueryGenerator.initQueryWrapper(tblTradeTenderInfo, req.getParameterMap());
96 Page<TblTradeTenderInfo> page = new Page<TblTradeTenderInfo>(pageNo, pageSize); 96 Page<TblTradeTenderInfo> page = new Page<TblTradeTenderInfo>(pageNo, pageSize);
97 IPage<TblTradeTenderInfo> pageList = tblTradeTenderInfoService.page(page, queryWrapper); 97 IPage<TblTradeTenderInfo> pageList = tblTradeTenderInfoService.page(page, queryWrapper);
  98 + List<TblTradeTenderInfo> records = pageList.getRecords();
  99 + for (TblTradeTenderInfo record : records) {
  100 + TblTradeBidSub info = tblTradeBidSubService
  101 + .getOne(Wrappers.lambdaQuery(TblTradeBidSub.class)
  102 + .eq(TblTradeBidSub::getXjbswjh, record.getXjbswjh())
  103 + .eq(TblTradeBidSub::getWlbm, record.getCode())
  104 + );
  105 + record.setXydj( StringUtils.isNotBlank(info.getXydj()) ? info.getXydj() : "0");
  106 + }
98 return Result.OK(pageList); 107 return Result.OK(pageList);
99 } 108 }
100 109
@@ -188,6 +197,14 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender @@ -188,6 +197,14 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender
188 197
189 List<TblTradeTenderInfo> list = ExcelImportUtil.importExcel(file.getInputStream(), TblTradeTenderInfo.class, params); 198 List<TblTradeTenderInfo> list = ExcelImportUtil.importExcel(file.getInputStream(), TblTradeTenderInfo.class, params);
190 for (TblTradeTenderInfo page : list) { 199 for (TblTradeTenderInfo page : list) {
  200 + String xqsl = page.getXqsl();
  201 + if (StringUtils.isNotBlank(xqsl)) {
  202 + page.setXqsl(xqsl.split("\\.")[0]);
  203 + }
  204 + String xysl = page.getXysl();
  205 + if (StringUtils.isNotBlank(xysl)) {
  206 + page.setXysl(xysl.split("\\.")[0]);
  207 + }
191 page.setXjbswjh(xjbswjh); 208 page.setXjbswjh(xjbswjh);
192 page.setXmlx(xmlx); 209 page.setXmlx(xmlx);
193 page.setShdz(shdz); 210 page.setShdz(shdz);
@@ -196,6 +213,12 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender @@ -196,6 +213,12 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender
196 page.setBdlx(bdlx); 213 page.setBdlx(bdlx);
197 // 状态默认询价中 214 // 状态默认询价中
198 page.setStatus("1"); 215 page.setStatus("1");
  216 + //默认值带入
  217 + page.setXysm("无");
  218 + page.setJhqfjx("接受");
  219 + page.setFkfsfjx("接受");
  220 + page.setGgxhfjx("接受");
  221 + page.setPpfjx("接受");
199 } 222 }
200 tblTradeTenderInfoService.saveUploadData(list); 223 tblTradeTenderInfoService.saveUploadData(list);
201 return Result.OK("文件导入成功！数据行数:" + list.size()); 224 return Result.OK("文件导入成功！数据行数:" + list.size());
@@ -537,6 +560,18 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender @@ -537,6 +560,18 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender
537 /*--------------------------------子表处理-投标表-end----------------------------------------------*/ 560 /*--------------------------------子表处理-投标表-end----------------------------------------------*/
538 561
539 562
540 - 563 + /**
  564 + * 获取本次中标信息
  565 + */
  566 + @RequestMapping("getBidMaterialDetailsInfo")
  567 + public Result<TblTradeBidMaterialDetails> getBidMaterialDetailsInfo(TblTradeBidMaterialDetails tblTradeBidMaterialDetails){
  568 + TblTradeBidMaterialDetails info = tblTradeBidMaterialDetailsService
  569 + .getOne(Wrappers.lambdaQuery(TblTradeBidMaterialDetails.class)
  570 + .eq(TblTradeBidMaterialDetails::getBidNum, tblTradeBidMaterialDetails.getBidNum())
  571 + .eq(TblTradeBidMaterialDetails::getMaterialCode, tblTradeBidMaterialDetails.getMaterialCode())
  572 + .eq(TblTradeBidMaterialDetails::getIsBid, tblTradeBidMaterialDetails.getIsBid())
  573 + );
  574 + return Result.OK(info);
  575 + }
541 576
542 } 577 }
@@ -81,4 +81,7 @@ public class TblTradeContractAwarded implements Serializable { @@ -81,4 +81,7 @@ public class TblTradeContractAwarded implements Serializable {
81 @DateTimeFormat(pattern="yyyy-MM-dd") 81 @DateTimeFormat(pattern="yyyy-MM-dd")
82 @ApiModelProperty(value = "更新时间") 82 @ApiModelProperty(value = "更新时间")
83 private Date updateTime; 83 private Date updateTime;
  84 +
  85 + @ApiModelProperty(value = "询价标书文件号")
  86 + private String xjbswjh;
84 } 87 }
@@ -18,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -18,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
18 public interface TblTradeBidMaterialDetailsMapper extends BaseMapper<TblTradeBidMaterialDetails> { 18 public interface TblTradeBidMaterialDetailsMapper extends BaseMapper<TblTradeBidMaterialDetails> {
19 19
20 IPage<Map<String, Object>> pageList(Page<TblTradeBidMaterialDetails> page, @Param("param")TblTradeBidMaterialDetails tradeBidMaterialDetails); 20 IPage<Map<String, Object>> pageList(Page<TblTradeBidMaterialDetails> page, @Param("param")TblTradeBidMaterialDetails tradeBidMaterialDetails);
  21 +
  22 + Map<String, Object> getHistoryBidInfo(@Param("materialCode")String materialCode);
21 } 23 }
@@ -23,4 +23,16 @@ @@ -23,4 +23,16 @@
23 ORDER BY 23 ORDER BY
24 bid_num; 24 bid_num;
25 </select> 25 </select>
  26 + <select id="getHistoryBidInfo" resultType="java.util.Map">
  27 + SELECT
  28 + bid_date AS lastBidDate,
  29 + winning_bid_price AS lastWinningBidPrice
  30 + FROM tbl_trade_bid_material_details
  31 + WHERE is_bid = 1
  32 + <if test="materialCode != '' and materialCode != null">
  33 + and material_code = #{materialCode}
  34 + </if>
  35 + ORDER BY bid_date DESC
  36 + LIMIT 1;
  37 + </select>
26 </mapper> 38 </mapper>
@@ -16,4 +16,6 @@ import java.util.Map; @@ -16,4 +16,6 @@ import java.util.Map;
16 public interface ITblTradeBidMaterialDetailsService extends IService<TblTradeBidMaterialDetails> { 16 public interface ITblTradeBidMaterialDetailsService extends IService<TblTradeBidMaterialDetails> {
17 17
18 IPage<Map<String, Object>> pageList(Page<TblTradeBidMaterialDetails> page, TblTradeBidMaterialDetails queryWrapper); 18 IPage<Map<String, Object>> pageList(Page<TblTradeBidMaterialDetails> page, TblTradeBidMaterialDetails queryWrapper);
  19 +
  20 + Map<String, Object> getHistoryBidInfo(String materialCode);
19 } 21 }
@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
10 10
11 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 11 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
12 12
  13 +import java.util.Collections;
13 import java.util.Map; 14 import java.util.Map;
14 15
15 /** 16 /**
@@ -27,4 +28,9 @@ public class TblTradeBidMaterialDetailsServiceImpl extends ServiceImpl<TblTradeB @@ -27,4 +28,9 @@ public class TblTradeBidMaterialDetailsServiceImpl extends ServiceImpl<TblTradeB
27 public IPage<Map<String, Object>> pageList(Page<TblTradeBidMaterialDetails> page, TblTradeBidMaterialDetails tradeBidMaterialDetails) { 28 public IPage<Map<String, Object>> pageList(Page<TblTradeBidMaterialDetails> page, TblTradeBidMaterialDetails tradeBidMaterialDetails) {
28 return tblTradeBidMaterialDetailsMapper.pageList(page,tradeBidMaterialDetails); 29 return tblTradeBidMaterialDetailsMapper.pageList(page,tradeBidMaterialDetails);
29 } 30 }
  31 +
  32 + @Override
  33 + public Map<String, Object> getHistoryBidInfo(String materialCode) {
  34 + return tblTradeBidMaterialDetailsMapper.getHistoryBidInfo(materialCode);
  35 + }
30 } 36 }