1、贸易综合管理

@@ -168,4 +168,15 @@ public class TblTradeBidMaterialDetailsController extends JeecgController<TblTra
         return super.importExcel(request, response, TblTradeBidMaterialDetails.class);
     }
 
+
+	 /**
+	  *历史中标信息
+	  */
+	 @ApiOperation(value="历史中标信息", notes="历史中标信息")
+	 @GetMapping(value = "/getHistoryBidInfo")
+	 public Result<Map<String,Object>> getHistoryBidInfo(TblTradeBidMaterialDetails tblTradeBidMaterialDetails ) {
+		 String materialCode = tblTradeBidMaterialDetails.getMaterialCode();
+		 Map<String,Object> map = tblTradeBidMaterialDetailsService.getHistoryBidInfo(materialCode);
+		 return Result.OK(map);
+	 }
 }

@@ -496,4 +496,39 @@ public class TblTradeBidSubController {
 
 		 return Result.OK(data);
 	 }
+
+
+	 /**
+	  *  获取本次投标信息
+	  */
+	 @RequestMapping("getBidInfo")
+	 public Result<TblTradeBidSub> getBidInfo(TblTradeBidSub tenderInfo){
+		 TblTradeBidSub info = tblTradeBidSubService
+				 .getOne(Wrappers.lambdaQuery(TblTradeBidSub.class)
+						 .eq(TblTradeBidSub::getXjbswjh, tenderInfo.getXjbswjh())
+						 .eq(TblTradeBidSub::getWlbm, tenderInfo.getWlbm())
+				 );
+		 return Result.OK(info);
+	 }
+
+
+	 /**
+	  *  获取询价信息
+	  */
+	 @RequestMapping("getTenderInfo")
+	 public Result<List<TblTradeInquiryInfo>> getTenderInfo(TblTradeBidSub tenderInfo){
+		 TblTradeBidSub bidSub = tblTradeBidSubService
+				 .getOne(Wrappers.lambdaQuery(TblTradeBidSub.class)
+						 .eq(TblTradeBidSub::getXjbswjh, tenderInfo.getXjbswjh())
+						 .eq(TblTradeBidSub::getWlbm, tenderInfo.getWlbm())
+				 );
+
+		 List<TblTradeInquiryInfo> tblTradeInquiryInfoList = tblTradeInquiryInfoService.list(
+				 Wrappers.lambdaQuery(TblTradeInquiryInfo.class)
+						 .eq(TblTradeInquiryInfo::getTradeId, bidSub.getTradeId())
+		 );
+
+		 return Result.OK(tblTradeInquiryInfoList);
+	 }
+
 }

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.excel.ExcelReader;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
@@ -14,8 +15,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.erp.trade.entity.TblTradePriceInquiry;
+import org.jeecg.modules.erp.trade.entity.*;
 import org.jeecg.modules.erp.trade.mapper.TblTradePriceInquiryMapper;
+import org.jeecg.modules.erp.trade.service.ITblTradeBidMaterialDetailsService;
 import org.jeecg.modules.erp.trade.vo.TblTradeBidSubPage;
 import org.jeecgframework.poi.util.ExcelUtil;
 import org.springframework.beans.BeanUtils;
@@ -26,9 +28,6 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.web.servlet.ModelAndView;
 import java.util.Arrays;
 import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.erp.trade.entity.TblTradeInquiryInfo;
-import org.jeecg.modules.erp.trade.entity.TblTradeBidSub;
-import org.jeecg.modules.erp.trade.entity.TblTradeTenderInfo;
 import org.jeecg.modules.erp.trade.service.ITblTradeTenderInfoService;
 import org.jeecg.modules.erp.trade.service.ITblTradeInquiryInfoService;
 import org.jeecg.modules.erp.trade.service.ITblTradeBidSubService;
@@ -69,7 +68,8 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender
 
 	@Autowired
 	private ITblTradeBidSubService tblTradeBidSubService;
-
+	@Autowired
+	private ITblTradeBidMaterialDetailsService tblTradeBidMaterialDetailsService;
 
 	@Autowired
 	private TblTradePriceInquiryMapper tblTradePriceInquiryMapper;
@@ -95,6 +95,15 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender
 		QueryWrapper<TblTradeTenderInfo> queryWrapper = QueryGenerator.initQueryWrapper(tblTradeTenderInfo, req.getParameterMap());
 		Page<TblTradeTenderInfo> page = new Page<TblTradeTenderInfo>(pageNo, pageSize);
 		IPage<TblTradeTenderInfo> pageList = tblTradeTenderInfoService.page(page, queryWrapper);
+		List<TblTradeTenderInfo> records = pageList.getRecords();
+		for (TblTradeTenderInfo record : records) {
+			TblTradeBidSub info = tblTradeBidSubService
+					.getOne(Wrappers.lambdaQuery(TblTradeBidSub.class)
+							.eq(TblTradeBidSub::getXjbswjh, record.getXjbswjh())
+							.eq(TblTradeBidSub::getWlbm, record.getCode())
+					);
+			record.setXydj( StringUtils.isNotBlank(info.getXydj()) ? info.getXydj() : "0");
+		}
 		return Result.OK(pageList);
 	}
 
