雷海东 / factory-java · 提交

转到一个项目

作者 张晓杰
提交 f9c862f64471059d8ce6ed3987b8748954e479cd 1 个父辈 6885d407

采购申请

内嵌 并排对比
正在显示 35 个修改的文件 包含 1131 行增加 和 61 行删除
1 package org.jeecg.modules.erp.bidding_info.controller; 1 package org.jeecg.modules.erp.bidding_info.controller;
2 2
3 import java.util.Arrays; 3 import java.util.Arrays;
  4 +import java.util.Date;
4 import java.util.List; 5 import java.util.List;
5 import java.util.Map; 6 import java.util.Map;
6 import java.util.stream.Collectors; 7 import java.util.stream.Collectors;
@@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletRequest; @@ -11,6 +12,7 @@ import javax.servlet.http.HttpServletRequest;
11 import javax.servlet.http.HttpServletResponse; 12 import javax.servlet.http.HttpServletResponse;
12 import org.jeecg.common.api.vo.Result; 13 import org.jeecg.common.api.vo.Result;
13 import org.jeecg.common.system.query.QueryGenerator; 14 import org.jeecg.common.system.query.QueryGenerator;
  15 +import org.jeecg.common.system.util.JwtUtil;
14 import org.jeecg.common.util.oConvertUtils; 16 import org.jeecg.common.util.oConvertUtils;
15 17
16 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 18 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,6 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -19,6 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
19 import lombok.extern.slf4j.Slf4j; 21 import lombok.extern.slf4j.Slf4j;
20 22
21 import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq; 23 import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
  24 +import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
22 import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService; 25 import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
23 import org.jeecgframework.poi.excel.ExcelImportUtil; 26 import org.jeecgframework.poi.excel.ExcelImportUtil;
24 import org.jeecgframework.poi.excel.def.NormalExcelConstants; 27 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -53,24 +56,35 @@ public class TblBiddingShenqController extends JeecgController<TblBiddingShenq, @@ -53,24 +56,35 @@ public class TblBiddingShenqController extends JeecgController<TblBiddingShenq,
53 /** 56 /**
54 * 分页列表查询 57 * 分页列表查询
55 * 58 *
56 - * @param tblBiddingShenq 59 + * @param biddingShenqForm
57 * @param pageNo 60 * @param pageNo
58 * @param pageSize 61 * @param pageSize
59 * @param req 62 * @param req
60 * @return 63 * @return
61 */ 64 */
62 //@AutoLog(value = "tbl_bidding_shenq-分页列表查询") 65 //@AutoLog(value = "tbl_bidding_shenq-分页列表查询")
63 - @ApiOperation(value="tbl_bidding_shenq-分页列表查询", notes="tbl_bidding_shenq-分页列表查询") 66 + @ApiOperation(value="tbl_bidding_shenq-分页列表查询1", notes="tbl_bidding_shenq-分页列表查询1")
64 @GetMapping(value = "/list") 67 @GetMapping(value = "/list")
65 - public Result<IPage<TblBiddingShenq>> queryPageList(TblBiddingShenq tblBiddingShenq,  
66 - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,  
67 - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,  
68 - HttpServletRequest req) {  
69 - QueryWrapper<TblBiddingShenq> queryWrapper = QueryGenerator.initQueryWrapper(tblBiddingShenq, req.getParameterMap());  
70 - Page<TblBiddingShenq> page = new Page<TblBiddingShenq>(pageNo, pageSize);  
71 - IPage<TblBiddingShenq> pageList = tblBiddingShenqService.page(page, queryWrapper); 68 + public Result<IPage<BiddingShenqForm>> queryPageList(BiddingShenqForm biddingShenqForm,
  69 + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
  70 + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
  71 + Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
  72 + IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
72 return Result.OK(pageList); 73 return Result.OK(pageList);
73 } 74 }
  75 +
  76 + //产品设计的采购申请
  77 + @ApiOperation(value="tbl_bidding_shenq-分页列表查询", notes="tbl_bidding_shenq-分页列表查询")
  78 + @GetMapping(value = "/listDesign")
  79 + public Result<IPage<TblBiddingShenq>> queryPageList( TblBiddingShenq tblBiddingShenq,
  80 + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
  81 + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
  82 + HttpServletRequest req) {
  83 + QueryWrapper<TblBiddingShenq> queryWrapper = QueryGenerator.initQueryWrapper(tblBiddingShenq, req.getParameterMap());
  84 + Page<TblBiddingShenq> page = new Page<TblBiddingShenq>(pageNo, pageSize);
  85 + IPage<TblBiddingShenq> pageList = tblBiddingShenqService.page(page, queryWrapper);
  86 + return Result.OK(pageList);
  87 + }
74 88
75 /** 89 /**
76 * 添加 90 * 添加
@@ -81,7 +95,11 @@ public class TblBiddingShenqController extends JeecgController<TblBiddingShenq, @@ -81,7 +95,11 @@ public class TblBiddingShenqController extends JeecgController<TblBiddingShenq,
81 @AutoLog(value = "tbl_bidding_shenq-添加") 95 @AutoLog(value = "tbl_bidding_shenq-添加")
82 @ApiOperation(value="tbl_bidding_shenq-添加", notes="tbl_bidding_shenq-添加") 96 @ApiOperation(value="tbl_bidding_shenq-添加", notes="tbl_bidding_shenq-添加")
83 @PostMapping(value = "/add") 97 @PostMapping(value = "/add")
84 - public Result<String> add(@RequestBody TblBiddingShenq tblBiddingShenq) { 98 + public Result<String> add(@RequestBody TblBiddingShenq tblBiddingShenq,HttpServletRequest request) {
  99 + String currentUserName = JwtUtil.getUserNameByToken(request);
  100 +
  101 + tblBiddingShenq.setSqTime(new Date());
  102 + tblBiddingShenq.setApplicant(currentUserName);
85 tblBiddingShenqService.save(tblBiddingShenq); 103 tblBiddingShenqService.save(tblBiddingShenq);
86 return Result.OK("添加成功！"); 104 return Result.OK("添加成功！");
87 } 105 }
@@ -40,6 +40,11 @@ public class TblBiddingShenq implements Serializable { @@ -40,6 +40,11 @@ public class TblBiddingShenq implements Serializable {
40 @ApiModelProperty(value = "订单号") 40 @ApiModelProperty(value = "订单号")
41 private String orderId; 41 private String orderId;
42 42
  43 + /**编号*/
  44 + @Excel(name = "编号", width = 15)
  45 + @ApiModelProperty(value = "编号")
  46 + private String partNumber;
  47 +
