作者 张晓杰

采购申请

正在显示 35 个修改的文件 包含 1124 行增加54 行删除
package org.jeecg.modules.erp.bidding_info.controller;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
... ... @@ -11,6 +12,7 @@ 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.common.system.util.JwtUtil;
import org.jeecg.common.util.oConvertUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
... ... @@ -19,6 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
... ... @@ -53,16 +56,27 @@ public class TblBiddingShenqController extends JeecgController<TblBiddingShenq,
/**
* 分页列表查询
*
* @param tblBiddingShenq
* @param biddingShenqForm
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "tbl_bidding_shenq-分页列表查询")
@ApiOperation(value="tbl_bidding_shenq-分页列表查询", notes="tbl_bidding_shenq-分页列表查询")
@ApiOperation(value="tbl_bidding_shenq-分页列表查询1", notes="tbl_bidding_shenq-分页列表查询1")
@GetMapping(value = "/list")
public Result<IPage<TblBiddingShenq>> queryPageList(TblBiddingShenq tblBiddingShenq,
public Result<IPage<BiddingShenqForm>> queryPageList(BiddingShenqForm biddingShenqForm,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
return Result.OK(pageList);
}
//产品设计的采购申请
@ApiOperation(value="tbl_bidding_shenq-分页列表查询", notes="tbl_bidding_shenq-分页列表查询")
@GetMapping(value = "/listDesign")
public Result<IPage<TblBiddingShenq>> queryPageList( TblBiddingShenq tblBiddingShenq,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
... ... @@ -81,7 +95,11 @@ public class TblBiddingShenqController extends JeecgController<TblBiddingShenq,
@AutoLog(value = "tbl_bidding_shenq-添加")
@ApiOperation(value="tbl_bidding_shenq-添加", notes="tbl_bidding_shenq-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody TblBiddingShenq tblBiddingShenq) {
public Result<String> add(@RequestBody TblBiddingShenq tblBiddingShenq,HttpServletRequest request) {
String currentUserName = JwtUtil.getUserNameByToken(request);
tblBiddingShenq.setSqTime(new Date());
tblBiddingShenq.setApplicant(currentUserName);
tblBiddingShenqService.save(tblBiddingShenq);
return Result.OK("添加成功!");
}
... ...
... ... @@ -40,6 +40,11 @@ public class TblBiddingShenq implements Serializable {
@ApiModelProperty(value = "订单号")
private String orderId;
/**编号*/
@Excel(name = "编号", width = 15)
@ApiModelProperty(value = "编号")
private String partNumber;
/**品名*/
@Excel(name = "品名", width = 15)
@ApiModelProperty(value = "品名")
... ... @@ -48,11 +53,17 @@ public class TblBiddingShenq implements Serializable {
@Excel(name = "规格", width = 15)
@ApiModelProperty(value = "规格")
private String specifications;
/**型号*/
@Excel(name = "型号", width = 15)
@ApiModelProperty(value = "型号")
private String type;
/**数量*/
@Excel(name = "数量", width = 15)
@ApiModelProperty(value = "数量")
private Integer num;
/**数量*/
/**单位*/
@Excel(name = "单位", width = 15)
@ApiModelProperty(value = "单位")
private String danwei;
... ... @@ -98,36 +109,41 @@ public class TblBiddingShenq implements Serializable {
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String notes;
/**申请人角色*/
@Excel(name = "申请人角色", width = 15)
@ApiModelProperty(value = "申请人角色")
private String applyRole;
/**申请人*/
@Excel(name = "申请人", width = 15)
@ApiModelProperty(value = "申请人")
private String applicant;
/**一级审批人*/
@Excel(name = "一级审批人", width = 15)
@ApiModelProperty(value = "一级审批人")
private String spOne;
/**二级审批人*/
@Excel(name = "二级审批人", width = 15)
@ApiModelProperty(value = "二级审批人")
private String spTwo;
/**备注*/
@Excel(name = "不同意备注", width = 15)
@ApiModelProperty(value = "不同意备注")
private String noNotes;
/**审批状态:0待审批 1审判中 2审批完成*/
@Excel(name = "审批状态:0待审批 1审判中 2审批完成", width = 15)
@ApiModelProperty(value = "审批状态:0待审批 1审判中 2审批完成")
private String approvalStatus;
/**审批结果:0未通过 1通过*/
@Excel(name = "审批结果:0未通过 1通过", width = 15)
@ApiModelProperty(value = "审批结果:0未通过 1通过")
private String approvalResult;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd hh:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd hh:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
@ApiModelProperty(value = "是否从基础表选择0是 1否")
private String chooseStatus;
}
... ...
package org.jeecg.modules.erp.bidding_info.form;
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;
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;
import lombok.experimental.Accessors;
/**
* @Description: tbl_bidding_shenq
* @Author: jeecg-boot
* @Date: 2024-04-22
* @Version: V1.0
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="tbl_bidding_shenq对象", description="tbl_bidding_shenq")
public class BiddingShenqForm implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private Integer id;
@Excel(name = "订单号", width = 15)
@ApiModelProperty(value = "订单号")
private String orderId;
/**品名*/
@Excel(name = "品名", width = 15)
@ApiModelProperty(value = "品名")
private String productName;
/**规格*/
@Excel(name = "规格", width = 15)
@ApiModelProperty(value = "规格")
private String specifications;
/**型号*/
@Excel(name = "型号", width = 15)
@ApiModelProperty(value = "型号")
private String type;
/**数量*/
@Excel(name = "数量", width = 15)
@ApiModelProperty(value = "数量")
private Integer num;
/**单位*/
@Excel(name = "单位", width = 15)
@ApiModelProperty(value = "单位")
private String danwei;
@Excel(name = "外形尺寸", width = 15)
@ApiModelProperty(value = "外形尺寸")
private String appearanceSize;
/**物料类别*/
@Excel(name = "物料类别", width = 15)
@ApiModelProperty(value = "物料类别")
private String wuType;
/**工作令*/
@Excel(name = "工作令", width = 15)
@ApiModelProperty(value = "工作令")
private String workOrder;
/**用途*/
@Excel(name = "用途", width = 15)
@ApiModelProperty(value = "用途")
private String purpose;
/**当前库存*/
@Excel(name = "当前库存", width = 15)
@ApiModelProperty(value = "当前库存")
private String ku;
/**申请日期*/
@Excel(name = "申请日期", width = 15)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "申请日期")
private Date sqTime;
/**使用日期*/
@Excel(name = "使用日期", width = 15)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "使用日期")
private Date deliveryTime;
/**品牌*/
@Excel(name = "品牌", width = 15)
@ApiModelProperty(value = "品牌")
private String brand;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private String notes;
@Excel(name = "申请人角色", width = 15)
@ApiModelProperty(value = "申请人角色")
private String applyRole;
/**申请人*/
@Excel(name = "申请人", width = 15)
@ApiModelProperty(value = "申请人")
private String applicant;
/**一级审批人*/
@Excel(name = "一级审批人", width = 15)
@ApiModelProperty(value = "一级审批人")
private String spOne;
/**二级审批人*/
@Excel(name = "二级审批人", width = 15)
@ApiModelProperty(value = "二级审批人")
private String spTwo;
/**备注*/
@Excel(name = "不同意备注", width = 15)
@ApiModelProperty(value = "不同意备注")
private String noNotes;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
@ApiModelProperty(value = "是否从基础表选择0是 1否")
private String chooseStatus;
//当前库存
private String operNumber;
}
... ...
... ... @@ -2,9 +2,11 @@ package org.jeecg.modules.erp.bidding_info.mapper;
import java.util.List;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
/**
* @Description: tbl_bidding_shenq
... ... @@ -14,4 +16,7 @@ import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
*/
public interface TblBiddingShenqMapper extends BaseMapper<TblBiddingShenq> {
Integer deleteByOrdeId(String orderId);
Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page,@Param("biddingShenqForm") BiddingShenqForm biddingShenqForm);
Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String orderId);
}
... ...
... ... @@ -4,4 +4,38 @@
<delete id="deleteByOrdeId" parameterType="String">
delete from tbl_bidding_shenq where order_id = #{orderId}
</delete>
<select id="selectList" resultType="org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm">
SELECT
a.id,a.order_id,a.part_number,a.product_name,
a.specifications,a.type,a.appearance_size,a.num,a.danwei,a.brand,a.wu_type,
a.work_order,a.purpose,a.ku,a.sq_time,a.delivery_time,a.notes,a.applicant,
a.approval_status,a.approval_result,a.create_by,a.create_time,a.update_by,a.update_time,a.choose_status,
IF
( a.choose_status = '0', b.oper_number, '0' ) AS oper_number
FROM
tbl_bidding_shenq a
LEFT JOIN view_depot_stock b ON a.part_number = b.part_number
where 1=1
<if test="biddingShenqForm.applicant!=null and biddingShenqForm.applicant !=''">
and (a.applicant like concat('%',#{biddingShenqForm.applicant},'%') or a.choose_status = '1')
</if>
<if test="biddingShenqForm.productName!=null and biddingShenqForm.productName !=''">
and a.product_name like concat('%',#{biddingShenqForm.productName},'%')
</if>
<if test="biddingShenqForm.workOrder!=null and biddingShenqForm.workOrder !=''">
and a.work_order like concat('%', #{biddingShenqForm.workOrder}, '%')
</if>
<if test="biddingShenqForm.deliveryTime!=null">
and a.delivery_time= date_format(#{biddingShenqForm.deliveryTime}, '%Y-%m-%d')
</if>
order by a.create_time desc
</select>
<update id="updateapprovalStatusByOrderId" parameterType="java.lang.String">
update tbl_bidding_shenq
<trim prefix="SET" suffixOverrides=",">
<if test="approvalStatus != null">approval_status = #{approvalStatus},</if>
<if test="approvalResult != null">approval_result = #{approvalResult},</if>
</trim>
where order_id = #{orderId}
</update>
</mapper>
\ No newline at end of file
... ...
package org.jeecg.modules.erp.bidding_info.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
import java.util.List;
/**
* @Description: tbl_bidding_shenq
... ... @@ -13,4 +18,6 @@ public interface ITblBiddingShenqService extends IService<TblBiddingShenq> {
Integer deleteByOrdeId(String orderId);
Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page, BiddingShenqForm biddingShenqForm);
Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String orderId);
}
... ...
package org.jeecg.modules.erp.bidding_info.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
import org.jeecg.modules.erp.bidding_info.mapper.TblBiddingShenqMapper;
import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -8,6 +10,8 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.List;
/**
* @Description: tbl_bidding_shenq
* @Author: jeecg-boot
... ... @@ -24,4 +28,14 @@ public class TblBiddingShenqServiceImpl extends ServiceImpl<TblBiddingShenqMappe
public Integer deleteByOrdeId(String orderId) {
return tblBiddingShenqMapper.deleteByOrdeId(orderId);
}
@Override
public Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page, BiddingShenqForm biddingShenqForm) {
return tblBiddingShenqMapper.selectList(page,biddingShenqForm);
}
@Override
public Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String orderId) {
return tblBiddingShenqMapper.updateapprovalStatusByOrderId(approvalStatus, approvalResult, orderId);
}
}
... ...
package org.jeecg.modules.erp.bidding_shenq_approval.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
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.common.util.oConvertUtils;
import org.jeecg.modules.erp.bidding_shenq_approval.entity.TblBiddingShenqApproval;
import org.jeecg.modules.erp.bidding_shenq_approval.service.ITblBiddingShenqApprovalService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 采购申请审批
* @Author: jeecg-boot
* @Date: 2024-05-23
* @Version: V1.0
*/
@Api(tags="采购申请审批")
@RestController
@RequestMapping("/bidding_shenq_approval/tblBiddingShenqApproval")
@Slf4j
public class TblBiddingShenqApprovalController extends JeecgController<TblBiddingShenqApproval, ITblBiddingShenqApprovalService> {
@Autowired
private ITblBiddingShenqApprovalService tblBiddingShenqApprovalService;
/**
* 分页列表查询
*
* @param tblBiddingShenqApproval
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "采购申请审批-分页列表查询")
@ApiOperation(value="采购申请审批-分页列表查询", notes="采购申请审批-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<TblBiddingShenqApproval>> queryPageList(TblBiddingShenqApproval tblBiddingShenqApproval,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TblBiddingShenqApproval> queryWrapper = QueryGenerator.initQueryWrapper(tblBiddingShenqApproval, req.getParameterMap());
Page<TblBiddingShenqApproval> page = new Page<TblBiddingShenqApproval>(pageNo, pageSize);
IPage<TblBiddingShenqApproval> pageList = tblBiddingShenqApprovalService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param tblBiddingShenqApproval
* @return
*/
@AutoLog(value = "采购申请审批-添加")
@ApiOperation(value="采购申请审批-添加", notes="采购申请审批-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody TblBiddingShenqApproval tblBiddingShenqApproval) {
tblBiddingShenqApprovalService.save(tblBiddingShenqApproval);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param tblBiddingShenqApproval
* @return
*/
@AutoLog(value = "采购申请审批-编辑")
@ApiOperation(value="采购申请审批-编辑", notes="采购申请审批-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody TblBiddingShenqApproval tblBiddingShenqApproval) {
tblBiddingShenqApprovalService.updateById(tblBiddingShenqApproval);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "采购申请审批-通过id删除")
@ApiOperation(value="采购申请审批-通过id删除", notes="采购申请审批-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
tblBiddingShenqApprovalService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "采购申请审批-批量删除")
@ApiOperation(value="采购申请审批-批量删除", notes="采购申请审批-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.tblBiddingShenqApprovalService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "采购申请审批-通过id查询")
@ApiOperation(value="采购申请审批-通过id查询", notes="采购申请审批-通过id查询")
@GetMapping(value = "/queryById")
public Result<TblBiddingShenqApproval> queryById(@RequestParam(name="id",required=true) String id) {
TblBiddingShenqApproval tblBiddingShenqApproval = tblBiddingShenqApprovalService.getById(id);
if(tblBiddingShenqApproval==null) {
return Result.error("未找到对应数据");
}
return Result.OK(tblBiddingShenqApproval);
}
/**
* 导出excel
*
* @param request
* @param tblBiddingShenqApproval
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, TblBiddingShenqApproval tblBiddingShenqApproval) {
return super.exportXls(request, tblBiddingShenqApproval, TblBiddingShenqApproval.class, "采购申请审批");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, TblBiddingShenqApproval.class);
}
}
... ...
package org.jeecg.modules.erp.bidding_shenq_approval.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;
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;
import lombok.experimental.Accessors;
/**
* @Description: 采购申请审批
* @Author: jeecg-boot
* @Date: 2024-05-23
* @Version: V1.0
*/
@Data
@TableName("tbl_bidding_shenq_approval")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="tbl_bidding_shenq_approval对象", description="采购申请审批")
public class TblBiddingShenqApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
/**审批人*/
@Excel(name = "审批人", width = 15)
@ApiModelProperty(value = "审批人")
private java.lang.String approval;
/**审批意见*/
@Excel(name = "审批意见", width = 15)
@ApiModelProperty(value = "审批意见")
private java.lang.String approvalOpinions;
/**是否同意*/
@Excel(name = "是否同意", width = 15)
@ApiModelProperty(value = "是否同意")
private java.lang.String isagree;
}
... ...
package org.jeecg.modules.erp.bidding_shenq_approval.form;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 采购申请审批
* @Author: jeecg-boot
* @Date: 2024-05-23
* @Version: V1.0
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="tbl_bidding_shenq_approval对象", description="采购申请审批")
public class BiddingShenqApproval implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
private String orderId;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**审批人*/
@Excel(name = "审批人", width = 15)
@ApiModelProperty(value = "审批人")
private String approval;
/**审批意见*/
@Excel(name = "审批意见", width = 15)
@ApiModelProperty(value = "审批意见")
private String approvalOpinions;
/**是否同意*/
@Excel(name = "是否同意", width = 15)
@ApiModelProperty(value = "是否同意")
private String isagree;
}
... ...
package org.jeecg.modules.erp.bidding_shenq_approval.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.erp.bidding_shenq_approval.entity.TblBiddingShenqApproval;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 采购申请审批
* @Author: jeecg-boot
* @Date: 2024-05-23
* @Version: V1.0
*/
public interface TblBiddingShenqApprovalMapper extends BaseMapper<TblBiddingShenqApproval> {
}
... ...
<?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.bidding_shenq_approval.mapper.TblBiddingShenqApprovalMapper">
</mapper>
\ No newline at end of file
... ...
package org.jeecg.modules.erp.bidding_shenq_approval.service;
import org.jeecg.modules.erp.bidding_shenq_approval.entity.TblBiddingShenqApproval;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 采购申请审批
* @Author: jeecg-boot
* @Date: 2024-05-23
* @Version: V1.0
*/
public interface ITblBiddingShenqApprovalService extends IService<TblBiddingShenqApproval> {
}
... ...
package org.jeecg.modules.erp.bidding_shenq_approval.service.impl;
import org.jeecg.modules.erp.bidding_shenq_approval.entity.TblBiddingShenqApproval;
import org.jeecg.modules.erp.bidding_shenq_approval.mapper.TblBiddingShenqApprovalMapper;
import org.jeecg.modules.erp.bidding_shenq_approval.service.ITblBiddingShenqApprovalService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 采购申请审批
* @Author: jeecg-boot
* @Date: 2024-05-23
* @Version: V1.0
*/
@Service
public class TblBiddingShenqApprovalServiceImpl extends ServiceImpl<TblBiddingShenqApprovalMapper, TblBiddingShenqApproval> implements ITblBiddingShenqApprovalService {
}
... ...
... ... @@ -88,6 +88,14 @@ public class TblMaterialController {
return Result.OK(pageList);
}
@GetMapping(value = "/listAll")
@PermissionData(pageComponent = "meterial/TblMaterialList")
public Result<List<TblMaterial>> queryListAll(
HttpServletRequest req) {
List<TblMaterial> list = tblMaterialService.getAll();
return Result.OK(list);
}
/**
* 添加
*
... ...
... ... @@ -47,4 +47,5 @@ public interface ITblMaterialService extends IService<TblMaterial> {
List<String> queryPartNumber(String partNum);
List<TblMaterial> getAll();
}
... ...
package org.jeecg.modules.erp.meterial.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.erp.meterial.entity.TblMaterial;
import org.jeecg.modules.erp.meterial.entity.TblPartSemifinished;
... ... @@ -89,4 +90,10 @@ public class TblMaterialServiceImpl extends ServiceImpl<TblMaterialMapper, TblMa
return tblMaterialMapper.queryPartNumber(partNum);
}
@Override
public List<TblMaterial> getAll() {
QueryWrapper<TblMaterial> queryWrapper = new QueryWrapper<>();
return this.list(queryWrapper);
}
}
... ...
... ... @@ -10,10 +10,12 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
... ... @@ -66,6 +68,7 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
private ITblWorkPriceService iTblWorkPriceService;
/*---------------------------------主表处理-begin-------------------------------------*/
/**
... ... @@ -131,27 +134,31 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
return Result.OK("编辑成功!");
}
// 分派设计人员
@RequestMapping(value = "/updateDesigner", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> updateDesigner(@RequestBody TblOrderForm tblOrderForm) {
// tblOrderForm.setAssignDesignDate(new Date());
tblOrderForm.setAssignDesignStatus("1");
tblOrderFormService.updateDesignerByOrderId(tblOrderForm);
return Result.OK("分派成功!");
}
//产品设计订单列表
@GetMapping(value = "/productDesignList")
public Result<IPage<TblOrderForm>> getProductDesignList(TblOrderForm tblOrderForm,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
queryWrapper.isNotNull("designer");
Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
IPage<TblOrderForm> pageList = tblOrderFormService.page(page, queryWrapper);
return Result.OK(pageList);
}
// // 分派设计人员
// @RequestMapping(value = "/updateDesigner", method = {RequestMethod.PUT,RequestMethod.POST})
// public Result<String> updateDesigner(@RequestBody TblOrderForm tblOrderForm) {
//// tblOrderForm.setAssignDesignDate(new Date());
// tblOrderForm.setAssignDesignStatus("1");
// tblOrderFormService.updateDesignerByOrderId(tblOrderForm);
// return Result.OK("分派成功!");
// }
// //产品设计订单列表
// @GetMapping(value = "/productDesignList")
// public Result<IPage<TblOrderForm>> getProductDesignList(TblOrderForm tblOrderForm,
// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
// HttpServletRequest req) {
//
// String userNameByToken = JwtUtil.getUserNameByToken(req);
//
// QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
//// queryWrapper.isNotNull("designer");
// queryWrapper.eq("designer", userNameByToken);
// Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
// IPage<TblOrderForm> pageList = tblOrderFormService.page(page, queryWrapper);
// return Result.OK(pageList);
// }
//通过id查询一条订单
@GetMapping(value = "/queryById/{id}")
... ... @@ -188,11 +195,11 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
@ApiOperation(value="订单表-通过id删除", notes="订单表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
TblOrderForm orderForm = tblOrderFormService.getById(id);
if (!orderForm.getStatus().equals("未下单")){
return Result.error("订单已开始,不允许删除");
}
tblOrderFormService.delMain(id);
// TblOrderForm orderForm = tblOrderFormService.getById(id);
// if (!orderForm.getStatus().equals("未下单")){
// return Result.error("订单已开始,不允许删除");
// }
tblOrderFormService.removeById(id);
return Result.OK("删除成功!");
}
... ...
... ... @@ -73,6 +73,9 @@ public class TblOrderForm implements Serializable {
@ApiModelProperty(value = "产品类型")
private java.lang.String productType;
@Excel(name = "设计人员角色", width = 15)
@ApiModelProperty(value = "设计人员角色")
private java.lang.String designRole;
@Excel(name = "设计人员", width = 15)
@ApiModelProperty(value = "设计人员")
private java.lang.String designer;
... ...
package org.jeecg.modules.api.controller;;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
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.common.system.util.JwtUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
import org.jeecg.modules.erp.bidding_shenq_approval.entity.TblBiddingShenqApproval;
import org.jeecg.modules.erp.bidding_shenq_approval.form.BiddingShenqApproval;
import org.jeecg.modules.erp.bidding_shenq_approval.service.ITblBiddingShenqApprovalService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 采购申请审批
* @Author: jeecg-boot
* @Date: 2024-05-23
* @Version: V1.0
*/
@Api(tags="采购申请审批")
@RestController
@RequestMapping("/bidding_shenq_approval/biddingShenqApproval")
@Slf4j
public class BiddingShenqApprovalController extends JeecgController<TblBiddingShenqApproval, ITblBiddingShenqApprovalService> {
@Autowired
private ITblBiddingShenqApprovalService tblBiddingShenqApprovalService;
@Autowired
private ISysUserService sysUserService;
@Autowired
private ITblBiddingShenqService tblBiddingShenqService;
/**
* 分页列表查询
*
* @param tblBiddingShenqApproval
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "采购申请审批-分页列表查询")
@ApiOperation(value="采购申请审批-分页列表查询", notes="采购申请审批-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<TblBiddingShenqApproval>> queryPageList(TblBiddingShenqApproval tblBiddingShenqApproval,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TblBiddingShenqApproval> queryWrapper = QueryGenerator.initQueryWrapper(tblBiddingShenqApproval, req.getParameterMap());
Page<TblBiddingShenqApproval> page = new Page<TblBiddingShenqApproval>(pageNo, pageSize);
IPage<TblBiddingShenqApproval> pageList = tblBiddingShenqApprovalService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param biddingShenqApproval
* @return
*/
@AutoLog(value = "采购申请审批-添加")
@ApiOperation(value="采购申请审批-添加", notes="采购申请审批-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody BiddingShenqApproval biddingShenqApproval, HttpServletRequest req) {
String userNameByToken = JwtUtil.getUserNameByToken(req);
SysUser sysUser = sysUserService.getUserByName(userNameByToken);
biddingShenqApproval.setApproval(sysUser.getWorkNo());
TblBiddingShenqApproval tblBiddingShenqApproval = new TblBiddingShenqApproval();
tblBiddingShenqApproval.setApproval(sysUser.getWorkNo());
tblBiddingShenqApproval.setApprovalOpinions(biddingShenqApproval.getApprovalOpinions());
tblBiddingShenqApproval.setIsagree(biddingShenqApproval.getIsagree());
tblBiddingShenqApprovalService.save(tblBiddingShenqApproval);
//同意,更新采购申请审批状态为审批中
if(biddingShenqApproval.getIsagree().equals("1")){
tblBiddingShenqService.updateapprovalStatusByOrderId("1",null,biddingShenqApproval.getOrderId());
}else if(tblBiddingShenqApproval.getIsagree().equals("2")){
//不同意,更新采购申请审批状态为审批完成 审批结果为不同意
tblBiddingShenqService.updateapprovalStatusByOrderId("2","2",biddingShenqApproval.getOrderId());
}
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param tblBiddingShenqApproval
* @return
*/
@AutoLog(value = "采购申请审批-编辑")
@ApiOperation(value="采购申请审批-编辑", notes="采购申请审批-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody TblBiddingShenqApproval tblBiddingShenqApproval) {
tblBiddingShenqApprovalService.updateById(tblBiddingShenqApproval);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "采购申请审批-通过id删除")
@ApiOperation(value="采购申请审批-通过id删除", notes="采购申请审批-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
tblBiddingShenqApprovalService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "采购申请审批-批量删除")
@ApiOperation(value="采购申请审批-批量删除", notes="采购申请审批-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.tblBiddingShenqApprovalService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "采购申请审批-通过id查询")
@ApiOperation(value="采购申请审批-通过id查询", notes="采购申请审批-通过id查询")
@GetMapping(value = "/queryById")
public Result<TblBiddingShenqApproval> queryById(@RequestParam(name="id",required=true) String id) {
TblBiddingShenqApproval tblBiddingShenqApproval = tblBiddingShenqApprovalService.getById(id);
if(tblBiddingShenqApproval==null) {
return Result.error("未找到对应数据");
}
return Result.OK(tblBiddingShenqApproval);
}
/**
* 导出excel
*
* @param request
* @param tblBiddingShenqApproval
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, TblBiddingShenqApproval tblBiddingShenqApproval) {
return super.exportXls(request, tblBiddingShenqApproval, TblBiddingShenqApproval.class, "采购申请审批");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, TblBiddingShenqApproval.class);
}
}
... ...
package org.jeecg.modules.api.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
@Slf4j
@RestController
@RequestMapping("/trad/biddingSq")
public class BiddingSqController {
@Autowired
private ITblBiddingShenqService tblBiddingShenqService;
@Autowired
private ISysUserService sysUserService;
@ApiOperation(value="tbl_bidding_shenq-分页列表查询1", notes="tbl_bidding_shenq-分页列表查询1")
@GetMapping(value = "/list")
public Result<IPage<BiddingShenqForm>> queryPageList(BiddingShenqForm biddingShenqForm,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
String userNameByToken = JwtUtil.getUserNameByToken(req);
List<String> roleList = sysUserService.getRole(userNameByToken);
SysUser sysUser = sysUserService.getUserByName(userNameByToken);
biddingShenqForm.setApplicant(sysUser.getWorkNo());
Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
return Result.OK(pageList);
}
/**
* 添加
*
* @param tblBiddingShenq
* @return
*/
@AutoLog(value = "tbl_bidding_shenq-添加")
@ApiOperation(value="tbl_bidding_shenq-添加", notes="tbl_bidding_shenq-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody TblBiddingShenq tblBiddingShenq, HttpServletRequest request) {
String currentUserName = JwtUtil.getUserNameByToken(request);
SysUser sysUser = sysUserService.getUserByName(currentUserName);
tblBiddingShenq.setSqTime(new Date());
tblBiddingShenq.setApplicant(sysUser.getWorkNo());
tblBiddingShenqService.save(tblBiddingShenq);
return Result.OK("添加成功!");
}
}
... ...
package org.jeecg.modules.api.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.Subject;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
import org.jeecg.modules.erp.order_form.service.ITblOrderFormService;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@Slf4j
@RestController
@RequestMapping("/order_form/productDesign")
public class ProductDesignController {
@Autowired
private ISysUserService sysUserService;
@Autowired
private ITblOrderFormService tblOrderFormService;
//产品设计订单列表
@GetMapping(value = "/productDesignList")
public Result<IPage<TblOrderForm>> getProductDesignList(TblOrderForm tblOrderForm,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
String userNameByToken = JwtUtil.getUserNameByToken(req);
List<String> roleList = sysUserService.getRole(userNameByToken);
SysUser sysUser = sysUserService.getUserByName(userNameByToken);
QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
// queryWrapper.isNotNull("designer");
// queryWrapper.in("design_role",roleList);
queryWrapper.eq("designer", sysUser.getWorkNo());
Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
IPage<TblOrderForm> pageList = tblOrderFormService.page(page, queryWrapper);
return Result.OK(pageList);
}
// 分派设计人员
@RequestMapping(value = "/updateDesigner", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> updateDesigner(@RequestBody TblOrderForm tblOrderForm) {
// tblOrderForm.setAssignDesignDate(new Date());
tblOrderForm.setAssignDesignStatus("1");
tblOrderForm.setDesigner(sysUserService.selectByroleCodeUsername(tblOrderForm.getDesignRole(),tblOrderForm.getDesigner()));
tblOrderFormService.updateDesignerByOrderId(tblOrderForm);
return Result.OK("分派成功!");
}
}
... ...
... ... @@ -138,16 +138,16 @@ public class CommonController {
// 获取文件名
String orgName = mf.getOriginalFilename();
orgName = CommonUtils.getFileName(orgName);
// if(orgName.indexOf(".")!=-1){
// fileName = orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."));
// }else{
// fileName = orgName+ "_" + System.currentTimeMillis();
// }
if(orgName.indexOf(".")!=-1){
fileName = System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."));
fileName = orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."));
}else{
fileName = System.currentTimeMillis()+"";
fileName = orgName+ "_" + System.currentTimeMillis();
}
// if(orgName.indexOf(".")!=-1){
// fileName = System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."));
// }else{
// fileName = System.currentTimeMillis()+"";
// }
String savePath = file.getPath() + File.separator + fileName;
File savefile = new File(savePath);
FileCopyUtils.copy(mf.getBytes(), savefile);
... ...
... ... @@ -59,6 +59,9 @@ public class LoginController {
@Resource
private BaseCommonService baseCommonService;
@Autowired
private ISysRoleService sysRoleService;
@ApiOperation("登录接口")
@RequestMapping(value = "/login", method = RequestMethod.POST)
public Result<JSONObject> login(@RequestBody SysLoginModel sysLoginModel){
... ... @@ -418,8 +421,11 @@ public class LoginController {
// 设置token缓存有效时间
redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
List<Map<String, String>> maps = sysRoleService.selectByUserId(sysUser.getId());
obj.put("token", token);
obj.put("userInfo", sysUser);
obj.put("roles", maps);
obj.put("sysAllDictItems", sysDictService.queryAllDictItems());
result.setResult(obj);
result.success("登录成功");
... ...
... ... @@ -25,6 +25,7 @@ import org.jeecg.modules.system.entity.SysPermissionDataRule;
import org.jeecg.modules.system.entity.SysRole;
import org.jeecg.modules.system.entity.SysRolePermission;
import org.jeecg.modules.system.model.TreeModel;
import org.jeecg.modules.system.model.UserRoleModel;
import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
import org.jeecg.modules.system.service.ISysPermissionService;
import org.jeecg.modules.system.service.ISysRolePermissionService;
... ... @@ -103,6 +104,14 @@ public class SysRoleController {
return result;
}
//获取角色用户级联下拉
@RequestMapping("/getUserRoleTreeList")
public Result<List<UserRoleModel>> getUserRoleTreeList(){
List<UserRoleModel> userRoleTree = sysRoleService.getUserRoleTree();
return Result.OK(userRoleTree);
}
/**
* 添加
* @param role
... ...
... ... @@ -6,6 +6,10 @@ import org.apache.ibatis.annotations.Update;
import org.jeecg.modules.system.entity.SysRole;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.system.model.UserRoleModel;
import java.util.List;
import java.util.Map;
/**
* <p>
... ... @@ -35,4 +39,8 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
@Delete("delete from sys_role_permission where role_id = #{roleId}")
void deleteRolePermissionRelation(@Param("roleId") String roleId);
List<UserRoleModel> getAll();
List<Map<String,String>> selectByUserId(String useId);
}
... ...
... ... @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.system.entity.SysUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.system.model.SysUserSysDepartModel;
import org.jeecg.modules.system.model.UserModel;
import org.jeecg.modules.system.vo.SysUserDepVo;
import java.util.List;
... ... @@ -157,4 +158,9 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
* @return
*/
List<SysUser> queryByDepIds(@Param("departIds")List<String> departIds,@Param("username") String username);
List<UserModel> getListByRoleId(String roleId);
String selectByroleCodeUsername(String roleCode,String username);
}
... ...
<?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.system.mapper.SysRoleMapper">
<select id="getAll" resultType="org.jeecg.modules.system.model.UserRoleModel">
SELECT id, role_name as label,role_code as value from sys_role
</select>
<select id="selectByUserId" parameterType="java.lang.String" resultType="java.util.Map">
SELECT a.id,a.role_name,a.role_code from sys_role a where id in (SELECT role_id from sys_user_role where user_id = #{userId})
</select>
</mapper>
\ No newline at end of file
... ...
... ... @@ -168,4 +168,13 @@
and username != #{username}
</if>
</select>
<select id="getListByRoleId" resultType="org.jeecg.modules.system.model.UserModel">
SELECT a.id,a.username as value , a.realname as label from sys_user a left join sys_user_role b on a.id = b.user_id where b.role_id = #{roleId}
</select>
<select id="selectByroleCodeUsername" resultType="java.lang.String">
SELECT a.work_no from sys_user a
left join sys_user_role b on a.id = b.user_id
left join sys_role c on b.role_id = c.id
where c.role_code = #{roleCode} and a.username = #{username}
</select>
</mapper>
\ No newline at end of file
... ...
package org.jeecg.modules.system.model;
import lombok.Data;
import java.io.Serializable;
@Data
public class UserModel implements Serializable {
private String value;
private String label;
}
... ...
package org.jeecg.modules.system.model;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class UserRoleModel implements Serializable {
private String id;
private String value;
private String label;
private List<UserModel> children;
}
... ...
... ... @@ -3,9 +3,13 @@ package org.jeecg.modules.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.system.entity.SysRole;
import org.jeecg.modules.system.model.UserRoleModel;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
import java.util.Map;
/**
* <p>
* 角色表 服务类
... ... @@ -40,4 +44,8 @@ public interface ISysRoleService extends IService<SysRole> {
*/
public boolean deleteBatchRole(String[] roleids);
List<UserRoleModel> getUserRoleTree();
List<Map<String,String>> selectByUserId(String useId);
}
... ...
... ... @@ -280,4 +280,6 @@ public interface ISysUserService extends IService<SysUser> {
*/
List<String> userIdToUsername(Collection<String> userIdList);
String selectByroleCodeUsername(String roleCode,String username);
}
... ...
... ... @@ -11,6 +11,8 @@ import org.jeecg.modules.quartz.service.IQuartzJobService;
import org.jeecg.modules.system.entity.SysRole;
import org.jeecg.modules.system.mapper.SysRoleMapper;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.jeecg.modules.system.model.UserModel;
import org.jeecg.modules.system.model.UserRoleModel;
import org.jeecg.modules.system.service.ISysRoleService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
... ... @@ -23,6 +25,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* <p>
... ... @@ -90,4 +93,21 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
this.removeByIds(Arrays.asList(roleIds));
return true;
}
@Override
public List<UserRoleModel> getUserRoleTree() {
List<UserRoleModel> list = sysRoleMapper.getAll();
for (UserRoleModel userRoleModel: list) {
List<UserModel> listByRoleId = sysUserMapper.getListByRoleId(userRoleModel.getId());
userRoleModel.setChildren(listByRoleId);
}
return list;
}
@Override
public List<Map<String, String>> selectByUserId(String useId) {
return sysRoleMapper.selectByUserId(useId);
}
}
... ...
... ... @@ -558,4 +558,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
return userList.stream().map(SysUser::getUsername).collect(Collectors.toList());
}
@Override
public String selectByroleCodeUsername(String roleCode, String username) {
return userMapper.selectByroleCodeUsername(roleCode, username);
}
}
... ...