Browse Source

Merge branch 'test' of jishutao/kede-server into prod

gitadmin 4 months ago
parent
commit
a9359bc8f6

+ 9 - 0
src/main/java/com/goafanti/admin/service/impl/NewAdminServiceImpl.java

@@ -210,21 +210,30 @@ public class NewAdminServiceImpl extends BaseMybatisDao<AdminMapper> implements
 	}
 
 
+	/**
+	 * 用户角色类型
+	 * 用在发起公出判定能否,其他位置待补充
+	 */
 	private int sumType(List<String > roleIds) {
+		//其他角色就是0=其他
 		int type=0;
 		for (String roleId : roleIds) {
 			Role r=userRoleMapper.selectById(roleId);
 			String rt=r.getRoleType().toString();
+			//咨询角色设置成咨询
 			if (rt.equals(AFTConstants.TECH)||rt.equals(AFTConstants.TECH_MANAGER)||rt.equals(AFTConstants.TECH_ADMIN)){
 				type=3;
 				break;
+			//营销角色设置成咨询
 			} else if (rt.equals(AFTConstants.SALESMAN)||rt.equals(AFTConstants.SALESMAN_MANAGER)||rt.equals(AFTConstants.SALESMAN_ADMIN)){
 				type=1;
 				break;
+			//财务角色设置成咨询
 			}else if (rt.equals(AFTConstants.FINANCE)||rt.equals(AFTConstants.FINANCE_MANAGER)||rt.equals(AFTConstants.FINANCE_ADMIN)){
 				type=2;
 				break;
 			}
+
 		}
 		return type;
 	}

+ 4 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -1015,7 +1015,10 @@
     </if>
     <if test="roleType ==2">
     <if test="myType ==0">
-      and (dep.expense_finance_id in  (select id from admin where superior_id = #{current}) or dep.expense_finance_id = #{current})
+      and dep.expense_finance_id in
+      <foreach collection="checkList" item="id" open="(" close=")" separator=",">
+        #{id}
+      </foreach>
     </if>
     </if>
     <if test=" contractNo != null">

File diff suppressed because it is too large
+ 44 - 32
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml


+ 15 - 3
src/main/java/com/goafanti/common/model/PublicRelease.java

@@ -1,17 +1,17 @@
 package com.goafanti.common.model;
 
-import java.io.Serializable;
 import java.util.Date;
+import java.io.Serializable;
 
 
 /**
  * 公出表(PublicRelease)实体类
  *
  * @author makejava
- * @since 2025-09-02 11:22:46
+ * @since 2025-09-19 13:47:05
  */
 public class PublicRelease implements Serializable {
-    private static final long serialVersionUID = 633295198365381700L;
+    private static final long serialVersionUID = -51940966855825670L;
 
     private Integer id;
     /**
@@ -178,6 +178,10 @@ public class PublicRelease implements Serializable {
      * 0=无需多级审核,1=1级审核,2=2级审核,4=完成审核
      */
     private Integer processStatus;
+    /**
+     * 发起人名称
+     */
+    private String aname;
 
 
     public Integer getId() {
@@ -516,5 +520,13 @@ public class PublicRelease implements Serializable {
         this.processStatus = processStatus;
     }
 
+    public String getAname() {
+        return aname;
+    }
+
+    public void setAname(String aname) {
+        this.aname = aname;
+    }
+
 }
 

+ 5 - 6
src/main/java/com/goafanti/core/shiro/token/TokenManager.java

@@ -1,16 +1,14 @@
 package com.goafanti.core.shiro.token;
 
-import java.util.UUID;
-
-import com.goafanti.common.model.AmbSystem;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.session.Session;
-
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.AftUser;
 import com.goafanti.common.model.User;
 import com.goafanti.common.utils.SpringContextUtils;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.session.Session;
+
+import java.util.UUID;
 
 public class TokenManager {
 	private static final String		CSRF_TOKEN	= "CSRF_TOKEN";
@@ -189,6 +187,7 @@ public class TokenManager {
 	public static Admin manageLogin(Admin admin, Boolean rememberMe) {
 		ShiroToken token = new ShiroToken(admin.getMobile(), admin.getPassword());
 		token.setRememberMe(null == rememberMe ? false : rememberMe);
+		//doGetAuthenticationInfo
 		SecurityUtils.getSubject().login(token);
 		return getAdminToken();
 	}

+ 3 - 0
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -1841,6 +1841,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             params.put("roleType",3);
         }else if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
             params.put("roleType",2);
+            List<String> strings = adminMapper.selectBySuperId(TokenManager.getAdminId());
+            strings.add(TokenManager.getAdminId());
+            params.put("checkList",strings);
 
         }else if (TokenManager.hasRole(AFTConstants.FINANCE)){
             params.put("roleType",1);

+ 1 - 1
src/main/java/com/goafanti/order/enums/OrderChangeProcess.java

@@ -18,7 +18,7 @@ public enum OrderChangeProcess {
 	JSZJ(5, "技术总监"),
 	CWZY(6, "财务专员"),
 	CWZJ(7, "财务总监 "),
-	YYBZ(8, "运营保障"),//修改总裁为特殊审核
+	YYBZ(8, "运营保障"),
 	TPSH(9, "特批审核"),//修改总裁为特殊审核
 	DSZ(10, "董事长"),
 	FZC(11, "副总裁"),//已经去掉副总裁

+ 8 - 3
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -293,6 +293,14 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					//
 					if(Objects.equals(nb.getProcessState(), OrderChangeProcess.YXGLY.getCode())){
 						nb.setProcessState(OrderChangeProcess.YYBZ.getCode());
+						if (dep.getOperationGuaranteeId()==null){
+							date.setTime(date.getTime()+100);
+							addOrderChangeLog("无运营保障自动通过", 2, nb.getOrderNo(), nb.getId(),date);
+							completeChange(remarks, nb);
+							return 1;
+						}else {
+							nb.setProcessState(OrderChangeProcess.YYBZ.getCode());
+						}
 					}else if(Objects.equals(nb.getProcessState(), OrderChangeProcess.YYBZ.getCode())){
 						completeChange(remarks, nb);
 						return 1;
@@ -321,9 +329,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 							nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
 						}else if (Objects.equals(nb.getType(), OrderChangeType.ZS.getCode()) || Objects.equals(nb.getType(), OrderChangeType.KJXY.getCode())){
 							nb.setProcessState(OrderChangeProcess.CWZY.getCode());
-						}else if (Objects.equals(nb.getType(), OrderChangeType.JBGGT.getCode())){
-							//新增运营保障审核
-							nb.setProcessState(OrderChangeProcess.YYBZ.getCode());
 						}
 					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.JSY.getCode())){
 						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),0);

+ 4 - 4
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -204,10 +204,10 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"审核状态"));
 			return res;
 		}
