雷海东 / factory-java · 提交

转到一个项目

作者 雷海东
提交 189c1db960bf4dde1a57ea872ccd2061710fbc7f 1 个父辈 f24a13f1

贸易综合信息视图展示、工资导入查询去空格

内嵌 并排对比
正在显示 11 个修改的文件 包含 48 行增加 和 235 行删除
... ... @@ -514,7 +514,6 @@ public class JeecgController<T, S extends IService<T>> {
queryWrapper.eq("ht_price",htPrice);
service.update(data,queryWrapper);
// System.out.println(service.update(existingData,queryWrapper));
} catch (Exception e) {
e.printStackTrace();
}
... ...
... ... @@ -412,8 +412,6 @@ public class JeecgController2<T, t, b,w, V extends IService<t>, S extends IServi
if(shuju.size()<=0){
return Result.error("文件数据为空");
}
System.out.println("导入的数据："+shuju);
System.out.println("数据库数据："+service.list());
service.saveBatch(shuju);
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
... ...
... ... @@ -64,40 +64,16 @@ public class TblSalaryBaseController extends JeecgController<TblSalaryBase, Tbl
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req){
if(tblSalaryBase.getUserName()!=null && !tblSalaryBase.getUserName().isEmpty()){
// 去除 tblSalaryBase 对象中的字符串字段的空格
trimStringFields(tblSalaryBase);
String name = tblSalaryBase.getUserName().replaceAll("\\s", "");
tblSalaryBase.setUserName(name);
}
QueryWrapper<TblSalaryBase> queryWrapper = QueryGenerator.initQueryWrapper(tblSalaryBase, req.getParameterMap());
Page<TblSalaryBase> page = new Page<>(pageNo, pageSize);
IPage<TblSalaryBase> pageList = tblSalaryBaseService.page(page,queryWrapper);
return Result.OK(pageList);
}
private void trimStringFields(Object obj) {
if (obj == null) {
return;
}
// 获取所有声明的字段，包括私有字段
Field[] fields = obj.getClass().getDeclaredFields();
for (Field field : fields) {
if (field.getType() == String.class) {
try {
// 设置私有字段可访问
field.setAccessible(true);
// 获取字段值
String value = (String) field.get(obj);
if (value != null) {
// 去除空格并重新设置字段值
String trimmedValue = value.replaceAll("\\s", "");
field.set(obj, trimmedValue);
System.out.println("Trimmed field: " + field.getName() + ", Original: [" + value + "], Trimmed: [" + trimmedValue + "]");
}
} catch (IllegalAccessException e) {
// 处理异常
e.printStackTrace();
}
}
}
}
//人员下拉
@GetMapping(value = "/listSalary")
... ...
... ... @@ -237,6 +237,7 @@ public class TblSalaryCalculationController extends JeecgController2<TblSalaryCa
Boolean zhi= tblSalaryCalculationService.updateByBase(salaryMonth);
if(zhi){
tblSalaryCalculationService.upjisuan(tblSalaryCalculationService.select(salaryMonth));
tblSalaryCalculationService.selectAndUpd();
return Result.OK("成功!");
}
// tblSalaryCalculationService.qi();
... ...
package org.jeecg.modules.erp.trad.controller;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.erp.trad.entity.TblTradZong;
import org.jeecg.modules.erp.trad.service.TblTradZongService;
import org.jeecg.modules.erp.trad.entity.ViewTradZong;
import org.jeecg.modules.erp.trad.service.ViewTradZongService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -33,14 +32,14 @@ import org.jeecg.common.aspect.annotation.AutoLog;
@RestController
@RequestMapping("/trad/tblTradZong")
@Slf4j
public class TblTradZongController extends JeecgController<TblTradZong, TblTradZongService> {
public class ViewTradZongController extends JeecgController<ViewTradZong, ViewTradZongService> {
@Autowired
private TblTradZongService tblTradZongService;
private ViewTradZongService viewTradZongService;
/**
* 分页列表查询
*
* @param tblTradZong
* @param viewTradZong
* @param pageNo
* @param pageSize
* @param req
... ... @@ -50,47 +49,41 @@ public class TblTradZongController extends JeecgController<TblTradZong, TblTradZ
@ApiOperation(value="tbl_trad_zong-分页列表查询", notes="tbl_trad_zong-分页列表查询")
@GetMapping(value = "/list")
@Transactional(rollbackFor = Exception.class)
public Result<IPage<TblTradZong>> queryPageList(TblTradZong tblTradZong,
public Result<IPage<ViewTradZong>> queryPageList(ViewTradZong viewTradZong,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Boolean zhi=tblTradZongService.del();
System.out.println(zhi);
tblTradZongService.getlist();
QueryWrapper<TblTradZong> queryWrapper = QueryGenerator.initQueryWrapper(tblTradZong, req.getParameterMap());
Page<TblTradZong> page = new Page<TblTradZong>(pageNo, pageSize);
IPage<TblTradZong> pageList = tblTradZongService.page(page, queryWrapper);
QueryWrapper<ViewTradZong> queryWrapper = QueryGenerator.initQueryWrapper(viewTradZong, req.getParameterMap());
Page<ViewTradZong> page = new Page<ViewTradZong>(pageNo, pageSize);
IPage<ViewTradZong> pageList = viewTradZongService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param tblTradZong
* @param viewTradZong
* @return
*/
@AutoLog(value = "tbl_trad_zong-添加")
@ApiOperation(value="tbl_trad_zong-添加", notes="tbl_trad_zong-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody TblTradZong tblTradZong) {
tblTradZongService.save(tblTradZong);
public Result<String> add(@RequestBody ViewTradZong viewTradZong) {
viewTradZongService.save(viewTradZong);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param tblTradZong
* @param viewTradZong
* @return
*/
@AutoLog(value = "tbl_trad_zong-编辑")
@ApiOperation(value="tbl_trad_zong-编辑", notes="tbl_trad_zong-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody TblTradZong tblTradZong) {
tblTradZongService.updateById(tblTradZong);
public Result<String> edit(@RequestBody ViewTradZong viewTradZong) {
viewTradZongService.updateById(viewTradZong);
return Result.OK("编辑成功!");
}
... ... @@ -104,7 +97,7 @@ public class TblTradZongController extends JeecgController<TblTradZong, TblTradZ
@ApiOperation(value="tbl_trad_zong-通过id删除", notes="tbl_trad_zong-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
tblTradZongService.removeById(id);
viewTradZongService.removeById(id);
return Result.OK("删除成功!");
}
... ... @@ -118,7 +111,7 @@ public class TblTradZongController extends JeecgController<TblTradZong, TblTradZ
@ApiOperation(value="tbl_trad_zong-批量删除", notes="tbl_trad_zong-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.tblTradZongService.removeByIds(Arrays.asList(ids.split(",")));
this.viewTradZongService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
... ... @@ -131,23 +124,23 @@ public class TblTradZongController extends JeecgController<TblTradZong, TblTradZ
//@AutoLog(value = "tbl_trad_zong-通过id查询")
@ApiOperation(value="tbl_trad_zong-通过id查询", notes="tbl_trad_zong-通过id查询")
@GetMapping(value = "/queryById")
public Result<TblTradZong> queryById(@RequestParam(name="id",required=true) String id) {
TblTradZong tblTradZong = tblTradZongService.getById(id);
if(tblTradZong==null) {
public Result<ViewTradZong> queryById(@RequestParam(name="id",required=true) String id) {
ViewTradZong viewTradZong = viewTradZongService.getById(id);
if(viewTradZong ==null) {
return Result.error("未找到对应数据");
}
return Result.OK(tblTradZong);
return Result.OK(viewTradZong);
}
/**
* 导出excel
*
* @param request
* @param tblTradZong
* @param viewTradZong
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, TblTradZong tblTradZong) {
return super.exportXls(request, tblTradZong, TblTradZong.class, "tbl_trad_zong");
public ModelAndView exportXls(HttpServletRequest request, ViewTradZong viewTradZong) {
return super.exportXls(request, viewTradZong, ViewTradZong.class, "tbl_trad_zong");
}
}
... ...
package org.jeecg.modules.erp.trad.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
... ... @@ -11,7 +10,6 @@ import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
... ... @@ -24,11 +22,11 @@ import lombok.experimental.Accessors;
* @Version: V1.0
*/
@Data
@TableName("tbl_trad_zong")
@TableName("view_trad_zong")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="tbl_trad_zong对象", description="tbl_trad_zong")
public class TblTradZong implements Serializable {
@ApiModel(value="view_trad_zong对象", description="view_trad_zong")
public class ViewTradZong implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
... ...
package org.jeecg.modules.erp.trad.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.erp.trad.entity.TblTradZong;
import org.jeecg.modules.erp.trad.entity.ViewTradZong;
/**
* @Description: tbl_trad_zong
... ... @@ -9,9 +9,6 @@ import org.jeecg.modules.erp.trad.entity.TblTradZong;
* @Date: 2024-04-15
* @Version: V1.0
*/
public interface TblTradZongMapper extends BaseMapper<TblTradZong> {
public interface ViewTradZongMapper extends BaseMapper<ViewTradZong> {
void getlist();
Boolean del();
}
... ...
<?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="org.jeecg.modules.erp.trad.mapper.TblTradZongMapper">
<insert id="getlist" useGeneratedKeys="true" keyProperty="id">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
</selectKey>
INSERT INTO tbl_trad_zong (
tender_number,
customer,
procurement,
part_number,
description,
productname,
specifications,
num,
base_shuiprice,
base_zhong,
danwei,
company,
jiaohuo_time,
brand,
work_order,
identification,
wbs,
`result`,
notes,
design,
phone,
picture ,
chang,
price,
tax_included,
huoqi_time,
contact_person,
inquirer,
bid_price,
zhong_price,
zhong_num,
total_price,
bianhao,
hetongjiaohuo_time,
cg_manufacturer,
cg_productname,
cg_num,
cg_time,
daohuo_time,
cg_price,
hanshui_included,
tax_total_price,
invoice_type,
fapiao_num,
invoice_price,
beizhu,
scanned_copies,
song_time,
jiaojieren,
invoicing_time,
invoice_num,
gp_time,
hk_price,
hk_time,
zbhk_price,
zbhk_time,
profit
) SELECT
base.tender_number,
base.customer,
base.procurement,
base.part_number,
base.description,
base.productname,
base.specifications,
base.num,
base.base_shuiprice,
base.base_zhong,
base.danwei,
base.company,
base.delivery_time,
base.brand,
base.work_order,
base.identification,
base.wbs,
base.result,
base.notes,
base.design,
base.phone,
base.picture,
inquiry.chang,
inquiry.price,
inquiry.tax_included,
inquiry.delivery_time,
inquiry.contact_person,
inquiry.inquirer,
tou.bid_price,
tou.zhong_price,
tou.zhong_num,
tou.total_price,
ht.bianhao,
ht.delivery_time,
tender.cg_manufacturer,
tender.cg_productname,
tender.cg_num,
tender.cg_time,
tender.delivery_time,
tender.cg_price,
tender.tax_included,
tender.tax_total_price,
tender.invoice_type,
tender.invoice_num,
tender.invoice_price,
tender.notes,
tender.scanned_copies,
tender.song_time,
tender.jiaojieren,
fphk.invoicing_time,
fphk.invoice_num,
fphk.gp_time,
fphk.hk_price,
fphk.hk_time,
fphk.zbhk_price,
fphk.zbhk_time,
tender.profit
FROM
tbl_trad_base AS base
LEFT JOIN tbl_trad_inquiry AS inquiry ON ( base.tender_number = inquiry.tender_number AND base.part_number = inquiry.part_number )
LEFT JOIN tbl_trad_tou AS tou ON ( base.tender_number = tou.tender_number AND base.part_number = tou.part_number )
LEFT JOIN tbl_trad_contract AS ht ON ( base.tender_number = ht.tender_number AND base.part_number = ht.part_number )
LEFT JOIN tbl_trad_tender AS tender ON ( base.tender_number = tender.tender_number AND base.part_number = tender.part_number )
LEFT JOIN tbl_trad_fphk AS fphk ON ( base.tender_number = fphk.tender_number AND base.part_number = fphk.part_number )
</insert>
<delete id="del">
DELETE FROM tbl_trad_zong;
</delete>
</mapper>
\ No newline at end of file
<?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="org.jeecg.modules.erp.trad.mapper.ViewTradZongMapper">
</mapper>
\ No newline at end of file
... ...
package org.jeecg.modules.erp.trad.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.erp.trad.entity.TblTradZong;
import org.jeecg.modules.erp.trad.entity.ViewTradZong;
/**
* @Description: tbl_trad_zong
... ... @@ -9,10 +9,5 @@ import org.jeecg.modules.erp.trad.entity.TblTradZong;
* @Date: 2024-04-15
* @Version: V1.0
*/
public interface TblTradZongService extends IService<TblTradZong> {
void getlist();
Boolean del();
public interface ViewTradZongService extends IService<ViewTradZong> {
}
... ...
package org.jeecg.modules.erp.trad.service.impl;
import org.jeecg.modules.erp.trad.entity.TblTradZong;
import org.jeecg.modules.erp.trad.mapper.TblTradZongMapper;
import org.jeecg.modules.erp.trad.service.TblTradZongService;
import org.jeecg.modules.erp.trad.entity.ViewTradZong;
import org.jeecg.modules.erp.trad.mapper.ViewTradZongMapper;
import org.jeecg.modules.erp.trad.service.ViewTradZongService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
... ... @@ -15,20 +15,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
* @Version: V1.0
*/
@Service
public class TblTradZongServiceImpl extends ServiceImpl<TblTradZongMapper, TblTradZong> implements TblTradZongService {
public class ViewTradZongServiceImpl extends ServiceImpl<ViewTradZongMapper, ViewTradZong> implements ViewTradZongService {
@Autowired
TblTradZongMapper tblTradZongMapper;
@Override
public void getlist() {
tblTradZongMapper.getlist();
}
@Override
public Boolean del() {
return tblTradZongMapper.del();
}
ViewTradZongMapper viewTradZongMapper;
}
... ...