43 /**品名*/ 48 /**品名*/
44 @Excel(name = "品名", width = 15) 49 @Excel(name = "品名", width = 15)
45 @ApiModelProperty(value = "品名") 50 @ApiModelProperty(value = "品名")
@@ -48,11 +53,17 @@ public class TblBiddingShenq implements Serializable { @@ -48,11 +53,17 @@ public class TblBiddingShenq implements Serializable {
48 @Excel(name = "规格", width = 15) 53 @Excel(name = "规格", width = 15)
49 @ApiModelProperty(value = "规格") 54 @ApiModelProperty(value = "规格")
50 private String specifications; 55 private String specifications;
  56 +
  57 + /**型号*/
  58 + @Excel(name = "型号", width = 15)
  59 + @ApiModelProperty(value = "型号")
  60 + private String type;
  61 +
51 /**数量*/ 62 /**数量*/
52 @Excel(name = "数量", width = 15) 63 @Excel(name = "数量", width = 15)
53 @ApiModelProperty(value = "数量") 64 @ApiModelProperty(value = "数量")
54 private Integer num; 65 private Integer num;
55 - /**数量*/ 66 + /**单位*/
56 @Excel(name = "单位", width = 15) 67 @Excel(name = "单位", width = 15)
57 @ApiModelProperty(value = "单位") 68 @ApiModelProperty(value = "单位")
58 private String danwei; 69 private String danwei;
@@ -98,36 +109,41 @@ public class TblBiddingShenq implements Serializable { @@ -98,36 +109,41 @@ public class TblBiddingShenq implements Serializable {
98 @Excel(name = "备注", width = 15) 109 @Excel(name = "备注", width = 15)
99 @ApiModelProperty(value = "备注") 110 @ApiModelProperty(value = "备注")
100 private String notes; 111 private String notes;
  112 +
  113 + /**申请人角色*/
  114 + @Excel(name = "申请人角色", width = 15)
  115 + @ApiModelProperty(value = "申请人角色")
  116 + private String applyRole;
  117 +
101 /**申请人*/ 118 /**申请人*/
102 @Excel(name = "申请人", width = 15) 119 @Excel(name = "申请人", width = 15)
103 @ApiModelProperty(value = "申请人") 120 @ApiModelProperty(value = "申请人")
104 private String applicant; 121 private String applicant;
105 - /**一级审批人*/  
106 - @Excel(name = "一级审批人", width = 15)  
107 - @ApiModelProperty(value = "一级审批人")  
108 - private String spOne;  
109 - /**二级审批人*/  
110 - @Excel(name = "二级审批人", width = 15)  
111 - @ApiModelProperty(value = "二级审批人")  
112 - private String spTwo;  
113 - /**备注*/  
114 - @Excel(name = "不同意备注", width = 15)  
115 - @ApiModelProperty(value = "不同意备注")  
116 - private String noNotes; 122 + /**审批状态：0待审批 1审判中 2审批完成*/
  123 + @Excel(name = "审批状态：0待审批 1审判中 2审批完成", width = 15)
  124 + @ApiModelProperty(value = "审批状态：0待审批 1审判中 2审批完成")
  125 + private String approvalStatus;
  126 + /**审批结果：0未通过 1通过*/
  127 + @Excel(name = "审批结果：0未通过 1通过", width = 15)
  128 + @ApiModelProperty(value = "审批结果：0未通过 1通过")
  129 + private String approvalResult;
117 /**创建人*/ 130 /**创建人*/
118 @ApiModelProperty(value = "创建人") 131 @ApiModelProperty(value = "创建人")
119 private String createBy; 132 private String createBy;
120 /**创建日期*/ 133 /**创建日期*/
121 - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")  
122 - @DateTimeFormat(pattern="yyyy-MM-dd") 134 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd hh:mm:ss")
  135 + @DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
123 @ApiModelProperty(value = "创建日期") 136 @ApiModelProperty(value = "创建日期")
124 private Date createTime; 137 private Date createTime;
125 /**更新人*/ 138 /**更新人*/
126 @ApiModelProperty(value = "更新人") 139 @ApiModelProperty(value = "更新人")
127 private String updateBy; 140 private String updateBy;
128 /**更新日期*/ 141 /**更新日期*/
129 - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")  
130 - @DateTimeFormat(pattern="yyyy-MM-dd") 142 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd hh:mm:ss")
  143 + @DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
131 @ApiModelProperty(value = "更新日期") 144 @ApiModelProperty(value = "更新日期")
132 private Date updateTime; 145 private Date updateTime;
  146 +
  147 + @ApiModelProperty(value = "是否从基础表选择0是 1否")
  148 + private String chooseStatus;
133 } 149 }
  1 +package org.jeecg.modules.erp.bidding_info.form;
  2 +
  3 +import java.io.Serializable;
  4 +import java.io.UnsupportedEncodingException;
  5 +import java.util.Date;
  6 +import java.math.BigDecimal;
  7 +import com.baomidou.mybatisplus.annotation.IdType;
  8 +import com.baomidou.mybatisplus.annotation.TableId;
  9 +import com.baomidou.mybatisplus.annotation.TableName;
  10 +import lombok.Data;
  11 +import com.fasterxml.jackson.annotation.JsonFormat;
  12 +import org.springframework.format.annotation.DateTimeFormat;
  13 +import org.jeecgframework.poi.excel.annotation.Excel;
  14 +import org.jeecg.common.aspect.annotation.Dict;
  15 +import io.swagger.annotations.ApiModel;
  16 +import io.swagger.annotations.ApiModelProperty;
  17 +import lombok.EqualsAndHashCode;
  18 +import lombok.experimental.Accessors;
  19 +
  20 +/**
  21 + * @Description: tbl_bidding_shenq
  22 + * @Author: jeecg-boot
  23 + * @Date: 2024-04-22
  24 + * @Version: V1.0
  25 + */
  26 +@Data
  27 +@Accessors(chain = true)
  28 +@EqualsAndHashCode(callSuper = false)
  29 +@ApiModel(value="tbl_bidding_shenq对象", description="tbl_bidding_shenq")
  30 +public class BiddingShenqForm implements Serializable {
  31 + private static final long serialVersionUID = 1L;
  32 +
  33 + /**id*/
  34 + @TableId(type = IdType.ASSIGN_ID)
  35 + @ApiModelProperty(value = "id")
  36 + private Integer id;
  37 +
  38 + @Excel(name = "订单号", width = 15)
  39 + @ApiModelProperty(value = "订单号")
  40 + private String orderId;
  41 +
  42 + /**品名*/
  43 + @Excel(name = "品名", width = 15)
  44 + @ApiModelProperty(value = "品名")
  45 + private String productName;
  46 + /**规格*/
  47 + @Excel(name = "规格", width = 15)
  48 + @ApiModelProperty(value = "规格")
  49 + private String specifications;
  50 +
  51 + /**型号*/
  52 + @Excel(name = "型号", width = 15)
  53 + @ApiModelProperty(value = "型号")
  54 + private String type;
  55 +
  56 + /**数量*/
  57 + @Excel(name = "数量", width = 15)
  58 + @ApiModelProperty(value = "数量")
  59 + private Integer num;
  60 + /**单位*/
  61 + @Excel(name = "单位", width = 15)
  62 + @ApiModelProperty(value = "单位")
  63 + private String danwei;
  64 +
  65 +
  66 + @Excel(name = "外形尺寸", width = 15)
  67 + @ApiModelProperty(value = "外形尺寸")
  68 + private String appearanceSize;
  69 +
  70 + /**物料类别*/
  71 + @Excel(name = "物料类别", width = 15)
  72 + @ApiModelProperty(value = "物料类别")
  73 + private String wuType;
  74 + /**工作令*/
  75 + @Excel(name = "工作令", width = 15)
  76 + @ApiModelProperty(value = "工作令")
  77 + private String workOrder;
  78 + /**用途*/
  79 + @Excel(name = "用途", width = 15)
  80 + @ApiModelProperty(value = "用途")
  81 + private String purpose;
  82 + /**当前库存*/
  83 + @Excel(name = "当前库存", width = 15)
  84 + @ApiModelProperty(value = "当前库存")
  85 + private String ku;
  86 + /**申请日期*/
  87 + @Excel(name = "申请日期", width = 15)
  88 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  89 + @DateTimeFormat(pattern="yyyy-MM-dd")
  90 + @ApiModelProperty(value = "申请日期")
  91 + private Date sqTime;
  92 + /**使用日期*/
  93 + @Excel(name = "使用日期", width = 15)
  94 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  95 + @DateTimeFormat(pattern="yyyy-MM-dd")
  96 + @ApiModelProperty(value = "使用日期")
  97 + private Date deliveryTime;
  98 + /**品牌*/
  99 + @Excel(name = "品牌", width = 15)
  100 + @ApiModelProperty(value = "品牌")
  101 + private String brand;
  102 + /**备注*/
  103 + @Excel(name = "备注", width = 15)
  104 + @ApiModelProperty(value = "备注")
  105 + private String notes;
  106 + @Excel(name = "申请人角色", width = 15)
  107 + @ApiModelProperty(value = "申请人角色")
  108 + private String applyRole;
  109 +
  110 + /**申请人*/
  111 + @Excel(name = "申请人", width = 15)
  112 + @ApiModelProperty(value = "申请人")
  113 + private String applicant;
  114 + /**一级审批人*/
  115 + @Excel(name = "一级审批人", width = 15)
  116 + @ApiModelProperty(value = "一级审批人")
  117 + private String spOne;
  118 + /**二级审批人*/
  119 + @Excel(name = "二级审批人", width = 15)
  120 + @ApiModelProperty(value = "二级审批人")
  121 + private String spTwo;
  122 + /**备注*/
  123 + @Excel(name = "不同意备注", width = 15)
  124 + @ApiModelProperty(value = "不同意备注")
  125 + private String noNotes;
  126 + /**创建人*/
  127 + @ApiModelProperty(value = "创建人")
  128 + private String createBy;
  129 + /**创建日期*/
  130 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  131 + @DateTimeFormat(pattern="yyyy-MM-dd")
  132 + @ApiModelProperty(value = "创建日期")
  133 + private Date createTime;
  134 + /**更新人*/
  135 + @ApiModelProperty(value = "更新人")
  136 + private String updateBy;
  137 + /**更新日期*/
  138 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
  139 + @DateTimeFormat(pattern="yyyy-MM-dd")
  140 + @ApiModelProperty(value = "更新日期")
  141 + private Date updateTime;
  142 +
  143 + @ApiModelProperty(value = "是否从基础表选择0是 1否")
  144 + private String chooseStatus;
  145 + //当前库存
  146 + private String operNumber;
  147 +}
@@ -2,9 +2,11 @@ package org.jeecg.modules.erp.bidding_info.mapper; @@ -2,9 +2,11 @@ package org.jeecg.modules.erp.bidding_info.mapper;
2 2
3 import java.util.List; 3 import java.util.List;
4 4
  5 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5 import org.apache.ibatis.annotations.Param; 6 import org.apache.ibatis.annotations.Param;
6 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 7 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
7 import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq; 8 import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
  9 +import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
8 10
9 /** 11 /**
10 * @Description: tbl_bidding_shenq 12 * @Description: tbl_bidding_shenq
@@ -14,4 +16,7 @@ import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq; @@ -14,4 +16,7 @@ import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
14 */ 16 */
15 public interface TblBiddingShenqMapper extends BaseMapper<TblBiddingShenq> { 17 public interface TblBiddingShenqMapper extends BaseMapper<TblBiddingShenq> {
16 Integer deleteByOrdeId(String orderId); 18 Integer deleteByOrdeId(String orderId);
  19 + Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page,@Param("biddingShenqForm") BiddingShenqForm biddingShenqForm);
  20 +
  21 + Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String orderId);
17 } 22 }
@@ -4,4 +4,38 @@ @@ -4,4 +4,38 @@
4 <delete id="deleteByOrdeId" parameterType="String"> 4 <delete id="deleteByOrdeId" parameterType="String">
5 delete from tbl_bidding_shenq where order_id = #{orderId} 5 delete from tbl_bidding_shenq where order_id = #{orderId}
6 </delete> 6 </delete>
  7 + <select id="selectList" resultType="org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm">
  8 + SELECT
  9 + a.id,a.order_id,a.part_number,a.product_name,
  10 + a.specifications,a.type,a.appearance_size,a.num,a.danwei,a.brand,a.wu_type,
  11 + a.work_order,a.purpose,a.ku,a.sq_time,a.delivery_time,a.notes,a.applicant,
  12 + a.approval_status,a.approval_result,a.create_by,a.create_time,a.update_by,a.update_time,a.choose_status,
  13 + IF
  14 + ( a.choose_status = '0', b.oper_number, '0' ) AS oper_number
  15 + FROM
  16 + tbl_bidding_shenq a
  17 + LEFT JOIN view_depot_stock b ON a.part_number = b.part_number
  18 + where 1=1
  19 + <if test="biddingShenqForm.applicant!=null and biddingShenqForm.applicant !=''">
  20 + and (a.applicant like concat('%',#{biddingShenqForm.applicant},'%') or a.choose_status = '1')
  21 + </if>
  22 + <if test="biddingShenqForm.productName!=null and biddingShenqForm.productName !=''">
  23 + and a.product_name like concat('%',#{biddingShenqForm.productName},'%')
  24 + </if>
  25 + <if test="biddingShenqForm.workOrder!=null and biddingShenqForm.workOrder !=''">
  26 + and a.work_order like concat('%', #{biddingShenqForm.workOrder}, '%')
  27 + </if>
  28 + <if test="biddingShenqForm.deliveryTime!=null">
  29 + and a.delivery_time= date_format(#{biddingShenqForm.deliveryTime}, '%Y-%m-%d')
  30 + </if>
  31 + order by a.create_time desc
  32 + </select>
  33 + <update id="updateapprovalStatusByOrderId" parameterType="java.lang.String">
  34 + update tbl_bidding_shenq
  35 + <trim prefix="SET" suffixOverrides=",">
  36 + <if test="approvalStatus != null">approval_status = #{approvalStatus},</if>
  37 + <if test="approvalResult != null">approval_result = #{approvalResult},</if>
  38 + </trim>
  39 + where order_id = #{orderId}
  40 + </update>
7 </mapper> 41 </mapper>
1 package org.jeecg.modules.erp.bidding_info.service; 1 package org.jeecg.modules.erp.bidding_info.service;
2 2
  3 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3 import com.baomidou.mybatisplus.extension.service.IService; 4 import com.baomidou.mybatisplus.extension.service.IService;
  5 +import org.apache.ibatis.annotations.Param;
4 import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq; 6 import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
  7 +import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
  8 +
  9 +import java.util.List;
5 10
6 /** 11 /**
7 * @Description: tbl_bidding_shenq 12 * @Description: tbl_bidding_shenq
@@ -13,4 +18,6 @@ public interface ITblBiddingShenqService extends IService<TblBiddingShenq> { @@ -13,4 +18,6 @@ public interface ITblBiddingShenqService extends IService<TblBiddingShenq> {
13 18
14 Integer deleteByOrdeId(String orderId); 19 Integer deleteByOrdeId(String orderId);
15 20
  21 + Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page, BiddingShenqForm biddingShenqForm);
  22 + Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String orderId);
16 } 23 }
1 package org.jeecg.modules.erp.bidding_info.service.impl; 1 package org.jeecg.modules.erp.bidding_info.service.impl;
2 2
  3 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3 import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq; 4 import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
  5 +import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
4 import org.jeecg.modules.erp.bidding_info.mapper.TblBiddingShenqMapper; 6 import org.jeecg.modules.erp.bidding_info.mapper.TblBiddingShenqMapper;
5 import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService; 7 import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
6 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,6 +10,8 @@ import org.springframework.stereotype.Service; @@ -8,6 +10,8 @@ import org.springframework.stereotype.Service;
8 10
9 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 11 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
10 12
  13 +import java.util.List;
  14 +
11 /** 15 /**
12 * @Description: tbl_bidding_shenq 16 * @Description: tbl_bidding_shenq
13 * @Author: jeecg-boot 17 * @Author: jeecg-boot
@@ -24,4 +28,14 @@ public class TblBiddingShenqServiceImpl extends ServiceImpl<TblBiddingShenqMappe @@ -24,4 +28,14 @@ public class TblBiddingShenqServiceImpl extends ServiceImpl<TblBiddingShenqMappe
24 public Integer deleteByOrdeId(String orderId) { 28 public Integer deleteByOrdeId(String orderId) {
25 return tblBiddingShenqMapper.deleteByOrdeId(orderId); 29 return tblBiddingShenqMapper.deleteByOrdeId(orderId);
26 } 30 }
  31 +
  32 + @Override
  33 + public Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page, BiddingShenqForm biddingShenqForm) {
  34 + return tblBiddingShenqMapper.selectList(page,biddingShenqForm);
  35 + }
  36 +
  37 + @Override
  38 + public Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String orderId) {
  39 + return tblBiddingShenqMapper.updateapprovalStatusByOrderId(approvalStatus, approvalResult, orderId);
  40 + }
27 } 41 }
  1 +package org.jeecg.modules.erp.bidding_shenq_approval.controller;
  2 +
  3 +import java.util.Arrays;
  4 +import java.util.List;
  5 +import java.util.Map;
  6 +import java.util.stream.Collectors;
  7 +import java.io.IOException;
  8 +import java.io.UnsupportedEncodingException;
  9 +import java.net.URLDecoder;
  10 +import javax.servlet.http.HttpServletRequest;
  11 +import javax.servlet.http.HttpServletResponse;
  12 +import org.jeecg.common.api.vo.Result;
  13 +import org.jeecg.common.system.query.QueryGenerator;
  14 +import org.jeecg.common.util.oConvertUtils;
  15 +import org.jeecg.modules.erp.bidding_shenq_approval.entity.TblBiddingShenqApproval;
  16 +import org.jeecg.modules.erp.bidding_shenq_approval.service.ITblBiddingShenqApprovalService;
  17 +
  18 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  19 +import com.baomidou.mybatisplus.core.metadata.IPage;
  20 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  21 +import lombok.extern.slf4j.Slf4j;
  22 +
  23 +import org.jeecgframework.poi.excel.ExcelImportUtil;
  24 +import org.jeecgframework.poi.excel.def.NormalExcelConstants;
  25 +import org.jeecgframework.poi.excel.entity.ExportParams;
  26 +import org.jeecgframework.poi.excel.entity.ImportParams;
  27 +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
  28 +import org.jeecg.common.system.base.controller.JeecgController;
  29 +import org.springframework.beans.factory.annotation.Autowired;
  30 +import org.springframework.web.bind.annotation.*;
  31 +import org.springframework.web.multipart.MultipartFile;
  32 +import org.springframework.web.multipart.MultipartHttpServletRequest;
  33 +import org.springframework.web.servlet.ModelAndView;
  34 +import com.alibaba.fastjson.JSON;
  35 +import io.swagger.annotations.Api;
  36 +import io.swagger.annotations.ApiOperation;
  37 +import org.jeecg.common.aspect.annotation.AutoLog;
  38 +
  39 + /**
  40 + * @Description: 采购申请审批
  41 + * @Author: jeecg-boot
  42 + * @Date: 2024-05-23
  43 + * @Version: V1.0
  44 + */
  45 +@Api(tags="采购申请审批")
  46 +@RestController
  47 +@RequestMapping("/bidding_shenq_approval/tblBiddingShenqApproval")
  48 +@Slf4j
  49 +public class TblBiddingShenqApprovalController extends JeecgController<TblBiddingShenqApproval, ITblBiddingShenqApprovalService> {
  50 + @Autowired
  51 + private ITblBiddingShenqApprovalService tblBiddingShenqApprovalService;
  52 +
  53 + /**
  54 + * 分页列表查询
  55 + *
  56 + * @param tblBiddingShenqApproval
  57 + * @param pageNo
  58 + * @param pageSize
  59 + * @param req
  60 + * @return
  61 + */
  62 + //@AutoLog(value = "采购申请审批-分页列表查询")
  63 + @ApiOperation(value="采购申请审批-分页列表查询", notes="采购申请审批-分页列表查询")
  64 + @GetMapping(value = "/list")
  65 + public Result<IPage<TblBiddingShenqApproval>> queryPageList(TblBiddingShenqApproval tblBiddingShenqApproval,
  66 + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
  67 + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
  68 + HttpServletRequest req) {
  69 + QueryWrapper<TblBiddingShenqApproval> queryWrapper = QueryGenerator.initQueryWrapper(tblBiddingShenqApproval, req.getParameterMap());
  70 + Page<TblBiddingShenqApproval> page = new Page<TblBiddingShenqApproval>(pageNo, pageSize);
  71 + IPage<TblBiddingShenqApproval> pageList = tblBiddingShenqApprovalService.page(page, queryWrapper);
  72 + return Result.OK(pageList);
  73 + }
  74 +
  75 + /**
  76 + * 添加
  77 + *
  78 + * @param tblBiddingShenqApproval
  79 + * @return
  80 + */
  81 + @AutoLog(value = "采购申请审批-添加")
  82 + @ApiOperation(value="采购申请审批-添加", notes="采购申请审批-添加")
  83 + @PostMapping(value = "/add")
  84 + public Result<String> add(@RequestBody TblBiddingShenqApproval tblBiddingShenqApproval) {
  85 + tblBiddingShenqApprovalService.save(tblBiddingShenqApproval);
  86 + return Result.OK("添加成功！");
  87 + }
  88 +
  89 + /**
  90 + * 编辑
  91 + *
  92 + * @param tblBiddingShenqApproval
  93 + * @return
  94 + */
  95 + @AutoLog(value = "采购申请审批-编辑")
  96 + @ApiOperation(value="采购申请审批-编辑", notes="采购申请审批-编辑")
  97 + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
  98 + public Result<String> edit(@RequestBody TblBiddingShenqApproval tblBiddingShenqApproval) {
  99 + tblBiddingShenqApprovalService.updateById(tblBiddingShenqApproval);
  100 + return Result.OK("编辑成功!");
  101 + }
  102 +
  103 + /**
  104 + * 通过id删除
  105 + *
  106 + * @param id
  107 + * @return
  108 + */
  109 + @AutoLog(value = "采购申请审批-通过id删除")
  110 + @ApiOperation(value="采购申请审批-通过id删除", notes="采购申请审批-通过id删除")
  111 + @DeleteMapping(value = "/delete")
  112 + public Result<String> delete(@RequestParam(name="id",required=true) String id) {
  113 + tblBiddingShenqApprovalService.removeById(id);
  114 + return Result.OK("删除成功!");
  115 + }
  116 +
  117 + /**
  118 + * 批量删除
  119 + *
  120 + * @param ids
  121 + * @return
  122 + */
  123 + @AutoLog(value = "采购申请审批-批量删除")
  124 + @ApiOperation(value="采购申请审批-批量删除", notes="采购申请审批-批量删除")
  125 + @DeleteMapping(value = "/deleteBatch")
  126 + public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
  127 + this.tblBiddingShenqApprovalService.removeByIds(Arrays.asList(ids.split(",")));
  128 + return Result.OK("批量删除成功!");
  129 + }
  130 +
  131 + /**
  132 + * 通过id查询
  133 + *
  134 + * @param id
  135 + * @return
  136 + */
  137 + //@AutoLog(value = "采购申请审批-通过id查询")
  138 + @ApiOperation(value="采购申请审批-通过id查询", notes="采购申请审批-通过id查询")
  139 + @GetMapping(value = "/queryById")
  140 + public Result<TblBiddingShenqApproval> queryById(@RequestParam(name="id",required=true) String id) {
  141 + TblBiddingShenqApproval tblBiddingShenqApproval = tblBiddingShenqApprovalService.getById(id);
  142 + if(tblBiddingShenqApproval==null) {
  143 + return Result.error("未找到对应数据");
  144 + }
  145 + return Result.OK(tblBiddingShenqApproval);
  146 + }
  147 +
  148 + /**
  149 + * 导出excel
  150 + *
  151 + * @param request
  152 + * @param tblBiddingShenqApproval
  153 + */
  154 + @RequestMapping(value = "/exportXls")
  155 + public ModelAndView exportXls(HttpServletRequest request, TblBiddingShenqApproval tblBiddingShenqApproval) {
  156 + return super.exportXls(request, tblBiddingShenqApproval, TblBiddingShenqApproval.class, "采购申请审批");
  157 + }
  158 +
  159 + /**
  160 + * 通过excel导入数据
  161 + *
  162 + * @param request
  163 + * @param response
  164 + * @return
  165 + */
  166 + @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  167 + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
  168 + return super.importExcel(request, response, TblBiddingShenqApproval.class);
  169 + }
  170 +
  171 +}
  1 +package org.jeecg.modules.erp.bidding_shenq_approval.entity;
  2 +
  3 +import java.io.Serializable;
  4 +import java.io.UnsupportedEncodingException;
  5 +import java.util.Date;
  6 +import java.math.BigDecimal;
  7 +import com.baomidou.mybatisplus.annotation.IdType;
  8 +import com.baomidou.mybatisplus.annotation.TableId;
  9 +import com.baomidou.mybatisplus.annotation.TableName;
  10 +import lombok.Data;
  11 +import com.fasterxml.jackson.annotation.JsonFormat;
  12 +import org.springframework.format.annotation.DateTimeFormat;
  13 +import org.jeecgframework.poi.excel.annotation.Excel;
  14 +import org.jeecg.common.aspect.annotation.Dict;
  15 +import io.swagger.annotations.ApiModel;
  16 +import io.swagger.annotations.ApiModelProperty;
  17 +import lombok.EqualsAndHashCode;
  18 +import lombok.experimental.Accessors;
  19 +
  20 +/**
  21 + * @Description: 采购申请审批
  22 + * @Author: jeecg-boot
  23 + * @Date: 2024-05-23
  24 + * @Version: V1.0
  25 + */
  26 +@Data
  27 +@TableName("tbl_bidding_shenq_approval")
  28 +@Accessors(chain = true)
  29 +@EqualsAndHashCode(callSuper = false)
  30 +@ApiModel(value="tbl_bidding_shenq_approval对象", description="采购申请审批")
  31 +public class TblBiddingShenqApproval implements Serializable {
  32 + private static final long serialVersionUID = 1L;
  33 +
  34 + /**主键*/
  35 + @TableId(type = IdType.ASSIGN_ID)
  36 + @ApiModelProperty(value = "主键")
  37 + private java.lang.String id;
  38 + /**创建人*/
  39 + @ApiModelProperty(value = "创建人")
  40 + private java.lang.String createBy;
  41 + /**创建日期*/
  42 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
  43 + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
  44 + @ApiModelProperty(value = "创建日期")
  45 + private java.util.Date createTime;
  46 + /**更新人*/
  47 + @ApiModelProperty(value = "更新人")
  48 + private java.lang.String updateBy;
  49 + /**更新日期*/
  50 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
  51 + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
  52 + @ApiModelProperty(value = "更新日期")
  53 + private java.util.Date updateTime;
  54 + /**所属部门*/
  55 + @ApiModelProperty(value = "所属部门")
  56 + private java.lang.String sysOrgCode;
  57 + /**审批人*/
  58 + @Excel(name = "审批人", width = 15)
  59 + @ApiModelProperty(value = "审批人")
  60 + private java.lang.String approval;
  61 + /**审批意见*/
  62 + @Excel(name = "审批意见", width = 15)
  63 + @ApiModelProperty(value = "审批意见")
  64 + private java.lang.String approvalOpinions;
  65 + /**是否同意*/
  66 + @Excel(name = "是否同意", width = 15)
  67 + @ApiModelProperty(value = "是否同意")
  68 + private java.lang.String isagree;
  69 +}
  1 +package org.jeecg.modules.erp.bidding_shenq_approval.form;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableId;
  5 +import com.baomidou.mybatisplus.annotation.TableName;
  6 +import com.fasterxml.jackson.annotation.JsonFormat;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import lombok.Data;
  10 +import lombok.EqualsAndHashCode;
  11 +import lombok.experimental.Accessors;
  12 +import org.jeecgframework.poi.excel.annotation.Excel;
  13 +import org.springframework.format.annotation.DateTimeFormat;
  14 +
  15 +import java.io.Serializable;
  16 +import java.util.Date;
  17 +
  18 +/**
  19 + * @Description: 采购申请审批
  20 + * @Author: jeecg-boot
  21 + * @Date: 2024-05-23
  22 + * @Version: V1.0
  23 + */
  24 +@Data
  25 +@Accessors(chain = true)
  26 +@EqualsAndHashCode(callSuper = false)
  27 +@ApiModel(value="tbl_bidding_shenq_approval对象", description="采购申请审批")
  28 +public class BiddingShenqApproval implements Serializable {
  29 + private static final long serialVersionUID = 1L;
  30 +
  31 + /**主键*/
  32 + @TableId(type = IdType.ASSIGN_ID)
  33 + @ApiModelProperty(value = "主键")
  34 + private String id;
  35 +
  36 + private String orderId;
  37 +
  38 + /**创建人*/
  39 + @ApiModelProperty(value = "创建人")
  40 + private String createBy;
  41 + /**创建日期*/
  42 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
  43 + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
  44 + @ApiModelProperty(value = "创建日期")
  45 + private Date createTime;
  46 + /**更新人*/
  47 + @ApiModelProperty(value = "更新人")
  48 + private String updateBy;
  49 + /**更新日期*/
  50 + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
  51 + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
  52 + @ApiModelProperty(value = "更新日期")
  53 + private Date updateTime;
  54 + /**所属部门*/
  55 + @ApiModelProperty(value = "所属部门")
  56 + private String sysOrgCode;
  57 + /**审批人*/
  58 + @Excel(name = "审批人", width = 15)
  59 + @ApiModelProperty(value = "审批人")
  60 + private String approval;
  61 + /**审批意见*/
  62 + @Excel(name = "审批意见", width = 15)
  63 + @ApiModelProperty(value = "审批意见")
  64 + private String approvalOpinions;
  65 + /**是否同意*/
  66 + @Excel(name = "是否同意", width = 15)
  67 + @ApiModelProperty(value = "是否同意")
  68 + private String isagree;
  69 +}
  1 +package org.jeecg.modules.erp.bidding_shenq_approval.mapper;
  2 +
  3 +import java.util.List;
  4 +
  5 +import org.apache.ibatis.annotations.Param;
  6 +import org.jeecg.modules.erp.bidding_shenq_approval.entity.TblBiddingShenqApproval;
  7 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  8 +
  9 +/**
  10 + * @Description: 采购申请审批
  11 + * @Author: jeecg-boot
  12 + * @Date: 2024-05-23
  13 + * @Version: V1.0
  14 + */
  15 +public interface TblBiddingShenqApprovalMapper extends BaseMapper<TblBiddingShenqApproval> {
  16 +
  17 +}
  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.bidding_shenq_approval.mapper.TblBiddingShenqApprovalMapper">
  4 +
  5 +</mapper>
  1 +package org.jeecg.modules.erp.bidding_shenq_approval.service;
  2 +
  3 +import org.jeecg.modules.erp.bidding_shenq_approval.entity.TblBiddingShenqApproval;
  4 +import com.baomidou.mybatisplus.extension.service.IService;
  5 +
  6 +/**
  7 + * @Description: 采购申请审批
  8 + * @Author: jeecg-boot
  9 + * @Date: 2024-05-23
  10 + * @Version: V1.0
  11 + */
  12 +public interface ITblBiddingShenqApprovalService extends IService<TblBiddingShenqApproval> {
  13 +
  14 +}
  1 +package org.jeecg.modules.erp.bidding_shenq_approval.service.impl;
  2 +
  3 +import org.jeecg.modules.erp.bidding_shenq_approval.entity.TblBiddingShenqApproval;
  4 +import org.jeecg.modules.erp.bidding_shenq_approval.mapper.TblBiddingShenqApprovalMapper;
  5 +import org.jeecg.modules.erp.bidding_shenq_approval.service.ITblBiddingShenqApprovalService;
  6 +import org.springframework.stereotype.Service;
  7 +
  8 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  9 +
  10 +/**
  11 + * @Description: 采购申请审批
  12 + * @Author: jeecg-boot
  13 + * @Date: 2024-05-23
  14 + * @Version: V1.0
  15 + */
  16 +@Service
  17 +public class TblBiddingShenqApprovalServiceImpl extends ServiceImpl<TblBiddingShenqApprovalMapper, TblBiddingShenqApproval> implements ITblBiddingShenqApprovalService {
  18 +
  19 +}
@@ -88,6 +88,14 @@ public class TblMaterialController { @@ -88,6 +88,14 @@ public class TblMaterialController {
88 return Result.OK(pageList); 88 return Result.OK(pageList);
89 } 89 }
90 90
  91 + @GetMapping(value = "/listAll")
  92 + @PermissionData(pageComponent = "meterial/TblMaterialList")
  93 + public Result<List<TblMaterial>> queryListAll(
  94 + HttpServletRequest req) {
  95 + List<TblMaterial> list = tblMaterialService.getAll();
  96 + return Result.OK(list);
  97 + }
  98 +
91 /** 99 /**
92 * 添加 100 * 添加
93 * 101 *
@@ -46,5 +46,6 @@ public interface ITblMaterialService extends IService<TblMaterial> { @@ -46,5 +46,6 @@ public interface ITblMaterialService extends IService<TblMaterial> {
46 public void delBatchMain (Collection<? extends Serializable> idList); 46 public void delBatchMain (Collection<? extends Serializable> idList);
47 47
48 List<String> queryPartNumber(String partNum); 48 List<String> queryPartNumber(String partNum);
49 - 49 +
  50 + List<TblMaterial> getAll();
50 } 51 }
1 package org.jeecg.modules.erp.meterial.service.impl; 1 package org.jeecg.modules.erp.meterial.service.impl;
2 2
  3 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 4 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
4 import org.jeecg.modules.erp.meterial.entity.TblMaterial; 5 import org.jeecg.modules.erp.meterial.entity.TblMaterial;
5 import org.jeecg.modules.erp.meterial.entity.TblPartSemifinished; 6 import org.jeecg.modules.erp.meterial.entity.TblPartSemifinished;
@@ -89,4 +90,10 @@ public class TblMaterialServiceImpl extends ServiceImpl<TblMaterialMapper, TblMa @@ -89,4 +90,10 @@ public class TblMaterialServiceImpl extends ServiceImpl<TblMaterialMapper, TblMa
89 return tblMaterialMapper.queryPartNumber(partNum); 90 return tblMaterialMapper.queryPartNumber(partNum);
90 } 91 }
91 92
  93 + @Override
  94 + public List<TblMaterial> getAll() {
  95 + QueryWrapper<TblMaterial> queryWrapper = new QueryWrapper<>();
  96 + return this.list(queryWrapper);
  97 + }
  98 +
92 } 99 }
@@ -10,10 +10,12 @@ import io.swagger.annotations.Api; @@ -10,10 +10,12 @@ import io.swagger.annotations.Api;
10 import io.swagger.annotations.ApiOperation; 10 import io.swagger.annotations.ApiOperation;
11 import lombok.extern.slf4j.Slf4j; 11 import lombok.extern.slf4j.Slf4j;
12 import org.apache.shiro.SecurityUtils; 12 import org.apache.shiro.SecurityUtils;
  13 +import org.apache.shiro.subject.Subject;
13 import org.jeecg.common.api.vo.Result; 14 import org.jeecg.common.api.vo.Result;
14 import org.jeecg.common.aspect.annotation.AutoLog; 15 import org.jeecg.common.aspect.annotation.AutoLog;
15 import org.jeecg.common.system.base.controller.JeecgController; 16 import org.jeecg.common.system.base.controller.JeecgController;
16 import org.jeecg.common.system.query.QueryGenerator; 17 import org.jeecg.common.system.query.QueryGenerator;
  18 +import org.jeecg.common.system.util.JwtUtil;
17 import org.jeecg.common.system.vo.LoginUser; 19 import org.jeecg.common.system.vo.LoginUser;
18 import org.jeecg.common.util.oConvertUtils; 20 import org.jeecg.common.util.oConvertUtils;
19 import org.jeecg.modules.erp.order_form.entity.TblOrderForm; 21 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
@@ -66,6 +68,7 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr @@ -66,6 +68,7 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
66 private ITblWorkPriceService iTblWorkPriceService; 68 private ITblWorkPriceService iTblWorkPriceService;
67 69
68 70
  71 +
69 /*---------------------------------主表处理-begin-------------------------------------*/ 72 /*---------------------------------主表处理-begin-------------------------------------*/
70 73
71 /** 74 /**
@@ -131,27 +134,31 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr @@ -131,27 +134,31 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
131 return Result.OK("编辑成功!"); 134 return Result.OK("编辑成功!");
132 } 135 }
133 136
134 - // 分派设计人员  
135 - @RequestMapping(value = "/updateDesigner", method = {RequestMethod.PUT,RequestMethod.POST})  
136 - public Result<String> updateDesigner(@RequestBody TblOrderForm tblOrderForm) {  
137 -// tblOrderForm.setAssignDesignDate(new Date());  
138 - tblOrderForm.setAssignDesignStatus("1");  
139 - tblOrderFormService.updateDesignerByOrderId(tblOrderForm);  
140 - return Result.OK("分派成功!");  
141 - }  
142 -  
143 - //产品设计订单列表  
144 - @GetMapping(value = "/productDesignList")  
145 - public Result<IPage<TblOrderForm>> getProductDesignList(TblOrderForm tblOrderForm,  
146 - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,  
147 - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,  
148 - HttpServletRequest req) {  
149 - QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());  
150 - queryWrapper.isNotNull("designer");  
151 - Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);  
152 - IPage<TblOrderForm> pageList = tblOrderFormService.page(page, queryWrapper);  
153 - return Result.OK(pageList);  
154 - } 137 +// // 分派设计人员
  138 +// @RequestMapping(value = "/updateDesigner", method = {RequestMethod.PUT,RequestMethod.POST})
  139 +// public Result<String> updateDesigner(@RequestBody TblOrderForm tblOrderForm) {
  140 +//// tblOrderForm.setAssignDesignDate(new Date());
  141 +// tblOrderForm.setAssignDesignStatus("1");
  142 +// tblOrderFormService.updateDesignerByOrderId(tblOrderForm);
  143 +// return Result.OK("分派成功!");
  144 +// }
  145 +
  146 +// //产品设计订单列表
  147 +// @GetMapping(value = "/productDesignList")
  148 +// public Result<IPage<TblOrderForm>> getProductDesignList(TblOrderForm tblOrderForm,
  149 +// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
  150 +// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
  151 +// HttpServletRequest req) {
  152 +//
  153 +// String userNameByToken = JwtUtil.getUserNameByToken(req);
  154 +//
  155 +// QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
  156 +//// queryWrapper.isNotNull("designer");
  157 +// queryWrapper.eq("designer", userNameByToken);
  158 +// Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
  159 +// IPage<TblOrderForm> pageList = tblOrderFormService.page(page, queryWrapper);
  160 +// return Result.OK(pageList);
  161 +// }
155 162
156 //通过id查询一条订单 163 //通过id查询一条订单
157 @GetMapping(value = "/queryById/{id}") 164 @GetMapping(value = "/queryById/{id}")
@@ -188,11 +195,11 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr @@ -188,11 +195,11 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
188 @ApiOperation(value="订单表-通过id删除", notes="订单表-通过id删除") 195 @ApiOperation(value="订单表-通过id删除", notes="订单表-通过id删除")
189 @DeleteMapping(value = "/delete") 196 @DeleteMapping(value = "/delete")
190 public Result<String> delete(@RequestParam(name="id",required=true) String id) { 197 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
191 - TblOrderForm orderForm = tblOrderFormService.getById(id);  
192 - if (!orderForm.getStatus().equals("未下单")){  
193 - return Result.error("订单已开始，不允许删除");  
194 - }  
195 - tblOrderFormService.delMain(id); 198 +// TblOrderForm orderForm = tblOrderFormService.getById(id);
  199 +// if (!orderForm.getStatus().equals("未下单")){
  200 +// return Result.error("订单已开始，不允许删除");
  201 +// }
  202 + tblOrderFormService.removeById(id);
196 return Result.OK("删除成功!"); 203 return Result.OK("删除成功!");
197 } 204 }
198 205
@@ -73,6 +73,9 @@ public class TblOrderForm implements Serializable { @@ -73,6 +73,9 @@ public class TblOrderForm implements Serializable {
73 @ApiModelProperty(value = "产品类型") 73 @ApiModelProperty(value = "产品类型")
74 private java.lang.String productType; 74 private java.lang.String productType;
75 75
  76 + @Excel(name = "设计人员角色", width = 15)
  77 + @ApiModelProperty(value = "设计人员角色")
  78 + private java.lang.String designRole;
76 @Excel(name = "设计人员", width = 15) 79 @Excel(name = "设计人员", width = 15)
77 @ApiModelProperty(value = "设计人员") 80 @ApiModelProperty(value = "设计人员")
78 private java.lang.String designer; 81 private java.lang.String designer;
  1 +package org.jeecg.modules.api.controller;;
  2 +
  3 +import java.util.Arrays;
  4 +import java.util.List;
  5 +import java.util.Map;
  6 +import java.util.stream.Collectors;
  7 +import java.io.IOException;
  8 +import java.io.UnsupportedEncodingException;
  9 +import java.net.URLDecoder;
  10 +import javax.servlet.http.HttpServletRequest;
  11 +import javax.servlet.http.HttpServletResponse;
  12 +import org.jeecg.common.api.vo.Result;
  13 +import org.jeecg.common.system.query.QueryGenerator;
  14 +import org.jeecg.common.system.util.JwtUtil;
  15 +import org.jeecg.common.util.oConvertUtils;
  16 +import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
  17 +import org.jeecg.modules.erp.bidding_shenq_approval.entity.TblBiddingShenqApproval;
  18 +import org.jeecg.modules.erp.bidding_shenq_approval.form.BiddingShenqApproval;
  19 +import org.jeecg.modules.erp.bidding_shenq_approval.service.ITblBiddingShenqApprovalService;
  20 +
  21 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  22 +import com.baomidou.mybatisplus.core.metadata.IPage;
  23 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  24 +import lombok.extern.slf4j.Slf4j;
  25 +
  26 +import org.jeecg.modules.system.entity.SysUser;
  27 +import org.jeecg.modules.system.service.ISysUserService;
  28 +import org.jeecgframework.poi.excel.ExcelImportUtil;
  29 +import org.jeecgframework.poi.excel.def.NormalExcelConstants;
  30 +import org.jeecgframework.poi.excel.entity.ExportParams;
  31 +import org.jeecgframework.poi.excel.entity.ImportParams;
  32 +import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
  33 +import org.jeecg.common.system.base.controller.JeecgController;
  34 +import org.springframework.beans.factory.annotation.Autowired;
  35 +import org.springframework.web.bind.annotation.*;
  36 +import org.springframework.web.multipart.MultipartFile;
  37 +import org.springframework.web.multipart.MultipartHttpServletRequest;
  38 +import org.springframework.web.servlet.ModelAndView;
  39 +import com.alibaba.fastjson.JSON;
  40 +import io.swagger.annotations.Api;
  41 +import io.swagger.annotations.ApiOperation;
  42 +import org.jeecg.common.aspect.annotation.AutoLog;
  43 +
  44 + /**
  45 + * @Description: 采购申请审批
  46 + * @Author: jeecg-boot
  47 + * @Date: 2024-05-23
  48 + * @Version: V1.0
  49 + */
  50 +@Api(tags="采购申请审批")
  51 +@RestController
  52 +@RequestMapping("/bidding_shenq_approval/biddingShenqApproval")
  53 +@Slf4j
  54 +public class BiddingShenqApprovalController extends JeecgController<TblBiddingShenqApproval, ITblBiddingShenqApprovalService> {
  55 + @Autowired
  56 + private ITblBiddingShenqApprovalService tblBiddingShenqApprovalService;
  57 +
  58 + @Autowired
  59 + private ISysUserService sysUserService;
  60 +
  61 + @Autowired
  62 + private ITblBiddingShenqService tblBiddingShenqService;
  63 +
  64 + /**
  65 + * 分页列表查询
  66 + *
  67 + * @param tblBiddingShenqApproval
  68 + * @param pageNo
  69 + * @param pageSize
  70 + * @param req
  71 + * @return
  72 + */
  73 + //@AutoLog(value = "采购申请审批-分页列表查询")
  74 + @ApiOperation(value="采购申请审批-分页列表查询", notes="采购申请审批-分页列表查询")
  75 + @GetMapping(value = "/list")
  76 + public Result<IPage<TblBiddingShenqApproval>> queryPageList(TblBiddingShenqApproval tblBiddingShenqApproval,
  77 + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
  78 + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
  79 + HttpServletRequest req) {
  80 + QueryWrapper<TblBiddingShenqApproval> queryWrapper = QueryGenerator.initQueryWrapper(tblBiddingShenqApproval, req.getParameterMap());
  81 + Page<TblBiddingShenqApproval> page = new Page<TblBiddingShenqApproval>(pageNo, pageSize);
  82 + IPage<TblBiddingShenqApproval> pageList = tblBiddingShenqApprovalService.page(page, queryWrapper);
  83 + return Result.OK(pageList);
  84 + }
  85 +
  86 + /**
  87 + * 添加
  88 + *
  89 + * @param biddingShenqApproval
  90 + * @return
  91 + */
  92 + @AutoLog(value = "采购申请审批-添加")
  93 + @ApiOperation(value="采购申请审批-添加", notes="采购申请审批-添加")
  94 + @PostMapping(value = "/add")
  95 + public Result<String> add(@RequestBody BiddingShenqApproval biddingShenqApproval, HttpServletRequest req) {
  96 +
  97 + String userNameByToken = JwtUtil.getUserNameByToken(req);
  98 + SysUser sysUser = sysUserService.getUserByName(userNameByToken);
  99 + biddingShenqApproval.setApproval(sysUser.getWorkNo());
  100 + TblBiddingShenqApproval tblBiddingShenqApproval = new TblBiddingShenqApproval();
  101 + tblBiddingShenqApproval.setApproval(sysUser.getWorkNo());
  102 + tblBiddingShenqApproval.setApprovalOpinions(biddingShenqApproval.getApprovalOpinions());
  103 + tblBiddingShenqApproval.setIsagree(biddingShenqApproval.getIsagree());
  104 + tblBiddingShenqApprovalService.save(tblBiddingShenqApproval);
  105 +
  106 + //同意，更新采购申请审批状态为审批中
  107 + if(biddingShenqApproval.getIsagree().equals("1")){
  108 + tblBiddingShenqService.updateapprovalStatusByOrderId("1",null,biddingShenqApproval.getOrderId());
  109 + }else if(tblBiddingShenqApproval.getIsagree().equals("2")){
  110 + //不同意，更新采购申请审批状态为审批完成 审批结果为不同意
  111 + tblBiddingShenqService.updateapprovalStatusByOrderId("2","2",biddingShenqApproval.getOrderId());
  112 + }
  113 +
  114 + return Result.OK("添加成功！");
  115 + }
  116 +
  117 + /**
  118 + * 编辑
  119 + *
  120 + * @param tblBiddingShenqApproval
  121 + * @return
  122 + */
  123 + @AutoLog(value = "采购申请审批-编辑")
  124 + @ApiOperation(value="采购申请审批-编辑", notes="采购申请审批-编辑")
  125 + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
  126 + public Result<String> edit(@RequestBody TblBiddingShenqApproval tblBiddingShenqApproval) {
  127 + tblBiddingShenqApprovalService.updateById(tblBiddingShenqApproval);
  128 + return Result.OK("编辑成功!");
  129 + }
  130 +
  131 + /**
  132 + * 通过id删除
  133 + *
  134 + * @param id
  135 + * @return
  136 + */
  137 + @AutoLog(value = "采购申请审批-通过id删除")
  138 + @ApiOperation(value="采购申请审批-通过id删除", notes="采购申请审批-通过id删除")
  139 + @DeleteMapping(value = "/delete")
  140 + public Result<String> delete(@RequestParam(name="id",required=true) String id) {
  141 + tblBiddingShenqApprovalService.removeById(id);
  142 + return Result.OK("删除成功!");
  143 + }
  144 +
  145 + /**
  146 + * 批量删除
  147 + *
  148 + * @param ids
  149 + * @return
  150 + */
  151 + @AutoLog(value = "采购申请审批-批量删除")
  152 + @ApiOperation(value="采购申请审批-批量删除", notes="采购申请审批-批量删除")
  153 + @DeleteMapping(value = "/deleteBatch")
  154 + public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
  155 + this.tblBiddingShenqApprovalService.removeByIds(Arrays.asList(ids.split(",")));
  156 + return Result.OK("批量删除成功!");
  157 + }
  158 +
  159 + /**
  160 + * 通过id查询
  161 + *
  162 + * @param id
  163 + * @return
  164 + */
  165 + //@AutoLog(value = "采购申请审批-通过id查询")
  166 + @ApiOperation(value="采购申请审批-通过id查询", notes="采购申请审批-通过id查询")
  167 + @GetMapping(value = "/queryById")
  168 + public Result<TblBiddingShenqApproval> queryById(@RequestParam(name="id",required=true) String id) {
  169 + TblBiddingShenqApproval tblBiddingShenqApproval = tblBiddingShenqApprovalService.getById(id);
  170 + if(tblBiddingShenqApproval==null) {
  171 + return Result.error("未找到对应数据");
  172 + }
  173 + return Result.OK(tblBiddingShenqApproval);
  174 + }
  175 +
  176 + /**
  177 + * 导出excel
  178 + *
  179 + * @param request
  180 + * @param tblBiddingShenqApproval
  181 + */
  182 + @RequestMapping(value = "/exportXls")
  183 + public ModelAndView exportXls(HttpServletRequest request, TblBiddingShenqApproval tblBiddingShenqApproval) {
  184 + return super.exportXls(request, tblBiddingShenqApproval, TblBiddingShenqApproval.class, "采购申请审批");
  185 + }
  186 +
  187 + /**
  188 + * 通过excel导入数据
  189 + *
  190 + * @param request
  191 + * @param response
  192 + * @return
  193 + */
  194 + @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
  195 + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
  196 + return super.importExcel(request, response, TblBiddingShenqApproval.class);
  197 + }
  198 +
  199 +}
  1 +package org.jeecg.modules.api.controller;
  2 +
  3 +import com.baomidou.mybatisplus.core.metadata.IPage;
  4 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  5 +import io.swagger.annotations.ApiOperation;
  6 +import lombok.extern.slf4j.Slf4j;
  7 +import org.jeecg.common.api.vo.Result;
  8 +import org.jeecg.common.aspect.annotation.AutoLog;
  9 +import org.jeecg.common.system.util.JwtUtil;
  10 +import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
  11 +import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
  12 +import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
  13 +import org.jeecg.modules.system.entity.SysUser;
  14 +import org.jeecg.modules.system.service.ISysUserService;
  15 +import org.springframework.beans.factory.annotation.Autowired;
  16 +import org.springframework.web.bind.annotation.*;
  17 +
  18 +import javax.servlet.http.HttpServletRequest;
  19 +import java.util.Date;
  20 +import java.util.List;
  21 +
  22 +@Slf4j
  23 +@RestController
  24 +@RequestMapping("/trad/biddingSq")
  25 +public class BiddingSqController {
  26 +
  27 + @Autowired
  28 + private ITblBiddingShenqService tblBiddingShenqService;
  29 +
  30 + @Autowired
  31 + private ISysUserService sysUserService;
  32 +
  33 + @ApiOperation(value="tbl_bidding_shenq-分页列表查询1", notes="tbl_bidding_shenq-分页列表查询1")
  34 + @GetMapping(value = "/list")
  35 + public Result<IPage<BiddingShenqForm>> queryPageList(BiddingShenqForm biddingShenqForm,
  36 + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
  37 + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
  38 + HttpServletRequest req) {
  39 +
  40 + String userNameByToken = JwtUtil.getUserNameByToken(req);
  41 + List<String> roleList = sysUserService.getRole(userNameByToken);
  42 + SysUser sysUser = sysUserService.getUserByName(userNameByToken);
  43 + biddingShenqForm.setApplicant(sysUser.getWorkNo());
  44 + Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
  45 + IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
  46 + return Result.OK(pageList);
  47 + }
  48 +
  49 + /**
  50 + * 添加
  51 + *
  52 + * @param tblBiddingShenq
  53 + * @return
  54 + */
  55 + @AutoLog(value = "tbl_bidding_shenq-添加")
  56 + @ApiOperation(value="tbl_bidding_shenq-添加", notes="tbl_bidding_shenq-添加")
  57 + @PostMapping(value = "/add")
  58 + public Result<String> add(@RequestBody TblBiddingShenq tblBiddingShenq, HttpServletRequest request) {
  59 + String currentUserName = JwtUtil.getUserNameByToken(request);
  60 + SysUser sysUser = sysUserService.getUserByName(currentUserName);
  61 + tblBiddingShenq.setSqTime(new Date());
  62 + tblBiddingShenq.setApplicant(sysUser.getWorkNo());
  63 + tblBiddingShenqService.save(tblBiddingShenq);
  64 + return Result.OK("添加成功！");
  65 + }
  66 +
  67 +}
  1 +package org.jeecg.modules.api.controller;
  2 +
  3 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  4 +import com.baomidou.mybatisplus.core.metadata.IPage;
  5 +import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  6 +import lombok.extern.slf4j.Slf4j;
  7 +import org.apache.shiro.SecurityUtils;
  8 +import org.apache.shiro.subject.PrincipalCollection;
  9 +import org.apache.shiro.subject.Subject;
  10 +import org.jeecg.common.api.vo.Result;
  11 +import org.jeecg.common.system.query.QueryGenerator;
  12 +import org.jeecg.common.system.util.JwtUtil;
  13 +import org.jeecg.common.system.vo.LoginUser;
  14 +import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
  15 +import org.jeecg.modules.erp.order_form.service.ITblOrderFormService;
  16 +import org.jeecg.modules.system.entity.SysUser;
  17 +import org.jeecg.modules.system.service.ISysUserService;
  18 +import org.springframework.beans.factory.annotation.Autowired;
  19 +import org.springframework.web.bind.annotation.*;
  20 +
  21 +import javax.servlet.http.HttpServletRequest;
  22 +import java.util.List;
  23 +
  24 +@Slf4j
  25 +@RestController
  26 +@RequestMapping("/order_form/productDesign")
  27 +public class ProductDesignController {
  28 +
  29 + @Autowired
  30 + private ISysUserService sysUserService;
  31 +
  32 + @Autowired
  33 + private ITblOrderFormService tblOrderFormService;
  34 +
  35 + //产品设计订单列表
  36 + @GetMapping(value = "/productDesignList")
  37 + public Result<IPage<TblOrderForm>> getProductDesignList(TblOrderForm tblOrderForm,
  38 + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
  39 + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
  40 + HttpServletRequest req) {
  41 +
  42 + String userNameByToken = JwtUtil.getUserNameByToken(req);
  43 + List<String> roleList = sysUserService.getRole(userNameByToken);
  44 + SysUser sysUser = sysUserService.getUserByName(userNameByToken);
  45 + QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
  46 +// queryWrapper.isNotNull("designer");
  47 +// queryWrapper.in("design_role",roleList);
  48 + queryWrapper.eq("designer", sysUser.getWorkNo());
  49 + Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
  50 + IPage<TblOrderForm> pageList = tblOrderFormService.page(page, queryWrapper);
  51 + return Result.OK(pageList);
  52 + }
  53 +
  54 + // 分派设计人员
  55 + @RequestMapping(value = "/updateDesigner", method = {RequestMethod.PUT,RequestMethod.POST})
  56 + public Result<String> updateDesigner(@RequestBody TblOrderForm tblOrderForm) {
  57 +// tblOrderForm.setAssignDesignDate(new Date());
  58 + tblOrderForm.setAssignDesignStatus("1");
  59 + tblOrderForm.setDesigner(sysUserService.selectByroleCodeUsername(tblOrderForm.getDesignRole(),tblOrderForm.getDesigner()));
  60 + tblOrderFormService.updateDesignerByOrderId(tblOrderForm);
  61 + return Result.OK("分派成功!");
  62 + }
  63 +}
@@ -138,16 +138,16 @@ public class CommonController { @@ -138,16 +138,16 @@ public class CommonController {
138 // 获取文件名 138 // 获取文件名
139 String orgName = mf.getOriginalFilename(); 139 String orgName = mf.getOriginalFilename();
140 orgName = CommonUtils.getFileName(orgName); 140 orgName = CommonUtils.getFileName(orgName);
141 -// if(orgName.indexOf(".")!=-1){  
142 -// fileName = orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."));  
143 -// }else{  
144 -// fileName = orgName+ "_" + System.currentTimeMillis();  
145 -// }  
146 if(orgName.indexOf(".")!=-1){ 141 if(orgName.indexOf(".")!=-1){
147 - fileName = System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf(".")); 142 + fileName = orgName.substring(0, orgName.lastIndexOf(".")) + "_" + System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."));
148 }else{ 143 }else{
149 - fileName = System.currentTimeMillis()+""; 144 + fileName = orgName+ "_" + System.currentTimeMillis();
150 } 145 }
  146 +// if(orgName.indexOf(".")!=-1){
  147 +// fileName = System.currentTimeMillis() + orgName.substring(orgName.lastIndexOf("."));
  148 +// }else{
  149 +// fileName = System.currentTimeMillis()+"";
  150 +// }
151 String savePath = file.getPath() + File.separator + fileName; 151 String savePath = file.getPath() + File.separator + fileName;
152 File savefile = new File(savePath); 152 File savefile = new File(savePath);
153 FileCopyUtils.copy(mf.getBytes(), savefile); 153 FileCopyUtils.copy(mf.getBytes(), savefile);
@@ -59,6 +59,9 @@ public class LoginController { @@ -59,6 +59,9 @@ public class LoginController {
59 @Resource 59 @Resource
60 private BaseCommonService baseCommonService; 60 private BaseCommonService baseCommonService;
61 61
  62 + @Autowired
  63 + private ISysRoleService sysRoleService;
  64 +
62 @ApiOperation("登录接口") 65 @ApiOperation("登录接口")
63 @RequestMapping(value = "/login", method = RequestMethod.POST) 66 @RequestMapping(value = "/login", method = RequestMethod.POST)
64 public Result<JSONObject> login(@RequestBody SysLoginModel sysLoginModel){ 67 public Result<JSONObject> login(@RequestBody SysLoginModel sysLoginModel){
@@ -418,8 +421,11 @@ public class LoginController { @@ -418,8 +421,11 @@ public class LoginController {
418 // 设置token缓存有效时间 421 // 设置token缓存有效时间
419 redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token); 422 redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);
420 redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000); 423 redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME * 2 / 1000);
  424 +
  425 + List<Map<String, String>> maps = sysRoleService.selectByUserId(sysUser.getId());
421 obj.put("token", token); 426 obj.put("token", token);
422 obj.put("userInfo", sysUser); 427 obj.put("userInfo", sysUser);
  428 + obj.put("roles", maps);
423 obj.put("sysAllDictItems", sysDictService.queryAllDictItems()); 429 obj.put("sysAllDictItems", sysDictService.queryAllDictItems());
424 result.setResult(obj); 430 result.setResult(obj);
425 result.success("登录成功"); 431 result.success("登录成功");
@@ -25,6 +25,7 @@ import org.jeecg.modules.system.entity.SysPermissionDataRule; @@ -25,6 +25,7 @@ import org.jeecg.modules.system.entity.SysPermissionDataRule;
25 import org.jeecg.modules.system.entity.SysRole; 25 import org.jeecg.modules.system.entity.SysRole;
26 import org.jeecg.modules.system.entity.SysRolePermission; 26 import org.jeecg.modules.system.entity.SysRolePermission;
27 import org.jeecg.modules.system.model.TreeModel; 27 import org.jeecg.modules.system.model.TreeModel;
  28 +import org.jeecg.modules.system.model.UserRoleModel;
28 import org.jeecg.modules.system.service.ISysPermissionDataRuleService; 29 import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
29 import org.jeecg.modules.system.service.ISysPermissionService; 30 import org.jeecg.modules.system.service.ISysPermissionService;
30 import org.jeecg.modules.system.service.ISysRolePermissionService; 31 import org.jeecg.modules.system.service.ISysRolePermissionService;
@@ -102,6 +103,14 @@ public class SysRoleController { @@ -102,6 +103,14 @@ public class SysRoleController {
102 result.setResult(pageList); 103 result.setResult(pageList);
103 return result; 104 return result;
104 } 105 }
  106 +
  107 +
  108 + //获取角色用户级联下拉
  109 + @RequestMapping("/getUserRoleTreeList")
  110 + public Result<List<UserRoleModel>> getUserRoleTreeList(){
  111 + List<UserRoleModel> userRoleTree = sysRoleService.getUserRoleTree();
  112 + return Result.OK(userRoleTree);
  113 + }
105 114
106 /** 115 /**
107 * 添加 116 * 添加
@@ -6,6 +6,10 @@ import org.apache.ibatis.annotations.Update; @@ -6,6 +6,10 @@ import org.apache.ibatis.annotations.Update;
6 import org.jeecg.modules.system.entity.SysRole; 6 import org.jeecg.modules.system.entity.SysRole;
7 7
8 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 8 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  9 +import org.jeecg.modules.system.model.UserRoleModel;
  10 +
  11 +import java.util.List;
  12 +import java.util.Map;
9 13
10 /** 14 /**
11 * <p> 15 * <p>
@@ -35,4 +39,8 @@ public interface SysRoleMapper extends BaseMapper<SysRole> { @@ -35,4 +39,8 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
35 @Delete("delete from sys_role_permission where role_id = #{roleId}") 39 @Delete("delete from sys_role_permission where role_id = #{roleId}")
36 void deleteRolePermissionRelation(@Param("roleId") String roleId); 40 void deleteRolePermissionRelation(@Param("roleId") String roleId);
37 41
  42 + List<UserRoleModel> getAll();
  43 +
  44 + List<Map<String,String>> selectByUserId(String useId);
  45 +
38 } 46 }
@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param; @@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
8 import org.jeecg.modules.system.entity.SysUser; 8 import org.jeecg.modules.system.entity.SysUser;
9 import com.baomidou.mybatisplus.core.mapper.BaseMapper; 9 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
10 import org.jeecg.modules.system.model.SysUserSysDepartModel; 10 import org.jeecg.modules.system.model.SysUserSysDepartModel;
  11 +import org.jeecg.modules.system.model.UserModel;
11 import org.jeecg.modules.system.vo.SysUserDepVo; 12 import org.jeecg.modules.system.vo.SysUserDepVo;
12 13
13 import java.util.List; 14 import java.util.List;
@@ -157,4 +158,9 @@ public interface SysUserMapper extends BaseMapper<SysUser> { @@ -157,4 +158,9 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
157 * @return 158 * @return
158 */ 159 */
159 List<SysUser> queryByDepIds(@Param("departIds")List<String> departIds,@Param("username") String username); 160 List<SysUser> queryByDepIds(@Param("departIds")List<String> departIds,@Param("username") String username);
  161 +
  162 + List<UserModel> getListByRoleId(String roleId);
  163 +
  164 + String selectByroleCodeUsername(String roleCode,String username);
  165 +
160 } 166 }
  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.system.mapper.SysRoleMapper">
  4 +
  5 + <select id="getAll" resultType="org.jeecg.modules.system.model.UserRoleModel">
  6 + SELECT id, role_name as label,role_code as value from sys_role
  7 + </select>
  8 + <select id="selectByUserId" parameterType="java.lang.String" resultType="java.util.Map">
  9 + 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})
  10 + </select>
  11 +</mapper>
