采购申请审批

@@ -39,6 +39,9 @@ public class BiddingShenqForm implements Serializable {
     @ApiModelProperty(value = "订单号")
     private String orderId;
 
+    private String partNumber;
+
+
 	/**品名*/
 	@Excel(name = "品名", width = 15)
     @ApiModelProperty(value = "品名")
@@ -144,4 +147,13 @@ public class BiddingShenqForm implements Serializable {
     private String chooseStatus;
     //当前库存
     private String operNumber;
+
+    /**审批状态：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;
 }

@@ -18,5 +18,5 @@ 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);
+    Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String partNumber);
 }

@@ -19,6 +19,9 @@
         <if test="biddingShenqForm.applicant!=null and biddingShenqForm.applicant !=''">
             and (a.applicant like concat('%',#{biddingShenqForm.applicant},'%') or a.choose_status = '1')
         </if>
+        <if test="biddingShenqForm.approvalStatus!=null and biddingShenqForm.approvalStatus !=''">
+            and a.approval_status like concat('%',#{biddingShenqForm.approvalStatus},'%')
+        </if>
         <if test="biddingShenqForm.productName!=null and biddingShenqForm.productName !=''">
             and a.product_name like concat('%',#{biddingShenqForm.productName},'%')
         </if>
@@ -36,6 +39,6 @@
             <if test="approvalStatus != null">approval_status = #{approvalStatus},</if>
             <if test="approvalResult != null">approval_result = #{approvalResult},</if>
         </trim>
-        where order_id = #{orderId}
+        where part_number = #{partNumber}
     </update>
 </mapper>
\ No newline at end of file

@@ -19,5 +19,5 @@ 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);
+    Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String partNumber);
 }

@@ -35,7 +35,7 @@ public class TblBiddingShenqServiceImpl extends ServiceImpl<TblBiddingShenqMappe
     }
 
     @Override
-    public Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String orderId) {
-        return tblBiddingShenqMapper.updateapprovalStatusByOrderId(approvalStatus, approvalResult, orderId);
+    public Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String partNumber) {
+        return tblBiddingShenqMapper.updateapprovalStatusByOrderId(approvalStatus, approvalResult, partNumber);
     }
 }

@@ -54,6 +54,11 @@ public class TblBiddingShenqApproval implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
+    /**主料号*/
+    @Excel(name = "物料编号", width = 15)
+    @ApiModelProperty(value = "物料编号")
+    private java.lang.String partNumber;
+
 	/**审批人*/
 	@Excel(name = "审批人", width = 15)
     @ApiModelProperty(value = "审批人")
@@ -66,4 +71,7 @@ public class TblBiddingShenqApproval implements Serializable {
 	@Excel(name = "是否同意", width = 15)
     @ApiModelProperty(value = "是否同意")
     private java.lang.String isagree;
+
+	//审批等级
+    private java.lang.String approvalLevel;
 }

@@ -33,7 +33,7 @@ public class BiddingShenqApproval implements Serializable {
     @ApiModelProperty(value = "主键")
     private String id;
 
-	private String orderId;
+	private String partNumber;
 
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
@@ -54,6 +54,7 @@ public class BiddingShenqApproval implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
+
 	/**审批人*/
 	@Excel(name = "审批人", width = 15)
     @ApiModelProperty(value = "审批人")
@@ -66,4 +67,7 @@ public class BiddingShenqApproval implements Serializable {
 	@Excel(name = "是否同意", width = 15)
     @ApiModelProperty(value = "是否同意")
     private String isagree;
+
+    //审批等级
+    private java.lang.String approvalLevel;
 }

@@ -75,9 +75,6 @@
         <if test="qc.workOrder!=null and qc.workOrder !=''">
             and a.work_order like concat('%',#{qc.workOrder},'%')
         </if>
-        <if test="qc.workOrder!=null and qc.workOrder !=''">
-            and a.work_order like concat('%', #{biddingShenqForm.workOrder}, '%')
-        </if>
         <if test="qc.productType!=null and qc.productType !=''">
             and c.product_type_id like concat('%', #{qc.productType}, '%')
         </if>

@@ -82,37 +82,48 @@ public class BiddingShenqApprovalController extends JeecgController<TblBiddingSh
 		IPage<TblBiddingShenqApproval> pageList = tblBiddingShenqApprovalService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
-	 * @param biddingShenqApproval
+	 * @param tblBiddingShenqApproval
 	 * @return
 	 */
 	@AutoLog(value = "采购申请审批-添加")
 	@ApiOperation(value="采购申请审批-添加", notes="采购申请审批-添加")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody BiddingShenqApproval biddingShenqApproval, HttpServletRequest req) {
+	public Result<String> add(@RequestBody TblBiddingShenqApproval tblBiddingShenqApproval, 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());
+		if(tblBiddingShenqApproval.getIsagree().equals("1")){
+			tblBiddingShenqService.updateapprovalStatusByOrderId("1",null,tblBiddingShenqApproval.getPartNumber());
 		}else if(tblBiddingShenqApproval.getIsagree().equals("2")){
 			//不同意，更新采购申请审批状态为审批完成 审批结果为不同意
-			tblBiddingShenqService.updateapprovalStatusByOrderId("2","2",biddingShenqApproval.getOrderId());
+			tblBiddingShenqService.updateapprovalStatusByOrderId("2","2",tblBiddingShenqApproval.getPartNumber());
 		}
 
 		return Result.OK("添加成功！");
 	}
+
+	 @AutoLog(value = "采购申请审批-添加")
+	 @ApiOperation(value="采购申请审批-添加", notes="采购申请审批-添加")
+	 @PostMapping(value = "/add2")
+	 public Result<String> add2(@RequestBody TblBiddingShenqApproval tblBiddingShenqApproval, HttpServletRequest req) {
+
+		 String userNameByToken = JwtUtil.getUserNameByToken(req);
+		 SysUser sysUser = sysUserService.getUserByName(userNameByToken);
+		 tblBiddingShenqApproval.setApproval(sysUser.getWorkNo());
+		 tblBiddingShenqApprovalService.save(tblBiddingShenqApproval);
+
+		 tblBiddingShenqService.updateapprovalStatusByOrderId("2",tblBiddingShenqApproval.getIsagree().equals("1") ? "1":"2",tblBiddingShenqApproval.getPartNumber());
+
+		 return Result.OK("添加成功！");
+	 }
 	
 	/**
 	 *  编辑

@@ -46,6 +46,40 @@ public class BiddingSqController {
         return Result.OK(pageList);
     }
 
+    //一级审批
+    @GetMapping(value = "/list1")
+    public Result<IPage<BiddingShenqForm>> queryPageList1(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());
+        biddingShenqForm.setApprovalStatus("0");//待审批
+        Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
+        IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
+        return Result.OK(pageList);
+    }
+
+    //二级审批
+    @GetMapping(value = "/list2")
+    public Result<IPage<BiddingShenqForm>> queryPageList2(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());
+        biddingShenqForm.setApprovalStatus("1");//审批中
+        Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
+        IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
+        return Result.OK(pageList);
+    }
+
     /**
      *   添加
      *