Browse Source

政策-是否领导审批

yangzian 4 years ago
parent
commit
84821f2ab4

+ 14 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -219,7 +219,7 @@ public class CwjsPolicyInfoController {
 	 }
 
 
-	 @Autowired
+	 @Resource
 	 private CwjsSaleAssistantInfoMapper cwjsSaleAssistantInfoMapper;
 	/**
 	  * 分页列表查询
@@ -287,6 +287,19 @@ public class CwjsPolicyInfoController {
 			if(!Check.isNull(log)){
 				cwjsPolicy.setApprovalContent(log.getApprovalContent());
 			}
+
+			//根据主体查询 最后一个审核人员
+			CwjsCompanyApprovalUser approvalUser = companyApprovalUserMapper.getEndApprovalUserBySub(cwjsPolicy.getCompanySubjectId());
+			//政策 当前用户 不是 最后一个审核人 ||  审核人是老板   && 状态不为3 审核通过
+			// 则不显示 转领导审批
+			if ((cwjsPolicy.getApprovedProgress().equals(userId) || cwjsPolicy.getApprovedProgress().equals("4aba62011120ac565c7f2b9f8f4aa96b"))
+					&& cwjsPolicy.getApprovedStatus() != 3){
+				cwjsPolicy.setTheBossRight("yes");
+			}else {
+				cwjsPolicy.setTheBossRight("no");
+			}
+
+
 			//所有人只要能看到就能有查看的按钮
             cwjsPolicy.setOperation("查看");
 

+ 6 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/entity/CwjsPolicyInfo.java

@@ -59,7 +59,7 @@ public class CwjsPolicyInfo implements Serializable{
 	@Excel(name = "状态 0:待审核 1:审核中 2:审核通过3:审核拒绝", width = 15)
     @ApiModelProperty(value = "状态 0:待审核 1:审核中 2:审核通过3:审核拒绝")
 	private Integer approvedStatus;
-	@ApiModelProperty(value = "审核进度,当前该谁审核")
+	@ApiModelProperty(value = "审核进度,当前该谁审核,审核人")
 	private String approvedProgress;
 	/**是否预付:0:否  1:是 */
 	@Excel(name = "是否预付:0:否  1:是 ", width = 15)
@@ -149,4 +149,9 @@ public class CwjsPolicyInfo implements Serializable{
 	/**区域 华北,华南,华东*/
 	@TableField(exist = false)
 	private String areaInfo;
+
+
+	/* 是否显示老板审批的 操作 yes显示 no 不显示*/
+	@TableField(exist = false)
+	private String theBossRight;
 }

+ 8 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/CwjsCompanyApprovalUserMapper.java

@@ -20,4 +20,12 @@ public interface CwjsCompanyApprovalUserMapper extends BaseMapper<CwjsCompanyApp
     List<CwjsCompanyApprovalUser> queryByCompanySubjectId(Integer companySubjectId);
 
     CwjsCompanyApprovalUser queryByCompanySubjectIdAndLevel(Integer companySubjectId, Integer level);
+
+
+    /**
+     * 根据主体查询 最后一个审核人员
+     * @param companySubjectId
+     * @return
+     */
+    CwjsCompanyApprovalUser getEndApprovalUserBySub(Integer companySubjectId);
 }

+ 13 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsCompanyApprovalUserMapper.xml

@@ -13,4 +13,17 @@
     <select id="queryByCompanySubjectIdAndLevel" resultType="org.jeecg.ctop.finance.policy.entity.CwjsCompanyApprovalUser">
         select * from ctop_cwjs_company_approval_user where company_subject_id = #{companySubjectId} and level = #{level}
     </select>
+
+
+
+<!-- 根据主体查询 最后一个审核人员-->
+    <select id="getEndApprovalUserBySub" resultType="org.jeecg.ctop.finance.policy.entity.CwjsCompanyApprovalUser">
+        select * from ctop_cwjs_company_approval_user
+        where del_flag = 0
+        and company_subject_id = #{companySubjectId}
+        ORDER BY level DESC
+            limit 1
+    </select>
+
+
 </mapper>

+ 9 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/ICwjsCompanyApprovalUserService.java

@@ -11,4 +11,13 @@ import org.jeecg.ctop.finance.policy.entity.CwjsCompanyApprovalUser;
  */
 public interface ICwjsCompanyApprovalUserService extends IService<CwjsCompanyApprovalUser> {
 
+
+    /**
+     * 根据主体查询 最后一个审核人员
+     * @param companySubjectId
+     * @return
+     */
+    CwjsCompanyApprovalUser getEndApprovalUserBySub(Integer companySubjectId);
+
+
 }

+ 17 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsCompanyApprovalUserServiceImpl.java

@@ -7,6 +7,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+
 /**
  * 政策审核人员配置
  * @author jeecg-boot
@@ -16,4 +18,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class CwjsCompanyApprovalUserServiceImpl extends ServiceImpl<CwjsCompanyApprovalUserMapper, CwjsCompanyApprovalUser> implements ICwjsCompanyApprovalUserService {
 
+
+    @Resource
+    private CwjsCompanyApprovalUserMapper cwjsCompanyApprovalUserMapper;
+
+
+
+     /**
+     * 根据主体查询 最后一个审核人员
+     * @param companySubjectId
+     * @return
+     */
+    @Override
+    public CwjsCompanyApprovalUser getEndApprovalUserBySub(Integer companySubjectId) {
+        return cwjsCompanyApprovalUserMapper.getEndApprovalUserBySub(companySubjectId);
+    }
 }