正在显示
11 个修改的文件
包含
48 行增加
和
235 行删除
| @@ -514,7 +514,6 @@ public class JeecgController<T, S extends IService<T>> { | @@ -514,7 +514,6 @@ public class JeecgController<T, S extends IService<T>> { | ||
| 514 | queryWrapper.eq("ht_price",htPrice); | 514 | queryWrapper.eq("ht_price",htPrice); |
| 515 | service.update(data,queryWrapper); | 515 | service.update(data,queryWrapper); |
| 516 | 516 | ||
| 517 | -// System.out.println(service.update(existingData,queryWrapper)); | ||
| 518 | } catch (Exception e) { | 517 | } catch (Exception e) { |
| 519 | e.printStackTrace(); | 518 | e.printStackTrace(); |
| 520 | } | 519 | } |
| @@ -412,8 +412,6 @@ public class JeecgController2<T, t, b,w, V extends IService<t>, S extends IServi | @@ -412,8 +412,6 @@ public class JeecgController2<T, t, b,w, V extends IService<t>, S extends IServi | ||
| 412 | if(shuju.size()<=0){ | 412 | if(shuju.size()<=0){ |
| 413 | return Result.error("文件数据为空"); | 413 | return Result.error("文件数据为空"); |
| 414 | } | 414 | } |
| 415 | - System.out.println("导入的数据:"+shuju); | ||
| 416 | - System.out.println("数据库数据:"+service.list()); | ||
| 417 | 415 | ||
| 418 | service.saveBatch(shuju); | 416 | service.saveBatch(shuju); |
| 419 | log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒"); | 417 | log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒"); |
| @@ -64,40 +64,16 @@ public class TblSalaryBaseController extends JeecgController<TblSalaryBase, Tbl | @@ -64,40 +64,16 @@ public class TblSalaryBaseController extends JeecgController<TblSalaryBase, Tbl | ||
| 64 | @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, | 64 | @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, |
| 65 | HttpServletRequest req){ | 65 | HttpServletRequest req){ |
| 66 | 66 | ||
| 67 | + if(tblSalaryBase.getUserName()!=null && !tblSalaryBase.getUserName().isEmpty()){ | ||
| 67 | // 去除 tblSalaryBase 对象中的字符串字段的空格 | 68 | // 去除 tblSalaryBase 对象中的字符串字段的空格 |
| 68 | - trimStringFields(tblSalaryBase); | 69 | + String name = tblSalaryBase.getUserName().replaceAll("\\s", ""); |
| 70 | + tblSalaryBase.setUserName(name); | ||
| 71 | + } | ||
| 69 | QueryWrapper<TblSalaryBase> queryWrapper = QueryGenerator.initQueryWrapper(tblSalaryBase, req.getParameterMap()); | 72 | QueryWrapper<TblSalaryBase> queryWrapper = QueryGenerator.initQueryWrapper(tblSalaryBase, req.getParameterMap()); |
| 70 | Page<TblSalaryBase> page = new Page<>(pageNo, pageSize); | 73 | Page<TblSalaryBase> page = new Page<>(pageNo, pageSize); |
| 71 | IPage<TblSalaryBase> pageList = tblSalaryBaseService.page(page,queryWrapper); | 74 | IPage<TblSalaryBase> pageList = tblSalaryBaseService.page(page,queryWrapper); |
| 72 | return Result.OK(pageList); | 75 | return Result.OK(pageList); |
| 73 | } | 76 | } |
| 74 | - private void trimStringFields(Object obj) { | ||
| 75 | - if (obj == null) { | ||
| 76 | - return; | ||
| 77 | - } | ||
| 78 | - | ||
| 79 | - // 获取所有声明的字段,包括私有字段 | ||
| 80 | - Field[] fields = obj.getClass().getDeclaredFields(); | ||
| 81 | - for (Field field : fields) { | ||
| 82 | - if (field.getType() == String.class) { | ||
| 83 | - try { | ||
| 84 | - // 设置私有字段可访问 | ||
| 85 | - field.setAccessible(true); | ||
| 86 | - // 获取字段值 | ||
| 87 | - String value = (String) field.get(obj); | ||
| 88 | - if (value != null) { | ||
| 89 | - // 去除空格并重新设置字段值 | ||
| 90 | - String trimmedValue = value.replaceAll("\\s", ""); | ||
| 91 | - field.set(obj, trimmedValue); | ||
| 92 | - System.out.println("Trimmed field: " + field.getName() + ", Original: [" + value + "], Trimmed: [" + trimmedValue + "]"); | ||
| 93 | - } | ||
| 94 | - } catch (IllegalAccessException e) { | ||
| 95 | - // 处理异常 | ||
| 96 | - e.printStackTrace(); | ||
| 97 | - } | ||
| 98 | - } | ||
| 99 | - } | ||
| 100 | - } | ||
| 101 | 77 | ||
| 102 | //人员下拉 | 78 | //人员下拉 |
| 103 | @GetMapping(value = "/listSalary") | 79 | @GetMapping(value = "/listSalary") |
| @@ -237,6 +237,7 @@ public class TblSalaryCalculationController extends JeecgController2<TblSalaryCa | @@ -237,6 +237,7 @@ public class TblSalaryCalculationController extends JeecgController2<TblSalaryCa | ||
| 237 | Boolean zhi= tblSalaryCalculationService.updateByBase(salaryMonth); | 237 | Boolean zhi= tblSalaryCalculationService.updateByBase(salaryMonth); |
| 238 | if(zhi){ | 238 | if(zhi){ |
| 239 | tblSalaryCalculationService.upjisuan(tblSalaryCalculationService.select(salaryMonth)); | 239 | tblSalaryCalculationService.upjisuan(tblSalaryCalculationService.select(salaryMonth)); |
| 240 | + tblSalaryCalculationService.selectAndUpd(); | ||
| 240 | return Result.OK("成功!"); | 241 | return Result.OK("成功!"); |
| 241 | } | 242 | } |
| 242 | // tblSalaryCalculationService.qi(); | 243 | // tblSalaryCalculationService.qi(); |
| 1 | package org.jeecg.modules.erp.trad.controller; | 1 | package org.jeecg.modules.erp.trad.controller; |
| 2 | 2 | ||
| 3 | import java.util.Arrays; | 3 | import java.util.Arrays; |
| 4 | -import java.util.List; | ||
| 5 | import javax.servlet.http.HttpServletRequest; | 4 | import javax.servlet.http.HttpServletRequest; |
| 6 | -import javax.servlet.http.HttpServletResponse; | 5 | + |
| 7 | import org.jeecg.common.api.vo.Result; | 6 | import org.jeecg.common.api.vo.Result; |
| 8 | import org.jeecg.common.system.query.QueryGenerator; | 7 | import org.jeecg.common.system.query.QueryGenerator; |
| 9 | -import org.jeecg.modules.erp.trad.entity.TblTradZong; | ||
| 10 | -import org.jeecg.modules.erp.trad.service.TblTradZongService; | 8 | +import org.jeecg.modules.erp.trad.entity.ViewTradZong; |
| 9 | +import org.jeecg.modules.erp.trad.service.ViewTradZongService; | ||
| 11 | 10 | ||
| 12 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | 11 | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
| 13 | import com.baomidou.mybatisplus.core.metadata.IPage; | 12 | import com.baomidou.mybatisplus.core.metadata.IPage; |
| @@ -33,14 +32,14 @@ import org.jeecg.common.aspect.annotation.AutoLog; | @@ -33,14 +32,14 @@ import org.jeecg.common.aspect.annotation.AutoLog; | ||
| 33 | @RestController | 32 | @RestController |
| 34 | @RequestMapping("/trad/tblTradZong") | 33 | @RequestMapping("/trad/tblTradZong") |
| 35 | @Slf4j | 34 | @Slf4j |
| 36 | -public class TblTradZongController extends JeecgController<TblTradZong, TblTradZongService> { | 35 | +public class ViewTradZongController extends JeecgController<ViewTradZong, ViewTradZongService> { |
| 37 | @Autowired | 36 | @Autowired |
| 38 | - private TblTradZongService tblTradZongService; | 37 | + private ViewTradZongService viewTradZongService; |
| 39 | 38 | ||
| 40 | /** | 39 | /** |
| 41 | * 分页列表查询 | 40 | * 分页列表查询 |
| 42 | * | 41 | * |
| 43 | - * @param tblTradZong | 42 | + * @param viewTradZong |
| 44 | * @param pageNo | 43 | * @param pageNo |
| 45 | * @param pageSize | 44 | * @param pageSize |
| 46 | * @param req | 45 | * @param req |
| @@ -50,47 +49,41 @@ public class TblTradZongController extends JeecgController<TblTradZong, TblTradZ | @@ -50,47 +49,41 @@ public class TblTradZongController extends JeecgController<TblTradZong, TblTradZ | ||
| 50 | @ApiOperation(value="tbl_trad_zong-分页列表查询", notes="tbl_trad_zong-分页列表查询") | 49 | @ApiOperation(value="tbl_trad_zong-分页列表查询", notes="tbl_trad_zong-分页列表查询") |
| 51 | @GetMapping(value = "/list") | 50 | @GetMapping(value = "/list") |
| 52 | @Transactional(rollbackFor = Exception.class) | 51 | @Transactional(rollbackFor = Exception.class) |
| 53 | - public Result<IPage<TblTradZong>> queryPageList(TblTradZong tblTradZong, | 52 | + public Result<IPage<ViewTradZong>> queryPageList(ViewTradZong viewTradZong, |
| 54 | @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, | 53 | @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, |
| 55 | @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, | 54 | @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, |
| 56 | HttpServletRequest req) { | 55 | HttpServletRequest req) { |
| 57 | - Boolean zhi=tblTradZongService.del(); | ||
| 58 | - System.out.println(zhi); | ||
| 59 | - | ||
| 60 | - tblTradZongService.getlist(); | ||
| 61 | - | ||
| 62 | - | ||
| 63 | - QueryWrapper<TblTradZong> queryWrapper = QueryGenerator.initQueryWrapper(tblTradZong, req.getParameterMap()); | ||
| 64 | - Page<TblTradZong> page = new Page<TblTradZong>(pageNo, pageSize); | ||
| 65 | - IPage<TblTradZong> pageList = tblTradZongService.page(page, queryWrapper); | 56 | + QueryWrapper<ViewTradZong> queryWrapper = QueryGenerator.initQueryWrapper(viewTradZong, req.getParameterMap()); |
| 57 | + Page<ViewTradZong> page = new Page<ViewTradZong>(pageNo, pageSize); | ||
| 58 | + IPage<ViewTradZong> pageList = viewTradZongService.page(page, queryWrapper); | ||
| 66 | return Result.OK(pageList); | 59 | return Result.OK(pageList); |
| 67 | } | 60 | } |
| 68 | 61 | ||
| 69 | /** | 62 | /** |
| 70 | * 添加 | 63 | * 添加 |
| 71 | * | 64 | * |
| 72 | - * @param tblTradZong | 65 | + * @param viewTradZong |
| 73 | * @return | 66 | * @return |
| 74 | */ | 67 | */ |
| 75 | @AutoLog(value = "tbl_trad_zong-添加") | 68 | @AutoLog(value = "tbl_trad_zong-添加") |
| 76 | @ApiOperation(value="tbl_trad_zong-添加", notes="tbl_trad_zong-添加") | 69 | @ApiOperation(value="tbl_trad_zong-添加", notes="tbl_trad_zong-添加") |
| 77 | @PostMapping(value = "/add") | 70 | @PostMapping(value = "/add") |
| 78 | - public Result<String> add(@RequestBody TblTradZong tblTradZong) { | ||
| 79 | - tblTradZongService.save(tblTradZong); | 71 | + public Result<String> add(@RequestBody ViewTradZong viewTradZong) { |
| 72 | + viewTradZongService.save(viewTradZong); | ||
| 80 | return Result.OK("添加成功!"); | 73 | return Result.OK("添加成功!"); |
| 81 | } | 74 | } |
| 82 | 75 | ||
| 83 | /** | 76 | /** |
| 84 | * 编辑 | 77 | * 编辑 |
| 85 | * | 78 | * |
| 86 | - * @param tblTradZong | 79 | + * @param viewTradZong |
| 87 | * @return | 80 | * @return |
| 88 | */ | 81 | */ |
| 89 | @AutoLog(value = "tbl_trad_zong-编辑") | 82 | @AutoLog(value = "tbl_trad_zong-编辑") |
| 90 | @ApiOperation(value="tbl_trad_zong-编辑", notes="tbl_trad_zong-编辑") | 83 | @ApiOperation(value="tbl_trad_zong-编辑", notes="tbl_trad_zong-编辑") |
| 91 | @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) | 84 | @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) |
| 92 | - public Result<String> edit(@RequestBody TblTradZong tblTradZong) { | ||
| 93 | - tblTradZongService.updateById(tblTradZong); | 85 | + public Result<String> edit(@RequestBody ViewTradZong viewTradZong) { |
| 86 | + viewTradZongService.updateById(viewTradZong); | ||
| 94 | return Result.OK("编辑成功!"); | 87 | return Result.OK("编辑成功!"); |
| 95 | } | 88 | } |
| 96 | 89 | ||
| @@ -104,7 +97,7 @@ public class TblTradZongController extends JeecgController<TblTradZong, TblTradZ | @@ -104,7 +97,7 @@ public class TblTradZongController extends JeecgController<TblTradZong, TblTradZ | ||
| 104 | @ApiOperation(value="tbl_trad_zong-通过id删除", notes="tbl_trad_zong-通过id删除") | 97 | @ApiOperation(value="tbl_trad_zong-通过id删除", notes="tbl_trad_zong-通过id删除") |
| 105 | @DeleteMapping(value = "/delete") | 98 | @DeleteMapping(value = "/delete") |
| 106 | public Result<String> delete(@RequestParam(name="id",required=true) String id) { | 99 | public Result<String> delete(@RequestParam(name="id",required=true) String id) { |
| 107 | - tblTradZongService.removeById(id); | 100 | + viewTradZongService.removeById(id); |
| 108 | return Result.OK("删除成功!"); | 101 | return Result.OK("删除成功!"); |
| 109 | } | 102 | } |
| 110 | 103 | ||
| @@ -118,7 +111,7 @@ public class TblTradZongController extends JeecgController<TblTradZong, TblTradZ | @@ -118,7 +111,7 @@ public class TblTradZongController extends JeecgController<TblTradZong, TblTradZ | ||
| 118 | @ApiOperation(value="tbl_trad_zong-批量删除", notes="tbl_trad_zong-批量删除") | 111 | @ApiOperation(value="tbl_trad_zong-批量删除", notes="tbl_trad_zong-批量删除") |
| 119 | @DeleteMapping(value = "/deleteBatch") | 112 | @DeleteMapping(value = "/deleteBatch") |
| 120 | public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { | 113 | public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { |
| 121 | - this.tblTradZongService.removeByIds(Arrays.asList(ids.split(","))); | 114 | + this.viewTradZongService.removeByIds(Arrays.asList(ids.split(","))); |
| 122 | return Result.OK("批量删除成功!"); | 115 | return Result.OK("批量删除成功!"); |
| 123 | } | 116 | } |
| 124 | 117 | ||
| @@ -131,23 +124,23 @@ public class TblTradZongController extends JeecgController<TblTradZong, TblTradZ | @@ -131,23 +124,23 @@ public class TblTradZongController extends JeecgController<TblTradZong, TblTradZ | ||
| 131 | //@AutoLog(value = "tbl_trad_zong-通过id查询") | 124 | //@AutoLog(value = "tbl_trad_zong-通过id查询") |
| 132 | @ApiOperation(value="tbl_trad_zong-通过id查询", notes="tbl_trad_zong-通过id查询") | 125 | @ApiOperation(value="tbl_trad_zong-通过id查询", notes="tbl_trad_zong-通过id查询") |
| 133 | @GetMapping(value = "/queryById") | 126 | @GetMapping(value = "/queryById") |
| 134 | - public Result<TblTradZong> queryById(@RequestParam(name="id",required=true) String id) { | ||
| 135 | - TblTradZong tblTradZong = tblTradZongService.getById(id); | ||
| 136 | - if(tblTradZong==null) { | 127 | + public Result<ViewTradZong> queryById(@RequestParam(name="id",required=true) String id) { |
| 128 | + ViewTradZong viewTradZong = viewTradZongService.getById(id); | ||
| 129 | + if(viewTradZong ==null) { | ||
| 137 | return Result.error("未找到对应数据"); | 130 | return Result.error("未找到对应数据"); |
| 138 | } | 131 | } |
| 139 | - return Result.OK(tblTradZong); | 132 | + return Result.OK(viewTradZong); |
| 140 | } | 133 | } |
| 141 | 134 | ||
| 142 | /** | 135 | /** |
| 143 | * 导出excel | 136 | * 导出excel |
| 144 | * | 137 | * |
| 145 | * @param request | 138 | * @param request |
| 146 | - * @param tblTradZong | 139 | + * @param viewTradZong |
| 147 | */ | 140 | */ |
| 148 | @RequestMapping(value = "/exportXls") | 141 | @RequestMapping(value = "/exportXls") |
| 149 | - public ModelAndView exportXls(HttpServletRequest request, TblTradZong tblTradZong) { | ||
| 150 | - return super.exportXls(request, tblTradZong, TblTradZong.class, "tbl_trad_zong"); | 142 | + public ModelAndView exportXls(HttpServletRequest request, ViewTradZong viewTradZong) { |
| 143 | + return super.exportXls(request, viewTradZong, ViewTradZong.class, "tbl_trad_zong"); | ||
| 151 | } | 144 | } |
| 152 | 145 | ||
| 153 | } | 146 | } |
| 1 | package org.jeecg.modules.erp.trad.entity; | 1 | package org.jeecg.modules.erp.trad.entity; |
| 2 | 2 | ||
| 3 | import java.io.Serializable; | 3 | import java.io.Serializable; |
| 4 | -import java.io.UnsupportedEncodingException; | ||
| 5 | import java.util.Date; | 4 | import java.util.Date; |
| 6 | -import java.math.BigDecimal; | 5 | + |
| 7 | import com.baomidou.mybatisplus.annotation.IdType; | 6 | import com.baomidou.mybatisplus.annotation.IdType; |
| 8 | import com.baomidou.mybatisplus.annotation.TableId; | 7 | import com.baomidou.mybatisplus.annotation.TableId; |
| 9 | import com.baomidou.mybatisplus.annotation.TableName; | 8 | import com.baomidou.mybatisplus.annotation.TableName; |
| @@ -11,7 +10,6 @@ import lombok.Data; | @@ -11,7 +10,6 @@ import lombok.Data; | ||
| 11 | import com.fasterxml.jackson.annotation.JsonFormat; | 10 | import com.fasterxml.jackson.annotation.JsonFormat; |
| 12 | import org.springframework.format.annotation.DateTimeFormat; | 11 | import org.springframework.format.annotation.DateTimeFormat; |
| 13 | import org.jeecgframework.poi.excel.annotation.Excel; | 12 | import org.jeecgframework.poi.excel.annotation.Excel; |
| 14 | -import org.jeecg.common.aspect.annotation.Dict; | ||
| 15 | import io.swagger.annotations.ApiModel; | 13 | import io.swagger.annotations.ApiModel; |
| 16 | import io.swagger.annotations.ApiModelProperty; | 14 | import io.swagger.annotations.ApiModelProperty; |
| 17 | import lombok.EqualsAndHashCode; | 15 | import lombok.EqualsAndHashCode; |
| @@ -24,11 +22,11 @@ import lombok.experimental.Accessors; | @@ -24,11 +22,11 @@ import lombok.experimental.Accessors; | ||
| 24 | * @Version: V1.0 | 22 | * @Version: V1.0 |
| 25 | */ | 23 | */ |
| 26 | @Data | 24 | @Data |
| 27 | -@TableName("tbl_trad_zong") | 25 | +@TableName("view_trad_zong") |
| 28 | @Accessors(chain = true) | 26 | @Accessors(chain = true) |
| 29 | @EqualsAndHashCode(callSuper = false) | 27 | @EqualsAndHashCode(callSuper = false) |
| 30 | -@ApiModel(value="tbl_trad_zong对象", description="tbl_trad_zong") | ||
| 31 | -public class TblTradZong implements Serializable { | 28 | +@ApiModel(value="view_trad_zong对象", description="view_trad_zong") |
| 29 | +public class ViewTradZong implements Serializable { | ||
| 32 | private static final long serialVersionUID = 1L; | 30 | private static final long serialVersionUID = 1L; |
| 33 | 31 | ||
| 34 | /**id*/ | 32 | /**id*/ |
| 1 | package org.jeecg.modules.erp.trad.mapper; | 1 | package org.jeecg.modules.erp.trad.mapper; |
| 2 | 2 | ||
| 3 | import com.baomidou.mybatisplus.core.mapper.BaseMapper; | 3 | import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
| 4 | -import org.jeecg.modules.erp.trad.entity.TblTradZong; | 4 | +import org.jeecg.modules.erp.trad.entity.ViewTradZong; |
| 5 | 5 | ||
| 6 | /** | 6 | /** |
| 7 | * @Description: tbl_trad_zong | 7 | * @Description: tbl_trad_zong |
| @@ -9,9 +9,6 @@ import org.jeecg.modules.erp.trad.entity.TblTradZong; | @@ -9,9 +9,6 @@ import org.jeecg.modules.erp.trad.entity.TblTradZong; | ||
| 9 | * @Date: 2024-04-15 | 9 | * @Date: 2024-04-15 |
| 10 | * @Version: V1.0 | 10 | * @Version: V1.0 |
| 11 | */ | 11 | */ |
| 12 | -public interface TblTradZongMapper extends BaseMapper<TblTradZong> { | 12 | +public interface ViewTradZongMapper extends BaseMapper<ViewTradZong> { |
| 13 | 13 | ||
| 14 | - void getlist(); | ||
| 15 | - | ||
| 16 | - Boolean del(); | ||
| 17 | } | 14 | } |
jeecg-boot-erp/src/main/java/org/jeecg/modules/erp/trad/mapper/xml/TblTradZongMapper.xml
已删除
100644 → 0
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
| 3 | -<mapper namespace="org.jeecg.modules.erp.trad.mapper.TblTradZongMapper"> | ||
| 4 | - | ||
| 5 | - | ||
| 6 | - <insert id="getlist" useGeneratedKeys="true" keyProperty="id"> | ||
| 7 | - <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer"> | ||
| 8 | - SELECT LAST_INSERT_ID() | ||
| 9 | - </selectKey> | ||
| 10 | - INSERT INTO tbl_trad_zong ( | ||
| 11 | - tender_number, | ||
| 12 | - customer, | ||
| 13 | - procurement, | ||
| 14 | - part_number, | ||
| 15 | - description, | ||
| 16 | - productname, | ||
| 17 | - specifications, | ||
| 18 | - num, | ||
| 19 | - base_shuiprice, | ||
| 20 | - base_zhong, | ||
| 21 | - danwei, | ||
| 22 | - company, | ||
| 23 | - jiaohuo_time, | ||
| 24 | - brand, | ||
| 25 | - work_order, | ||
| 26 | - identification, | ||
| 27 | - wbs, | ||
| 28 | - `result`, | ||
| 29 | - notes, | ||
| 30 | - design, | ||
| 31 | - phone, | ||
| 32 | - picture , | ||
| 33 | - chang, | ||
| 34 | - price, | ||
| 35 | - tax_included, | ||
| 36 | - huoqi_time, | ||
| 37 | - contact_person, | ||
| 38 | - inquirer, | ||
| 39 | - bid_price, | ||
| 40 | - zhong_price, | ||
| 41 | - zhong_num, | ||
| 42 | - total_price, | ||
| 43 | - bianhao, | ||
| 44 | - hetongjiaohuo_time, | ||
| 45 | - cg_manufacturer, | ||
| 46 | - cg_productname, | ||
| 47 | - cg_num, | ||
| 48 | - cg_time, | ||
| 49 | - daohuo_time, | ||
| 50 | - cg_price, | ||
| 51 | - hanshui_included, | ||
| 52 | - tax_total_price, | ||
| 53 | - invoice_type, | ||
| 54 | - fapiao_num, | ||
| 55 | - invoice_price, | ||
| 56 | - beizhu, | ||
| 57 | - scanned_copies, | ||
| 58 | - song_time, | ||
| 59 | - jiaojieren, | ||
| 60 | - invoicing_time, | ||
| 61 | - invoice_num, | ||
| 62 | - gp_time, | ||
| 63 | - hk_price, | ||
| 64 | - hk_time, | ||
| 65 | - zbhk_price, | ||
| 66 | - zbhk_time, | ||
| 67 | - profit | ||
| 68 | - ) SELECT | ||
| 69 | - base.tender_number, | ||
| 70 | - base.customer, | ||
| 71 | - base.procurement, | ||
| 72 | - base.part_number, | ||
| 73 | - base.description, | ||
| 74 | - base.productname, | ||
| 75 | - base.specifications, | ||
| 76 | - base.num, | ||
| 77 | - base.base_shuiprice, | ||
| 78 | - base.base_zhong, | ||
| 79 | - base.danwei, | ||
| 80 | - base.company, | ||
| 81 | - base.delivery_time, | ||
| 82 | - base.brand, | ||
| 83 | - base.work_order, | ||
| 84 | - base.identification, | ||
| 85 | - base.wbs, | ||
| 86 | - base.result, | ||
| 87 | - base.notes, | ||
| 88 | - base.design, | ||
| 89 | - base.phone, | ||
| 90 | - base.picture, | ||
| 91 | - inquiry.chang, | ||
| 92 | - inquiry.price, | ||
| 93 | - inquiry.tax_included, | ||
| 94 | - inquiry.delivery_time, | ||
| 95 | - inquiry.contact_person, | ||
| 96 | - inquiry.inquirer, | ||
| 97 | - tou.bid_price, | ||
| 98 | - tou.zhong_price, | ||
| 99 | - tou.zhong_num, | ||
| 100 | - tou.total_price, | ||
| 101 | - ht.bianhao, | ||
| 102 | - ht.delivery_time, | ||
| 103 | - tender.cg_manufacturer, | ||
| 104 | - tender.cg_productname, | ||
| 105 | - tender.cg_num, | ||
| 106 | - tender.cg_time, | ||
| 107 | - tender.delivery_time, | ||
| 108 | - tender.cg_price, | ||
| 109 | - tender.tax_included, | ||
| 110 | - tender.tax_total_price, | ||
| 111 | - tender.invoice_type, | ||
| 112 | - tender.invoice_num, | ||
| 113 | - tender.invoice_price, | ||
| 114 | - tender.notes, | ||
| 115 | - tender.scanned_copies, | ||
| 116 | - tender.song_time, | ||
| 117 | - tender.jiaojieren, | ||
| 118 | - fphk.invoicing_time, | ||
| 119 | - fphk.invoice_num, | ||
| 120 | - fphk.gp_time, | ||
| 121 | - fphk.hk_price, | ||
| 122 | - fphk.hk_time, | ||
| 123 | - fphk.zbhk_price, | ||
| 124 | - fphk.zbhk_time, | ||
| 125 | - tender.profit | ||
| 126 | - FROM | ||
| 127 | - tbl_trad_base AS base | ||
| 128 | - LEFT JOIN tbl_trad_inquiry AS inquiry ON ( base.tender_number = inquiry.tender_number AND base.part_number = inquiry.part_number ) | ||
| 129 | - LEFT JOIN tbl_trad_tou AS tou ON ( base.tender_number = tou.tender_number AND base.part_number = tou.part_number ) | ||
| 130 | - LEFT JOIN tbl_trad_contract AS ht ON ( base.tender_number = ht.tender_number AND base.part_number = ht.part_number ) | ||
| 131 | - LEFT JOIN tbl_trad_tender AS tender ON ( base.tender_number = tender.tender_number AND base.part_number = tender.part_number ) | ||
| 132 | - LEFT JOIN tbl_trad_fphk AS fphk ON ( base.tender_number = fphk.tender_number AND base.part_number = fphk.part_number ) | ||
| 133 | - </insert> | ||
| 134 | - <delete id="del"> | ||
| 135 | - DELETE FROM tbl_trad_zong; | ||
| 136 | - </delete> | ||
| 137 | - | ||
| 138 | -</mapper> |
| 1 | package org.jeecg.modules.erp.trad.service; | 1 | package org.jeecg.modules.erp.trad.service; |
| 2 | 2 | ||
| 3 | import com.baomidou.mybatisplus.extension.service.IService; | 3 | import com.baomidou.mybatisplus.extension.service.IService; |
| 4 | -import org.jeecg.modules.erp.trad.entity.TblTradZong; | 4 | +import org.jeecg.modules.erp.trad.entity.ViewTradZong; |
| 5 | 5 | ||
| 6 | /** | 6 | /** |
| 7 | * @Description: tbl_trad_zong | 7 | * @Description: tbl_trad_zong |
| @@ -9,10 +9,5 @@ import org.jeecg.modules.erp.trad.entity.TblTradZong; | @@ -9,10 +9,5 @@ import org.jeecg.modules.erp.trad.entity.TblTradZong; | ||
| 9 | * @Date: 2024-04-15 | 9 | * @Date: 2024-04-15 |
| 10 | * @Version: V1.0 | 10 | * @Version: V1.0 |
| 11 | */ | 11 | */ |
| 12 | -public interface TblTradZongService extends IService<TblTradZong> { | ||
| 13 | - | ||
| 14 | - void getlist(); | ||
| 15 | - | ||
| 16 | - | ||
| 17 | - Boolean del(); | 12 | +public interface ViewTradZongService extends IService<ViewTradZong> { |
| 18 | } | 13 | } |
| 1 | package org.jeecg.modules.erp.trad.service.impl; | 1 | package org.jeecg.modules.erp.trad.service.impl; |
| 2 | 2 | ||
| 3 | -import org.jeecg.modules.erp.trad.entity.TblTradZong; | ||
| 4 | -import org.jeecg.modules.erp.trad.mapper.TblTradZongMapper; | ||
| 5 | -import org.jeecg.modules.erp.trad.service.TblTradZongService; | 3 | +import org.jeecg.modules.erp.trad.entity.ViewTradZong; |
| 4 | +import org.jeecg.modules.erp.trad.mapper.ViewTradZongMapper; | ||
| 5 | +import org.jeecg.modules.erp.trad.service.ViewTradZongService; | ||
| 6 | import org.springframework.beans.factory.annotation.Autowired; | 6 | import org.springframework.beans.factory.annotation.Autowired; |
| 7 | import org.springframework.stereotype.Service; | 7 | import org.springframework.stereotype.Service; |
| 8 | 8 | ||
| @@ -15,20 +15,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | @@ -15,20 +15,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | ||
| 15 | * @Version: V1.0 | 15 | * @Version: V1.0 |
| 16 | */ | 16 | */ |
| 17 | @Service | 17 | @Service |
| 18 | -public class TblTradZongServiceImpl extends ServiceImpl<TblTradZongMapper, TblTradZong> implements TblTradZongService { | 18 | +public class ViewTradZongServiceImpl extends ServiceImpl<ViewTradZongMapper, ViewTradZong> implements ViewTradZongService { |
| 19 | 19 | ||
| 20 | @Autowired | 20 | @Autowired |
| 21 | - TblTradZongMapper tblTradZongMapper; | ||
| 22 | - | ||
| 23 | - @Override | ||
| 24 | - public void getlist() { | ||
| 25 | - | ||
| 26 | - tblTradZongMapper.getlist(); | ||
| 27 | - } | ||
| 28 | - | ||
| 29 | - @Override | ||
| 30 | - public Boolean del() { | ||
| 31 | - return tblTradZongMapper.del(); | ||
| 32 | - } | 21 | + ViewTradZongMapper viewTradZongMapper; |
| 33 | 22 | ||
| 34 | } | 23 | } |
-
请 注册 或 登录 后发表评论