@@ -168,4 +168,13 @@ @@ -168,4 +168,13 @@
168 and username != #{username} 168 and username != #{username}
169 </if> 169 </if>
170 </select> 170 </select>
  171 + <select id="getListByRoleId" resultType="org.jeecg.modules.system.model.UserModel">
  172 + 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}
  173 + </select>
  174 + <select id="selectByroleCodeUsername" resultType="java.lang.String">
  175 + SELECT a.work_no from sys_user a
  176 + left join sys_user_role b on a.id = b.user_id
  177 + left join sys_role c on b.role_id = c.id
  178 + where c.role_code = #{roleCode} and a.username = #{username}
  179 + </select>
171 </mapper> 180 </mapper>
  1 +package org.jeecg.modules.system.model;
  2 +
  3 +import lombok.Data;
  4 +
  5 +import java.io.Serializable;
  6 +
  7 +@Data
  8 +public class UserModel implements Serializable {
  9 +
  10 + private String value;
  11 + private String label;
  12 +}
  1 +package org.jeecg.modules.system.model;
  2 +
  3 +import lombok.Data;
  4 +
  5 +import java.io.Serializable;
  6 +import java.util.List;
  7 +@Data
  8 +public class UserRoleModel implements Serializable {
  9 +
  10 + private String id;
  11 + private String value;
  12 + private String label;
  13 + private List<UserModel> children;
  14 +}
