雷海东 / factory-java · 提交

转到一个项目

作者 张晓杰
提交 216dcf98710c2ebe5c536e0367fcb3de5c9ca485 1 个父辈 c1dd2bad

采购申请审批

内嵌 并排对比
正在显示 10 个修改的文件 包含 88 行增加 和 19 行删除
@@ -39,6 +39,9 @@ public class BiddingShenqForm implements Serializable { @@ -39,6 +39,9 @@ public class BiddingShenqForm implements Serializable {
39 @ApiModelProperty(value = "订单号") 39 @ApiModelProperty(value = "订单号")
40 private String orderId; 40 private String orderId;
41 41
  42 + private String partNumber;
  43 +
  44 +
42 /**品名*/ 45 /**品名*/
43 @Excel(name = "品名", width = 15) 46 @Excel(name = "品名", width = 15)
44 @ApiModelProperty(value = "品名") 47 @ApiModelProperty(value = "品名")
@@ -144,4 +147,13 @@ public class BiddingShenqForm implements Serializable { @@ -144,4 +147,13 @@ public class BiddingShenqForm implements Serializable {
144 private String chooseStatus; 147 private String chooseStatus;
145 //当前库存 148 //当前库存
146 private String operNumber; 149 private String operNumber;
  150 +
  151 + /**审批状态：0待审批 1审判中 2审批完成*/
  152 + @Excel(name = "审批状态：0待审批 1审判中 2审批完成", width = 15)
  153 + @ApiModelProperty(value = "审批状态：0待审批 1审判中 2审批完成")
  154 + private String approvalStatus;
  155 + /**审批结果：0未通过 1通过*/
  156 + @Excel(name = "审批结果：0未通过 1通过", width = 15)
  157 + @ApiModelProperty(value = "审批结果：0未通过 1通过")
  158 + private String approvalResult;
147 } 159 }
@@ -18,5 +18,5 @@ public interface TblBiddingShenqMapper extends BaseMapper<TblBiddingShenq> { @@ -18,5 +18,5 @@ public interface TblBiddingShenqMapper extends BaseMapper<TblBiddingShenq> {
18 Integer deleteByOrdeId(String orderId); 18 Integer deleteByOrdeId(String orderId);
19 Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page,@Param("biddingShenqForm") BiddingShenqForm biddingShenqForm); 19 Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page,@Param("biddingShenqForm") BiddingShenqForm biddingShenqForm);
20 20
21 - Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String orderId); 21 + Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String partNumber);
22 } 22 }
@@ -19,6 +19,9 @@ @@ -19,6 +19,9 @@
19 <if test="biddingShenqForm.applicant!=null and biddingShenqForm.applicant !=''"> 19 <if test="biddingShenqForm.applicant!=null and biddingShenqForm.applicant !=''">
20 and (a.applicant like concat('%',#{biddingShenqForm.applicant},'%') or a.choose_status = '1') 20 and (a.applicant like concat('%',#{biddingShenqForm.applicant},'%') or a.choose_status = '1')
21 </if> 21 </if>
  22 + <if test="biddingShenqForm.approvalStatus!=null and biddingShenqForm.approvalStatus !=''">
  23 + and a.approval_status like concat('%',#{biddingShenqForm.approvalStatus},'%')
  24 + </if>
22 <if test="biddingShenqForm.productName!=null and biddingShenqForm.productName !=''"> 25 <if test="biddingShenqForm.productName!=null and biddingShenqForm.productName !=''">
23 and a.product_name like concat('%',#{biddingShenqForm.productName},'%') 26 and a.product_name like concat('%',#{biddingShenqForm.productName},'%')
24 </if> 27 </if>
@@ -36,6 +39,6 @@ @@ -36,6 +39,6 @@
36 <if test="approvalStatus != null">approval_status = #{approvalStatus},</if> 39 <if test="approvalStatus != null">approval_status = #{approvalStatus},</if>
37 <if test="approvalResult != null">approval_result = #{approvalResult},</if> 40 <if test="approvalResult != null">approval_result = #{approvalResult},</if>
38 </trim> 41 </trim>
39 - where order_id = #{orderId} 42 + where part_number = #{partNumber}
40 </update> 43 </update>
41 </mapper> 44 </mapper>
@@ -19,5 +19,5 @@ public interface ITblBiddingShenqService extends IService<TblBiddingShenq> { @@ -19,5 +19,5 @@ public interface ITblBiddingShenqService extends IService<TblBiddingShenq> {
19 Integer deleteByOrdeId(String orderId); 19 Integer deleteByOrdeId(String orderId);
20 20
21 Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page, BiddingShenqForm biddingShenqForm); 21 Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page, BiddingShenqForm biddingShenqForm);
22 - Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String orderId); 22 + Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String partNumber);
23 } 23 }
@@ -35,7 +35,7 @@ public class TblBiddingShenqServiceImpl extends ServiceImpl<TblBiddingShenqMappe @@ -35,7 +35,7 @@ public class TblBiddingShenqServiceImpl extends ServiceImpl<TblBiddingShenqMappe
35 } 35 }
36 36
37 @Override 37 @Override
38 - public Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String orderId) {  
39 - return tblBiddingShenqMapper.updateapprovalStatusByOrderId(approvalStatus, approvalResult, orderId); 38 + public Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String partNumber) {
  39 + return tblBiddingShenqMapper.updateapprovalStatusByOrderId(approvalStatus, approvalResult, partNumber);
40 } 40 }
41 } 41 }
@@ -54,6 +54,11 @@ public class TblBiddingShenqApproval implements Serializable { @@ -54,6 +54,11 @@ public class TblBiddingShenqApproval implements Serializable {
54 /**所属部门*/ 54 /**所属部门*/
55 @ApiModelProperty(value = "所属部门") 55 @ApiModelProperty(value = "所属部门")
56 private java.lang.String sysOrgCode; 56 private java.lang.String sysOrgCode;
  57 + /**主料号*/
  58 + @Excel(name = "物料编号", width = 15)
  59 + @ApiModelProperty(value = "物料编号")
  60 + private java.lang.String partNumber;
  61 +
57 /**审批人*/ 62 /**审批人*/
58 @Excel(name = "审批人", width = 15) 63 @Excel(name = "审批人", width = 15)
59 @ApiModelProperty(value = "审批人") 64 @ApiModelProperty(value = "审批人")
@@ -66,4 +71,7 @@ public class TblBiddingShenqApproval implements Serializable { @@ -66,4 +71,7 @@ public class TblBiddingShenqApproval implements Serializable {
66 @Excel(name = "是否同意", width = 15) 71 @Excel(name = "是否同意", width = 15)
67 @ApiModelProperty(value = "是否同意") 72 @ApiModelProperty(value = "是否同意")
68 private java.lang.String isagree; 73 private java.lang.String isagree;
  74 +
  75 + //审批等级
  76 + private java.lang.String approvalLevel;
69 } 77 }
@@ -33,7 +33,7 @@ public class BiddingShenqApproval implements Serializable { @@ -33,7 +33,7 @@ public class BiddingShenqApproval implements Serializable {
33 @ApiModelProperty(value = "主键") 33 @ApiModelProperty(value = "主键")
34 private String id; 34 private String id;
35 35
36 - private String orderId; 36 + private String partNumber;
37 37
38 /**创建人*/ 38 /**创建人*/
39 @ApiModelProperty(value = "创建人") 39 @ApiModelProperty(value = "创建人")
@@ -54,6 +54,7 @@ public class BiddingShenqApproval implements Serializable { @@ -54,6 +54,7 @@ public class BiddingShenqApproval implements Serializable {
54 /**所属部门*/ 54 /**所属部门*/
55 @ApiModelProperty(value = "所属部门") 55 @ApiModelProperty(value = "所属部门")
56 private String sysOrgCode; 56 private String sysOrgCode;
  57 +
57 /**审批人*/ 58 /**审批人*/
58 @Excel(name = "审批人", width = 15) 59 @Excel(name = "审批人", width = 15)
59 @ApiModelProperty(value = "审批人") 60 @ApiModelProperty(value = "审批人")
@@ -66,4 +67,7 @@ public class BiddingShenqApproval implements Serializable { @@ -66,4 +67,7 @@ public class BiddingShenqApproval implements Serializable {
66 @Excel(name = "是否同意", width = 15) 67 @Excel(name = "是否同意", width = 15)
67 @ApiModelProperty(value = "是否同意") 68 @ApiModelProperty(value = "是否同意")
68 private String isagree; 69 private String isagree;
  70 +
  71 + //审批等级
  72 + private java.lang.String approvalLevel;
69 } 73 }
@@ -75,9 +75,6 @@ @@ -75,9 +75,6 @@
75 <if test="qc.workOrder!=null and qc.workOrder !=''"> 75 <if test="qc.workOrder!=null and qc.workOrder !=''">
76 and a.work_order like concat('%',#{qc.workOrder},'%') 76 and a.work_order like concat('%',#{qc.workOrder},'%')
77 </if> 77 </if>
78 - <if test="qc.workOrder!=null and qc.workOrder !=''">  
79 - and a.work_order like concat('%', #{biddingShenqForm.workOrder}, '%')  
80 - </if>  
81 <if test="qc.productType!=null and qc.productType !=''"> 78 <if test="qc.productType!=null and qc.productType !=''">
82 and c.product_type_id like concat('%', #{qc.productType}, '%') 79 and c.product_type_id like concat('%', #{qc.productType}, '%')
83 </if> 80 </if>
@@ -82,37 +82,48 @@ public class BiddingShenqApprovalController extends JeecgController<TblBiddingSh @@ -82,37 +82,48 @@ public class BiddingShenqApprovalController extends JeecgController<TblBiddingSh
82 IPage<TblBiddingShenqApproval> pageList = tblBiddingShenqApprovalService.page(page, queryWrapper); 82 IPage<TblBiddingShenqApproval> pageList = tblBiddingShenqApprovalService.page(page, queryWrapper);
83 return Result.OK(pageList); 83 return Result.OK(pageList);
84 } 84 }
85 - 85 +
86 /** 86 /**
87 * 添加 87 * 添加
88 * 88 *
89 - * @param biddingShenqApproval 89 + * @param tblBiddingShenqApproval
90 * @return 90 * @return
91 */ 91 */
92 @AutoLog(value = "采购申请审批-添加") 92 @AutoLog(value = "采购申请审批-添加")
93 @ApiOperation(value="采购申请审批-添加", notes="采购申请审批-添加") 93 @ApiOperation(value="采购申请审批-添加", notes="采购申请审批-添加")
94 @PostMapping(value = "/add") 94 @PostMapping(value = "/add")
95 - public Result<String> add(@RequestBody BiddingShenqApproval biddingShenqApproval, HttpServletRequest req) { 95 + public Result<String> add(@RequestBody TblBiddingShenqApproval tblBiddingShenqApproval, HttpServletRequest req) {
96 96
97 String userNameByToken = JwtUtil.getUserNameByToken(req); 97 String userNameByToken = JwtUtil.getUserNameByToken(req);
98 SysUser sysUser = sysUserService.getUserByName(userNameByToken); 98 SysUser sysUser = sysUserService.getUserByName(userNameByToken);
99 - biddingShenqApproval.setApproval(sysUser.getWorkNo());  
100 - TblBiddingShenqApproval tblBiddingShenqApproval = new TblBiddingShenqApproval();  
101 tblBiddingShenqApproval.setApproval(sysUser.getWorkNo()); 99 tblBiddingShenqApproval.setApproval(sysUser.getWorkNo());
102 - tblBiddingShenqApproval.setApprovalOpinions(biddingShenqApproval.getApprovalOpinions());  
103 - tblBiddingShenqApproval.setIsagree(biddingShenqApproval.getIsagree());  
104 tblBiddingShenqApprovalService.save(tblBiddingShenqApproval); 100 tblBiddingShenqApprovalService.save(tblBiddingShenqApproval);
105 101
106 //同意，更新采购申请审批状态为审批中 102 //同意，更新采购申请审批状态为审批中
107 - if(biddingShenqApproval.getIsagree().equals("1")){  
108 - tblBiddingShenqService.updateapprovalStatusByOrderId("1",null,biddingShenqApproval.getOrderId()); 103 + if(tblBiddingShenqApproval.getIsagree().equals("1")){
  104 + tblBiddingShenqService.updateapprovalStatusByOrderId("1",null,tblBiddingShenqApproval.getPartNumber());
109 }else if(tblBiddingShenqApproval.getIsagree().equals("2")){ 105 }else if(tblBiddingShenqApproval.getIsagree().equals("2")){
110 //不同意，更新采购申请审批状态为审批完成 审批结果为不同意 106 //不同意，更新采购申请审批状态为审批完成 审批结果为不同意
111 - tblBiddingShenqService.updateapprovalStatusByOrderId("2","2",biddingShenqApproval.getOrderId()); 107 + tblBiddingShenqService.updateapprovalStatusByOrderId("2","2",tblBiddingShenqApproval.getPartNumber());
112 } 108 }
113 109
114 return Result.OK("添加成功！"); 110 return Result.OK("添加成功！");
115 } 111 }
  112 +
  113 + @AutoLog(value = "采购申请审批-添加")
  114 + @ApiOperation(value="采购申请审批-添加", notes="采购申请审批-添加")
  115 + @PostMapping(value = "/add2")
  116 + public Result<String> add2(@RequestBody TblBiddingShenqApproval tblBiddingShenqApproval, HttpServletRequest req) {
  117 +
  118 + String userNameByToken = JwtUtil.getUserNameByToken(req);
  119 + SysUser sysUser = sysUserService.getUserByName(userNameByToken);
  120 + tblBiddingShenqApproval.setApproval(sysUser.getWorkNo());
  121 + tblBiddingShenqApprovalService.save(tblBiddingShenqApproval);
  122 +
  123 + tblBiddingShenqService.updateapprovalStatusByOrderId("2",tblBiddingShenqApproval.getIsagree().equals("1") ? "1":"2",tblBiddingShenqApproval.getPartNumber());
  124 +
  125 + return Result.OK("添加成功！");
  126 + }
116 127
117 /** 128 /**
118 * 编辑 129 * 编辑
@@ -46,6 +46,40 @@ public class BiddingSqController { @@ -46,6 +46,40 @@ public class BiddingSqController {
46 return Result.OK(pageList); 46 return Result.OK(pageList);
47 } 47 }
48 48
  49 + //一级审批
  50 + @GetMapping(value = "/list1")
  51 + public Result<IPage<BiddingShenqForm>> queryPageList1(BiddingShenqForm biddingShenqForm,
  52 + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
  53 + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
  54 + HttpServletRequest req) {
  55 +
  56 + String userNameByToken = JwtUtil.getUserNameByToken(req);
  57 + List<String> roleList = sysUserService.getRole(userNameByToken);
  58 + SysUser sysUser = sysUserService.getUserByName(userNameByToken);
  59 + biddingShenqForm.setApplicant(sysUser.getWorkNo());
  60 + biddingShenqForm.setApprovalStatus("0");//待审批
  61 + Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
  62 + IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
  63 + return Result.OK(pageList);
  64 + }
  65 +
  66 + //二级审批
  67 + @GetMapping(value = "/list2")
  68 + public Result<IPage<BiddingShenqForm>> queryPageList2(BiddingShenqForm biddingShenqForm,
  69 + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
  70 + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
  71 + HttpServletRequest req) {
  72 +
  73 + String userNameByToken = JwtUtil.getUserNameByToken(req);
  74 + List<String> roleList = sysUserService.getRole(userNameByToken);
  75 + SysUser sysUser = sysUserService.getUserByName(userNameByToken);
  76 + biddingShenqForm.setApplicant(sysUser.getWorkNo());
  77 + biddingShenqForm.setApprovalStatus("1");//审批中
  78 + Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
  79 + IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
  80 + return Result.OK(pageList);
  81 + }
  82 +
49 /** 83 /**
50 * 添加 84 * 添加
51 * 85 *