@@ -188,6 +197,14 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender
 
 				List<TblTradeTenderInfo> list = ExcelImportUtil.importExcel(file.getInputStream(), TblTradeTenderInfo.class, params);
 				for (TblTradeTenderInfo page : list) {
+					String xqsl = page.getXqsl();
+					if (StringUtils.isNotBlank(xqsl)) {
+						page.setXqsl(xqsl.split("\\.")[0]);
+					}
+					String xysl = page.getXysl();
+					if (StringUtils.isNotBlank(xysl)) {
+						page.setXysl(xysl.split("\\.")[0]);
+					}
 					page.setXjbswjh(xjbswjh);
 					page.setXmlx(xmlx);
 					page.setShdz(shdz);
@@ -196,6 +213,12 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender
 					page.setBdlx(bdlx);
 					// 状态默认询价中
 					page.setStatus("1");
+					//默认值带入
+					page.setXysm("无");
+					page.setJhqfjx("接受");
+					page.setFkfsfjx("接受");
+					page.setGgxhfjx("接受");
+					page.setPpfjx("接受");
 				}
 				tblTradeTenderInfoService.saveUploadData(list);
 				return Result.OK("文件导入成功！数据行数:" + list.size());
@@ -537,6 +560,18 @@ public class TblTradeTenderInfoController extends JeecgController<TblTradeTender
     /*--------------------------------子表处理-投标表-end----------------------------------------------*/
 
 
-
+	 /**
+	  *  获取本次中标信息
+	  */
+	 @RequestMapping("getBidMaterialDetailsInfo")
+	 public Result<TblTradeBidMaterialDetails> getBidMaterialDetailsInfo(TblTradeBidMaterialDetails tblTradeBidMaterialDetails){
+		 TblTradeBidMaterialDetails info = tblTradeBidMaterialDetailsService
+				 .getOne(Wrappers.lambdaQuery(TblTradeBidMaterialDetails.class)
+						 .eq(TblTradeBidMaterialDetails::getBidNum, tblTradeBidMaterialDetails.getBidNum())
+						 .eq(TblTradeBidMaterialDetails::getMaterialCode, tblTradeBidMaterialDetails.getMaterialCode())
+						 .eq(TblTradeBidMaterialDetails::getIsBid, tblTradeBidMaterialDetails.getIsBid())
+				 );
+		 return Result.OK(info);
+	 }
 
 }

@@ -81,4 +81,7 @@ public class TblTradeContractAwarded implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
+
+    @ApiModelProperty(value = "询价标书文件号")
+    private String xjbswjh;
 }

@@ -18,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface TblTradeBidMaterialDetailsMapper extends BaseMapper<TblTradeBidMaterialDetails> {
 
     IPage<Map<String, Object>> pageList(Page<TblTradeBidMaterialDetails> page,  @Param("param")TblTradeBidMaterialDetails tradeBidMaterialDetails);
+
+    Map<String, Object> getHistoryBidInfo(@Param("materialCode")String materialCode);
 }

@@ -23,4 +23,16 @@
         ORDER BY
             bid_num;
     </select>
+    <select id="getHistoryBidInfo" resultType="java.util.Map">
+        SELECT
+        bid_date AS lastBidDate,
+        winning_bid_price AS lastWinningBidPrice
+        FROM tbl_trade_bid_material_details
+        WHERE is_bid = 1
+        <if test="materialCode != '' and materialCode != null">
+            and   material_code  = #{materialCode}
+        </if>
+        ORDER BY bid_date DESC
+        LIMIT 1;
+    </select>
 </mapper>
\ No newline at end of file

@@ -16,4 +16,6 @@ import java.util.Map;
 public interface ITblTradeBidMaterialDetailsService extends IService<TblTradeBidMaterialDetails> {
 
     IPage<Map<String, Object>> pageList(Page<TblTradeBidMaterialDetails> page, TblTradeBidMaterialDetails queryWrapper);
+
+    Map<String, Object> getHistoryBidInfo(String materialCode);
 }

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.Collections;
 import java.util.Map;
 
 /**
@@ -27,4 +28,9 @@ public class TblTradeBidMaterialDetailsServiceImpl extends ServiceImpl<TblTradeB
     public IPage<Map<String, Object>> pageList(Page<TblTradeBidMaterialDetails> page, TblTradeBidMaterialDetails tradeBidMaterialDetails) {
         return tblTradeBidMaterialDetailsMapper.pageList(page,tradeBidMaterialDetails);
     }
+
+    @Override
+    public Map<String, Object> getHistoryBidInfo(String materialCode) {
+        return tblTradeBidMaterialDetailsMapper.getHistoryBidInfo(materialCode);
+    }
 }