@@ -3,9 +3,13 @@ package org.jeecg.modules.system.service; @@ -3,9 +3,13 @@ package org.jeecg.modules.system.service;
3 import com.baomidou.mybatisplus.extension.service.IService; 3 import com.baomidou.mybatisplus.extension.service.IService;
4 import org.jeecg.common.api.vo.Result; 4 import org.jeecg.common.api.vo.Result;
5 import org.jeecg.modules.system.entity.SysRole; 5 import org.jeecg.modules.system.entity.SysRole;
  6 +import org.jeecg.modules.system.model.UserRoleModel;
6 import org.jeecgframework.poi.excel.entity.ImportParams; 7 import org.jeecgframework.poi.excel.entity.ImportParams;
7 import org.springframework.web.multipart.MultipartFile; 8 import org.springframework.web.multipart.MultipartFile;
8 9
  10 +import java.util.List;
  11 +import java.util.Map;
  12 +
9 /** 13 /**
10 * <p> 14 * <p>
11 * 角色表 服务类 15 * 角色表 服务类
@@ -40,4 +44,8 @@ public interface ISysRoleService extends IService<SysRole> { @@ -40,4 +44,8 @@ public interface ISysRoleService extends IService<SysRole> {
40 */ 44 */
41 public boolean deleteBatchRole(String[] roleids); 45 public boolean deleteBatchRole(String[] roleids);
42 46
  47 + List<UserRoleModel> getUserRoleTree();
  48 +
  49 + List<Map<String,String>> selectByUserId(String useId);
  50 +