-		if (remarks.length()>20) {
-			res.getError().add(buildError("备注长度不能超过20个字符。"));
-			return res;
-		}
+//		if (remarks.length()>20) {
+//			res.getError().add(buildError("备注长度不能超过20个字符。"));
+//			return res;
+//		}
 		res.setData(publicReleaseService.pushExaminePublicRelease(id,status,remarks,0,evaluateType));
 		return res;
 	}

+ 26 - 2
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -121,11 +121,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		StringBuilder str =new StringBuilder();
 		//判定是单独协单还是一起协单
 		in.setAid(TokenManager.getAdminId());
+		in.setAname(my.getName());
 		if (in.getAssist()==1){
 //			in.setAssistAidName(getAssistAidName(in.getAssistAid()));
 			in.setMainName(my.getName());
 			in.setAssistProcess(1);
-
 		}
 		if (in.getType() == 1) {
 			//技术公出
@@ -172,6 +172,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			PublicRelease p=new PublicRelease();
 			p.setId(in.getId());
 			p.setAid(aid2);
+			p.setAname(my2.getName());
 			p.setReleaseStart(in.getReleaseStart());
 			p.setReleaseEnd(in.getReleaseEnd());
 			p.setPlan(in.getPlan());
@@ -317,6 +318,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		PublicRelease p=new PublicRelease();
 		p.setId(in.getId());
 		p.setAid(in.getAid());
+		p.setAname(in.getAname());
 		p.setReleaseStart(in.getReleaseStart());
 		p.setReleaseEnd(in.getReleaseEnd());
 		p.setPlan(in.getPlan());
@@ -452,7 +454,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			String format = getString(my, data,tOrderNew);
 			pushNoticeAndSoucketAndEmail(my, in, date, a, format, map);
 		}
-		map.put("data", publicReleaseMapper.selectDtails(in.getId()));
+		OutPublicRelease outPublicRelease = publicReleaseMapper.selectDtails(in.getId());
+		List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(outPublicRelease.getAid());
+		StringBuffer sb=new StringBuffer();
+		adminPublicReviewerBos.forEach(e->{
+			if (e.getType()==0)sb.append(e.getReviewerName()).append(",");
+		});
+		if(sb.length()>0)outPublicRelease.setReviewerName(sb.toString());
+		map.put("data", outPublicRelease);
 		return map;
 	}
 
@@ -742,6 +751,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				PublicRelease p=new PublicRelease();
 				p.setId(in.getId());
 				p.setAid(aid2);
+				p.setAname(my2.getName());
 				p.setReleaseStart(in.getReleaseStart());
 				p.setReleaseEnd(in.getReleaseEnd());
 				p.setPlan(in.getPlan());
@@ -1788,8 +1798,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			if (!flag2) {
 				PublicRelease np = new PublicRelease();
 				BeanUtils.copyProperties(use,np);
+				AdminListBo my2 = adminMapper.getDeptNameByAid(s);
 				np.setAssist(2);
 				np.setAid(s);
+				np.setAname(my2.getName());
 				//协单审核,判定是否跳过的逻辑
 				np.setType(3);
 				np.setMainId(use.getId());
@@ -2718,6 +2730,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 		if (id==null)id=myPublic.get(0).getId();
 		OutPublicReleaseList out = publicReleaseMapper.selectOutListBoById(id);
+		List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
+		StringBuilder sb = new StringBuilder();
+		adminPublicReviewerBos.forEach(e -> {
+			if (e.getType()==0){
+				sb.append(e.getReviewerName()).append(",");
+			}
+		});
+		if (sb.length()>0) {
+			out.setReviewerName(sb.substring(0,sb.length()-1));
+		}
 		List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPrid(id);
 		List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(id);
 		pushDateClockDetails(prdList,prdcList);
@@ -2814,8 +2836,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		PublicRelease newP= new PublicRelease();
 		if(list.isEmpty()){
 			BeanUtils.copyProperties(p,newP);
+			AdminListBo my2 = adminMapper.getDeptNameByAid(aid);
 			newP.setId(null);
 			newP.setAid(aid);
+			newP.setUserNames(my2.getName());
 			newP.setAssist(3);
 			newP.setType(4);
 			publicReleaseMapper.insertSelective(newP);