43 } 51 }
@@ -280,4 +280,6 @@ public interface ISysUserService extends IService<SysUser> { @@ -280,4 +280,6 @@ public interface ISysUserService extends IService<SysUser> {
280 */ 280 */
281 List<String> userIdToUsername(Collection<String> userIdList); 281 List<String> userIdToUsername(Collection<String> userIdList);
282 282
  283 + String selectByroleCodeUsername(String roleCode,String username);
  284 +
283 } 285 }
@@ -11,6 +11,8 @@ import org.jeecg.modules.quartz.service.IQuartzJobService; @@ -11,6 +11,8 @@ import org.jeecg.modules.quartz.service.IQuartzJobService;
11 import org.jeecg.modules.system.entity.SysRole; 11 import org.jeecg.modules.system.entity.SysRole;
12 import org.jeecg.modules.system.mapper.SysRoleMapper; 12 import org.jeecg.modules.system.mapper.SysRoleMapper;
13 import org.jeecg.modules.system.mapper.SysUserMapper; 13 import org.jeecg.modules.system.mapper.SysUserMapper;
  14 +import org.jeecg.modules.system.model.UserModel;
  15 +import org.jeecg.modules.system.model.UserRoleModel;
14 import org.jeecg.modules.system.service.ISysRoleService; 16 import org.jeecg.modules.system.service.ISysRoleService;
15 import org.jeecgframework.poi.excel.ExcelImportUtil; 17 import org.jeecgframework.poi.excel.ExcelImportUtil;
16 import org.jeecgframework.poi.excel.entity.ImportParams; 18 import org.jeecgframework.poi.excel.entity.ImportParams;
@@ -23,6 +25,7 @@ import java.io.File; @@ -23,6 +25,7 @@ import java.io.File;
23 import java.util.ArrayList; 25 import java.util.ArrayList;
24 import java.util.Arrays; 26 import java.util.Arrays;
25 import java.util.List; 27 import java.util.List;
  28 +import java.util.Map;
26 29
27 /** 30 /**
28 * <p> 31 * <p>
@@ -90,4 +93,21 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl @@ -90,4 +93,21 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
90 this.removeByIds(Arrays.asList(roleIds)); 93 this.removeByIds(Arrays.asList(roleIds));
91 return true; 94 return true;
92 } 95 }
  96 +
  97 + @Override
  98 + public List<UserRoleModel> getUserRoleTree() {
  99 +
  100 + List<UserRoleModel> list = sysRoleMapper.getAll();
  101 + for (UserRoleModel userRoleModel: list) {
  102 + List<UserModel> listByRoleId = sysUserMapper.getListByRoleId(userRoleModel.getId());
  103 + userRoleModel.setChildren(listByRoleId);
  104 + }
  105 +
  106 + return list;
  107 + }
  108 +
  109 + @Override
  110 + public List<Map<String, String>> selectByUserId(String useId) {
  111 + return sysRoleMapper.selectByUserId(useId);
  112 + }
93 } 113 }
@@ -558,4 +558,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl @@ -558,4 +558,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
558 return userList.stream().map(SysUser::getUsername).collect(Collectors.toList()); 558 return userList.stream().map(SysUser::getUsername).collect(Collectors.toList());
559 } 559 }
560 560
  561 + @Override
  562 + public String selectByroleCodeUsername(String roleCode, String username) {
  563 + return userMapper.selectByroleCodeUsername(roleCode, username);
  564 + }
  565 +
561 } 566 }