Browse Source

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

anderx 1 year ago
parent
commit
5f16c84314
22 changed files with 203 additions and 193 deletions
  1. 1 0
      .gitignore
  2. 4 0
      src/main/java/com/goafanti/common/constant/AFTConstants.java
  3. 20 23
      src/main/java/com/goafanti/common/controller/BaseController.java
  4. 9 0
      src/main/java/com/goafanti/common/controller/PublicController.java
  5. 0 15
      src/main/java/com/goafanti/common/controller/WebpageController.java
  6. 2 2
      src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml
  7. 26 57
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  8. 14 4
      src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java
  9. 9 0
      src/main/java/com/goafanti/core/mybatis/page/PagintionPlus.java
  10. 14 1
      src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java
  11. 2 0
      src/main/java/com/goafanti/expenseAccount/service/ExpenseAccountService.java
  12. 18 2
      src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java
  13. 9 0
      src/main/java/com/goafanti/order/bo/inuptTaskListBo.java
  14. 4 5
      src/main/java/com/goafanti/order/controller/OrderChangeApiController.java
  15. 32 35
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  16. 2 3
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  17. 4 1
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  18. 13 26
      src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java
  19. 3 3
      src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java
  20. 2 2
      src/main/resources/props/config_local.properties
  21. 1 1
      src/main/resources/props/config_test.properties
  22. 14 13
      src/main/webapp/WEB-INF/views/common.html

+ 1 - 0
.gitignore

@@ -14,3 +14,4 @@
 
 
 
+/qodana.yaml

+ 4 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -71,6 +71,10 @@ public class AFTConstants {
 	public static final String  FINANCE								= "97";
 	/**	营销员 */
 	public static final String  SALESMAN                      		= "96";
+	/**
+	 * 技术转移
+	 */
+	public static final String  TECH_TRANSFER		                = "95";
 	/** 渠道专员 */
 	public static final String  CHANNEL                      		= "80";
 	/** 客服专员 */

+ 20 - 23
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -3,7 +3,6 @@ package com.goafanti.common.controller;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.User;
 import com.goafanti.common.utils.ParamUtils;
 import com.goafanti.common.utils.RedisUtil;
 import com.goafanti.core.shiro.token.TokenManager;
@@ -27,6 +26,7 @@ import java.text.DateFormat;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Objects;
 
 @Controller
 public class BaseController {
@@ -126,13 +126,9 @@ public class BaseController {
 		model.addAttribute("csrf", TokenManager.getCSRF());
 		model.addAttribute("shiro", SecurityUtils.getSubject());
 		model.addAttribute("isAdmin", false);
-		if (TokenManager.isLogin() && TokenManager.getToken() instanceof User) {
-			model.addAttribute("userData", TokenManager.getUserToken());
-			model.addAttribute("userName", TokenManager.getUserToken().getNickname());
-		}
 		if (TokenManager.isLogin() && TokenManager.getToken() instanceof Admin) {
 			model.addAttribute("adminData", TokenManager.getAdminToken());
-			model.addAttribute("userName", TokenManager.getAdminToken().getName());
+			model.addAttribute("userName", Objects.requireNonNull(TokenManager.getAdminToken()).getName());
 			model.addAttribute("departmentId", TokenManager.getAdminToken().getDepartmentId());
 			model.addAttribute("isAdmin", true);
 			model.addAttribute("shiroList", getshiroList());
@@ -155,23 +151,24 @@ public class BaseController {
 	 */
 	public String shiroAddRedis() {
 		redisUtil.deleteString(TokenManager.getAdminId());
-		StringBuffer str=new StringBuffer();
-		if (TokenManager.hasRole(AFTConstants.SALESMAN))str=str.append(1).append(",");
-		if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER))str=str.append(2).append(",");
-		if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN))str=str.append(3).append(",");
-		if (TokenManager.hasRole(AFTConstants.SALESMAN_DIRECTOR))str=str.append(4).append(",");
-		if (TokenManager.hasRole(AFTConstants.FINANCE))str=str.append(5).append(",");
-		if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER))str=str.append(6).append(",");
-		if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN))str=str.append(7).append(",");
-		if (TokenManager.hasRole(AFTConstants.TECH))str=str.append(8).append(",");
-		if (TokenManager.hasRole(AFTConstants.TECH_MANAGER))str=str.append(9).append(",");
-		if (TokenManager.hasRole(AFTConstants.TECH_ADMIN))str=str.append(10).append(",");
-		if (TokenManager.hasRole(AFTConstants.OPERATION_MANAGER))str=str.append(11).append(",");
-		if (TokenManager.hasRole(AFTConstants.CED_ASSISTANT))str=str.append(12).append(",");
-		if (TokenManager.hasRole(AFTConstants.CED))str=str.append(13).append(",");
-		if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT))str=str.append(14).append(",");
-		if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION))str=str.append(15).append(",");
-		if (TokenManager.hasRole(AFTConstants.SUPERADMIN))str=str.append(99).append(",");
+		StringBuffer str= new StringBuffer();
+		if (TokenManager.hasRole(AFTConstants.SALESMAN))str.append(1).append(",");
+		if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER))str.append(2).append(",");
+		if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN))str.append(3).append(",");
+		if (TokenManager.hasRole(AFTConstants.SALESMAN_DIRECTOR))str.append(4).append(",");
+		if (TokenManager.hasRole(AFTConstants.FINANCE))str.append(5).append(",");
+		if (TokenManager.hasRole(AFTConstants.FINANCE_MANAGER))str.append(6).append(",");
+		if (TokenManager.hasRole(AFTConstants.FINANCE_ADMIN))str.append(7).append(",");
+		if (TokenManager.hasRole(AFTConstants.TECH))str.append(8).append(",");
+		if (TokenManager.hasRole(AFTConstants.TECH_MANAGER))str.append(9).append(",");
+		if (TokenManager.hasRole(AFTConstants.TECH_ADMIN))str.append(10).append(",");
+		if (TokenManager.hasRole(AFTConstants.OPERATION_MANAGER))str.append(11).append(",");
+		if (TokenManager.hasRole(AFTConstants.CED_ASSISTANT))str.append(12).append(",");
+		if (TokenManager.hasRole(AFTConstants.CED))str.append(13).append(",");
+		if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT))str.append(14).append(",");
+		if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION))str.append(15).append(",");
+		if (TokenManager.hasRole(AFTConstants.TECH_TRANSFER)) str.append(16).append(",");
+		if (TokenManager.hasRole(AFTConstants.SUPERADMIN))str.append(99).append(",");
 
 		if (str.length()<1)return "0";
 		String shiroList=str.substring(0,str.length()-1);

+ 9 - 0
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -947,4 +947,13 @@ public class PublicController extends CertifyApiController {
 		res.data(adminService.pushStatistics());
 		return res;
 	}
+	@RequestMapping(value = "/pushClockIn",method = RequestMethod.POST)
+	@ResponseBody
+	public Result pushClockIn ( String clokInTime, String userId){
+		Result res =new Result();
+		System.out.println("=====================================================》 clokInTime="+clokInTime);
+		System.out.println("=====================================================》 userId="+userId);
+        res.data("ok");
+        return res;
+	}
 }

+ 0 - 15
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -1,15 +1,11 @@
 package com.goafanti.common.controller;
 
-import com.goafanti.achievement.service.AchievementService;
 import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
 import com.goafanti.common.model.Banners;
-import com.goafanti.demand.service.DemandService;
 import com.goafanti.news.bo.NewsPortalList;
 import com.goafanti.news.enums.NewsType;
 import com.goafanti.news.service.NewsService;
-import com.goafanti.user.service.OrganizationIdentityService;
-import com.goafanti.user.service.UserIdentityService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -22,22 +18,11 @@ import java.util.List;
 @Controller
 public class WebpageController extends BaseController {
 
-	@Resource
-	private DemandService demandService;
-
-	@Resource
-	private AchievementService achievementService;
 
 	@Resource
 	private BannersService bannersService;
 
 	@Resource
-	private UserIdentityService userIdentityService;
-
-	@Resource
-	private OrganizationIdentityService organizationIdentityService;
-
-	@Resource
 	private NewsService newsService;
 
 

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

@@ -597,7 +597,7 @@
     <include refid="selectExpenseAccountSql"/>
   </select>
 
-  <select id="selectExpenseAccountTotalAmount" resultType="java.math.BigDecimal">
+  <select id="selectExpenseAccountTotalAmount" resultType="java.util.Map">
     select sum(a.amount) totalAmount
     from expense_account a
     <if test="type !=null">
@@ -996,7 +996,7 @@
     where 1=1
     <include refid="ExpenseDetailsSql"/>
   </select>
-  <select id="ExpenseDetailsTotalAmount" resultType="java.math.BigDecimal">
+  <select id="ExpenseDetailsTotalAmount" resultType="java.util.Map">
     select sum(ead.amount) totalAmount
     from expense_account_details  ead left join expense_account a on ead.eaid =a.id
     left join expense_relationship er on a.id=er.ea_id  left join expense_account mea on  er.id=mea.id

+ 26 - 57
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1087,6 +1087,13 @@
     on a.id=l.tid  left join t_task_mid ttm  on a.id=ttm.tid left join t_task_member tmer on a.id=tmer.tid
     where  e.delete_sign in (0,2,3)  and e.order_status in (2,4)
     and a.outsource= #{outsource,jdbcType=INTEGER}
+    <include refid="selectOrderTaskListSql"/>
+    order by a.task_distribution_time desc
+    <if test="page_sql!=null">
+      ${page_sql}
+    </if>
+  </select>
+  <sql id="selectOrderTaskListSql">
     <if test="role == 0 ">
       and a.task_receiver= #{aid,jdbcType=VARCHAR}
     </if>
@@ -1132,6 +1139,9 @@
     <if test="name != null">
       and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
     </if>
+    <if test="projectName != null">
+      and a.commodity_name like CONCAT('%',#{projectName,jdbcType=VARCHAR},'%')
+    </if>
     <if test="taskId != null">
       and (a.id= #{taskId,jdbcType=VARCHAR} or a.split_super= #{taskId,jdbcType=VARCHAR})
     </if>
@@ -1144,11 +1154,7 @@
     <if test="startTime != null and endTime != null">
       and e.sign_time between #{startTime} and #{endTime}
     </if>
-    order by a.task_distribution_time desc
-    <if test="page_sql!=null">
-      ${page_sql}
-    </if>
-  </select>
+  </sql>
 
   <select id="selectOrderTaskListCount" resultType="java.lang.Integer">
     select  count(*) from t_order_task a
@@ -1165,63 +1171,26 @@
     </if>
     where e.delete_sign in (0,2,3)  and e.order_status in (2,4)
     and a.outsource= #{outsource,jdbcType=INTEGER}
-    <if test="role == 0 ">
-      and a.task_receiver= #{aid,jdbcType=VARCHAR}
-    </if>
-    <if test="role ==1 and fids != null and fids.size() &gt; 0">
-      and e.finance_id in
-      <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
-        #{item}
-      </foreach>
-    </if>
-    <if test="specially == 0 ">
-      and a.split_status in (0,2)
-    </if>
-    <if test="orderNo != null">
-      and a.order_no= #{orderNo,jdbcType=VARCHAR}
-    </if>
-    <if test="approval ==0">
-      and e.approval = 0
-    </if>
-    <if test="approval ==1">
-      and e.approval in(1,2)
-    </if>
-    <if test="approval ==2">
-      and e.approval in (4,5)
-    </if>
+    <include refid="selectOrderTaskListSql"/>
+  </select>
+
+  <select id="selectOrderTaskListSum"  resultType="java.util.Map">
+    select  sum(a.commodity_price) totalAmount,sum(a.commodity_quantity)totalNumber
+    from t_order_task a
+    left join t_order_new e on a.order_no=e.order_no
     <if test="cid != null">
-      and c.id = #{cid}
-    </if>
-    <if test="outsourceStatus !=null">
-      and l.refund_status = #{outsourceStatus,jdbcType=INTEGER}
-    </if>
-    <if test="contractNo != null">
-      and e.contract_no like CONCAT('%',#{contractNo,jdbcType=VARCHAR},'%')
-    </if>
-    <if test="projectStatus != null">
-      and a.project_status = #{projectStatus,jdbcType=INTEGER}
-    </if>
-    <if test="deps != null">
-      and e.order_dep in
-      <foreach close=")" collection="deps" item="depId" open="(" separator=",">
-        #{depId}
-      </foreach>
+      left join business_project b on a.commodity_id=b.id
+      left join business_category c on b.cid=c.id
     </if>
     <if test="name != null">
-      and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
-    </if>
-    <if test="taskId != null">
-      and (a.id= #{taskId,jdbcType=VARCHAR} or a.split_super= #{taskId,jdbcType=VARCHAR})
-    </if>
-    <if test="taskStatus != null">
-      and a.task_status= #{taskStatus,jdbcType=INTEGER}
-    </if>
-    <if test="adminName != null">
-      and a.receiver_name  like CONCAT('%', #{adminName,jdbcType=VARCHAR},'%')
+      left join user f on e.buyer_id=f.id
     </if>
-    <if test="startTime != null and endTime != null">
-      and e.sign_time between #{startTime} and #{endTime}
+    <if test="outsourceStatus !=null">
+      left join t_order_outsource l on a.id=l.tid
     </if>
+    where e.delete_sign in (0,2,3)  and e.order_status in (2,4)
+    and a.outsource= #{outsource,jdbcType=INTEGER}
+    <include refid="selectOrderTaskListSql"/>
   </select>
   <select id="getOrderTaskDetail" resultType="com.goafanti.order.bo.TOrderTaskDetailBo">
     select

+ 14 - 4
src/main/java/com/goafanti/core/mybatis/BaseMybatisDao.java

@@ -224,12 +224,22 @@ public class BaseMybatisDao<T> extends SqlSessionDaoSupport {
 		} catch (InvocationTargetException e) {
 			e.printStackTrace();
 		}
-		Object o = this.getSqlSession().selectOne(coutnAoumt, params);
-		if (o==null){
+		Map<String,Object> map= this.getSqlSession().selectOne(coutnAoumt, params);
+		if (map==null){
 			res.setTotalAmount(new BigDecimal(0));
 		}else {
-			BigDecimal totalAmount = new BigDecimal(o.toString());
-			res.setTotalAmount(totalAmount);
+			Object totalAmount = map.get("totalAmount");
+			if (totalAmount==null){
+				res.setTotalAmount(new BigDecimal(0));
+			}else {
+				res.setTotalAmount(new BigDecimal(totalAmount.toString()));
+			}
+			Object totalNumber = map.get("totalNumber");
+			if (totalNumber==null){
+				res.setTotalNumber(null);
+			}else {
+				res.setTotalNumber(Integer.valueOf(totalNumber.toString()));
+			}
 		}
 		return res;
 	}

+ 9 - 0
src/main/java/com/goafanti/core/mybatis/page/PagintionPlus.java

@@ -5,6 +5,15 @@ import java.math.BigDecimal;
 public class PagintionPlus<T> extends Pagination{
 
     private BigDecimal totalAmount;
+    private Integer totalNumber;
+
+    public Integer getTotalNumber() {
+        return totalNumber;
+    }
+
+    public void setTotalNumber(Integer totalNumber) {
+        this.totalNumber = totalNumber;
+    }
 
     public BigDecimal getTotalAmount() {
         return totalAmount;

+ 14 - 1
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -393,7 +393,20 @@ public class ExpenseAccountController extends CertifyApiController {
             res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"编号"));
             return  res;
         }
-        return res.data(expenseAccountService.updateTypeOther(   id, typeOther,remarks,orderNo));
+        return res.data(expenseAccountService.updateTypeOther(id, typeOther,remarks,orderNo));
+    }
+
+    /**
+     *  修改报销详情类型说明
+     */
+    @RequestMapping(value = "/updateDetailsTypeOther",method = RequestMethod.POST)
+    public Result updateDetailsTypeOther(Integer id , String typeOther){
+        Result res =new Result();
+        if (id==null){
+            res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"编号"));
+            return  res;
+        }
+        return res.data(expenseAccountService.updateDetailsTypeOther(id, typeOther));
     }
 
     /**

+ 2 - 0
src/main/java/com/goafanti/expenseAccount/service/ExpenseAccountService.java

@@ -72,4 +72,6 @@ public interface ExpenseAccountService {
     Object getDepDetails(Integer id);
 
     Object updateTypeOther(Integer id, String typeOther,String remarks,String orderNo);
+
+    Object updateDetailsTypeOther(Integer id, String typeOther);
 }

+ 18 - 2
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -422,6 +422,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         return 1;
     }
 
+    @Override
+    public Object updateDetailsTypeOther(Integer id, String typeOther) {
+        ExpenseAccountDetails in =new ExpenseAccountDetails();
+        in.setId(id);
+        in.setTypeOther(typeOther);
+        return expenseAccountDetailsMapper.updateByPrimaryKeySelective(in);
+    }
+
 
     private void pushResettingDebit(InputExpenseAccount in, Integer debitId) {
         ExpenseAccount debit = expenseAccountMapper.selectByPrimaryKey(debitId);
@@ -740,14 +748,22 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 }
                 addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
             }else {
-                addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
-                newEa.setStatus(1);
                 //小于为固定单审核,大于可能被配置多人审核
                 if (useEa.getProcessStatus()<EAProcessStatus.CWFS.getCode()){
+                    boolean flag=false;
+                    List<ExpenseAccountExamine> list=expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), useEa.getProcessStatus());
+                    for (ExpenseAccountExamine e : list) {
+                        if (e.getAuditor().equals(TokenManager.getAdminId())){
+                            flag=true;
+                        }
+                    }
+                    if (!flag)throw new BusinessException("审核角色错误。请刷新页面");
                     newEa.setProcessStatus(useEa.getProcessStatus()+1);
                 }else {
                     newEa.setProcessStatus(useEa.getProcessStatus());
                 }
+                addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
+                newEa.setStatus(1);
                 if (newEa.getApproval()==null)newEa.setApproval(useEa.getApproval());
                 //流程的推动
                 examineByprocess(newEa,admin,dep,configDetailsList);

+ 9 - 0
src/main/java/com/goafanti/order/bo/inuptTaskListBo.java

@@ -2,6 +2,7 @@ package com.goafanti.order.bo;
 
 public class inuptTaskListBo {
 	private String name;
+	private String projectName;
 	private String orderNo;
 	private String taskId;
 	private Integer taskStatus;
@@ -19,6 +20,14 @@ public class inuptTaskListBo {
 	private Integer pageNo;
 	private Integer pageSize;
 
+	public String getProjectName() {
+		return projectName;
+	}
+
+	public void setProjectName(String projectName) {
+		this.projectName = projectName;
+	}
+
 	public String getCid() {
 		return cid;
 	}

+ 4 - 5
src/main/java/com/goafanti/order/controller/OrderChangeApiController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Objects;
 
 @RestController
 @RequestMapping(value = "/api/admin/orderChange")
@@ -49,8 +50,6 @@ public class OrderChangeApiController extends CertifyApiController {
 
 	/**
 	 * 新增变更项目
-	 * @param t
-	 * @return
 	 */
 	@RequestMapping(value = "/addChangeTask", method = RequestMethod.POST)
 	public Result addChangeTask(TChangeTask t){
@@ -261,15 +260,15 @@ public class OrderChangeApiController extends CertifyApiController {
 	@RequestMapping(value = "/orderChangeAudit", method = RequestMethod.POST)
 	public Result orderChangeAudit(String changeId,String remarks,Integer status,Integer processState,Integer rejectState){
 		Result res = new Result();
-		if(null==changeId){
+		if(Objects.isNull(changeId)){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "订单编号", "订单编号"));
 			return res;
 		}
-		if(null==status){//2通过 3驳回
+		if(Objects.isNull(status)){//2通过 3驳回
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "审核结果", "审核结果"));
 			return res;
 		}
-		if(null==remarks){
+		if(Objects.isNull(remarks)){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "审核批示", "审核批示"));
 			return res;
 		}

+ 32 - 35
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -186,7 +186,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 	private void addOrderExamineByTask(String orderNo, Integer type, TOrderTaskBo t) {
 		//重报和仅项目变更只需要当事人审核
-		if (type ==OrderChangeType.CB.getCode()|| type ==OrderChangeType.JXMBG.getCode()){
+		if (Objects.equals(type, OrderChangeType.CB.getCode()) || Objects.equals(type, OrderChangeType.JXMBG.getCode())){
 			Integer receiverType=null;
 			if (t.getTaskReceiver()!=null){
 				//等于咨询师 做咨询新增
@@ -207,8 +207,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				orderExamineMapper.insertSelective(o);
 			}
 			//项目及金额、退单不退款、退单退款需要当事人和经理审核,其他不需要咨询师审核
-		}else if (type ==OrderChangeType.XMJJEBG.getCode()|| type ==OrderChangeType.TDBTK.getCode() ||
-					type ==OrderChangeType.TDTK.getCode()){
+		}else if (Objects.equals(type, OrderChangeType.XMJJEBG.getCode()) || Objects.equals(type, OrderChangeType.TDBTK.getCode()) ||
+                Objects.equals(type, OrderChangeType.TDTK.getCode())){
 			if (t.getConsultantId()!=null) {
 				OrderExamine o=new OrderExamine();
 				o.setAid(t.getConsultantId());
@@ -264,7 +264,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		NewOrderChangeBo nb=newOrderChangeMapper.selectByChangeId(changeId);
 		String orderNo=nb.getOrderNo();
 		Department dep = tOrderNewMapper.selectDepByOrderNo(orderNo);
-		if (processState==null||(nb.getProcessState()!=9&&processState !=nb.getProcessState()) ) {
+		if (processState==null||(nb.getProcessState()!=9&& !processState.equals(nb.getProcessState())) ) {
 			throw new BusinessException(new Error( "变更流程与您所操作流程不匹配","变更流程与您所操作流程不匹配"));
 		}
 		if (nb.getStatus()==4) {
@@ -275,9 +275,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		if (status==2) {
 			//变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送 6退单不退款 7仅变更合同
 			if(nb.getType() !=null){
-				if(nb.getType()==OrderChangeType.JBGGT.getCode()){
+				if(Objects.equals(nb.getType(), OrderChangeType.JBGGT.getCode())){
 					//仅合同图片修改:营销-营销总经理
-					if(nb.getProcessState()==OrderChangeProcess.YXGLY.getCode()){
+					if(Objects.equals(nb.getProcessState(), OrderChangeProcess.YXGLY.getCode())){
 						completeChange(remarks, nb);
 						return 1;
 					}
@@ -289,71 +289,70 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				  退单退款:营销-经理-总经理审核-技术员-技术经理-技术总监-财务-财务总监-总裁(副总裁)-董事长(副总裁大于2K,需董事长审核)-财务退票
 				 退单不退款:营销-经理-总经理审核-技术员-技术经理-技术总监-财务-财务总监-总裁(副总裁)-财务退票
 					仅金额:营销-经理-总经理审核-技术总监-财务-财务总监-总裁(副总裁)
-				框架协议审核流程: 营销员发起-营销经理审核-营销管理员审核-财务审核
-				 */
-					if (nb.getProcessState()==OrderChangeProcess.YXJL.getCode()){
+				框架协议审核流程: 营销员发起-营销经理审核-营销管理员审核-财务审核 */
+					if (Objects.equals(nb.getProcessState(), OrderChangeProcess.YXJL.getCode())){
 						nb.setProcessState(OrderChangeProcess.YXGLY.getCode());
-					}else if (nb.getProcessState()==OrderChangeProcess.YXGLY.getCode()){
-						if (nb.getType()==OrderChangeType.CB.getCode()||
-								nb.getType()==OrderChangeType.JXMBG.getCode()||
-								nb.getType()==OrderChangeType.XMJJEBG.getCode()||
-								nb.getType()==OrderChangeType.TDTK.getCode()||
-								nb.getType()==OrderChangeType.TDBTK.getCode()){
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.YXGLY.getCode())){
+						if (Objects.equals(nb.getType(), OrderChangeType.CB.getCode()) ||
+                                Objects.equals(nb.getType(), OrderChangeType.JXMBG.getCode()) ||
+                                Objects.equals(nb.getType(), OrderChangeType.XMJJEBG.getCode()) ||
+                                Objects.equals(nb.getType(), OrderChangeType.TDTK.getCode()) ||
+                                Objects.equals(nb.getType(), OrderChangeType.TDBTK.getCode())){
 							pushZXS(nb, date,1);
-						}else if (nb.getType()==OrderChangeType.JJEBG.getCode()){
+						}else if (Objects.equals(nb.getType(), OrderChangeType.JJEBG.getCode())){
 							nb.setProcessState(OrderChangeProcess.JSZJ.getCode());
-						}else if (nb.getType()==OrderChangeType.ZS.getCode()||nb.getType()==OrderChangeType.KJXY.getCode()){
+						}else if (Objects.equals(nb.getType(), OrderChangeType.ZS.getCode()) || Objects.equals(nb.getType(), OrderChangeType.KJXY.getCode())){
 							nb.setProcessState(OrderChangeProcess.CWZY.getCode());
 						}
-					}else if (nb.getProcessState()==OrderChangeProcess.JSY.getCode()){
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.JSY.getCode())){
 						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),0);
 						pushZXS(nb,date,0);
 						//咨询师审核,将自己审核的全部标记已审核
-					}else if (nb.getProcessState()==OrderChangeProcess.JSJL.getCode()){
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.JSJL.getCode())){
 						//咨询师经理审核,将自己审核的全部标记已审核
 						orderExamineMapper.updateByOrderNoAndAid(orderNo,TokenManager.getAdminId(),1);
 						pushZXSJL(nb,date,0);
-					}else if (nb.getProcessState()==OrderChangeProcess.JSZJ.getCode()){
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.JSZJ.getCode())){
 						nb.setProcessState(OrderChangeProcess.CWZY.getCode());
-					}else if (nb.getProcessState()==OrderChangeProcess.CWZY.getCode()){
-						if (nb.getType()==OrderChangeType.ZS.getCode()){
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.CWZY.getCode())){
+						if (Objects.equals(nb.getType(), OrderChangeType.ZS.getCode())){
 							boolean flag=pushApproval(nb, dep,remarks);
 							if (flag) return 1;
-						}else if (nb.getType()==OrderChangeType.KJXY.getCode()){
+						}else if (Objects.equals(nb.getType(), OrderChangeType.KJXY.getCode())){
 							completeChange(remarks, nb);
 							return 1;
 						}else {
 							nb.setProcessState(OrderChangeProcess.CWZJ.getCode());
 						}
-					}else if (nb.getProcessState()==OrderChangeProcess.CWZJ.getCode()){
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.CWZJ.getCode())){
 						boolean flag=pushApproval(nb, dep,remarks);
 						if (flag){
 							return 1;
 						}
-					}else if(nb.getProcessState()==OrderChangeProcess.TPSH.getCode()) {
-						if (nb.getType()==OrderChangeType.TDTK.getCode()||nb.getType()==OrderChangeType.TDBTK.getCode()) {
+					}else if(Objects.equals(nb.getProcessState(), OrderChangeProcess.TPSH.getCode())) {
+						if (Objects.equals(nb.getType(), OrderChangeType.TDTK.getCode()) || Objects.equals(nb.getType(), OrderChangeType.TDBTK.getCode())) {
 							nb.setStatus(2);
 						}else {
 							completeChange(remarks, nb);
 							return 1;
 						}
-					}else if (nb.getProcessState()==OrderChangeProcess.FZC.getCode()){
-							if (nb.getType()==OrderChangeType.TDTK.getCode()) {
+					}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.FZC.getCode())){
+							if (Objects.equals(nb.getType(), OrderChangeType.TDTK.getCode())) {
 								if (nb.getChangeAmount().compareTo(new BigDecimal("0.2")) < 0) {
 									//小于则总裁通过,大于则董事长
 									nb.setStatus(2);
 								}else {
 									nb.setProcessState(OrderChangeProcess.DSZ.getCode());
 								}
-							}else if (nb.getType()==OrderChangeType.TDBTK.getCode()){
+							}else if (Objects.equals(nb.getType(), OrderChangeType.TDBTK.getCode())){
 								nb.setStatus(2);
 							}else {
 								completeChange(remarks, nb);
 								return 1;
 							}
 
-						}else if (nb.getProcessState()==OrderChangeProcess.DSZ.getCode()){
-							if (nb.getType()==OrderChangeType.TDTK.getCode()||nb.getType()==OrderChangeType.TDBTK.getCode()) {
+						}else if (Objects.equals(nb.getProcessState(), OrderChangeProcess.DSZ.getCode())){
+							if (Objects.equals(nb.getType(), OrderChangeType.TDTK.getCode()) || Objects.equals(nb.getType(), OrderChangeType.TDBTK.getCode())) {
 								nb.setStatus(2);
 							}else {
 								completeChange(remarks, nb);
@@ -366,7 +365,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				nb.setStatus(1);//如果驳回数据则改为正常数据
 			}
 			//通过订单取消记录的驳回位置
-			if (processState==nb.getBackStatus()) {
+			if (processState.equals(nb.getBackStatus())) {
 				nb.setBackStatus(0);
 			}
 		}else {
@@ -417,7 +416,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				nb.setProcessState(OrderChangeProcess.TPSH.getCode());
 			}else {
 				addOrderChangeLog("公司/部门管理审核人员未设置,系统自动通过", 2, nb.getOrderNo(), nb.getId(),date,AFTConstants.SUPERADMIN_ID);
-				if (nb.getType()==OrderChangeType.TDTK.getCode()||nb.getType()==OrderChangeType.TDBTK.getCode()){
+				if (Objects.equals(nb.getType(), OrderChangeType.TDTK.getCode()) || Objects.equals(nb.getType(), OrderChangeType.TDBTK.getCode())){
 					nb.setProcessState(OrderChangeProcess.TPSH.getCode());
 					nb.setStatus(2);
 				}else {
@@ -432,8 +431,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 	/**
 	 *
-	 * @param nb
-	 * @param date
 	 * @param type 0正常审核  1跨流程需要通知
 	 */
 	@Override

+ 2 - 3
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1975,6 +1975,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			outsourceLogMapper.insertSelective(ol);
 			TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(o.getOrderNo());
 			pushGeneralSendNoticeAndEmail(aids, NoticeStatus.PROJECT_OUTSOURCE_START.getCode(),order, TokenManager.getAdminId(),t2.getApproval(),o.getTid());
+		}else {
+			o.setRefundStatus(1);
 		}
 		List<OutPaymentNode> list=paymentNodeMapper.selectByStatus(0);
 		for (OutPaymentNode outPaymentNode : list) {
@@ -1985,9 +1987,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				paymentNodeMapper.updateByPrimaryKeySelective(pn);
 			}
 		}
-		if (o.getStartType()==1) {//供应商无需审核
-			o.setRefundStatus(1);
-		}
 		if (o.getId()==null) {
 			tOrderOutsourceMapper.insertSelective(o);
 		}else {

+ 4 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -386,6 +386,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		params.put("outsource", ib.getOutsource()==null?0:ib.getOutsource());
 		if (null!=ib.getSpecially()) params.put("specially", ib.getSpecially());
 		if (StringUtils.isNotBlank(ib.getName())) params.put("name", ib.getName());
+		if (StringUtils.isNotBlank(ib.getProjectName())) params.put("projectName", ib.getProjectName());
 		if (StringUtils.isNotBlank(ib.getDeps())) params.put("deps", departmentService.parseArray(ib.getDeps()));
 		if (StringUtils.isNotBlank(ib.getOrderNo())) params.put("orderNo", ib.getOrderNo());
 		if (StringUtils.isNotBlank(ib.getContractNo())) params.put("contractNo", ib.getContractNo());
@@ -415,7 +416,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			 fids.add(TokenManager.getAdminId());
 			 params.put("fids",fids);
 		}
-		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectOrderTaskListByPage", "selectOrderTaskListCount", params, ib.getPageNo(), ib.getPageSize());
+		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPagePlus("selectOrderTaskListByPage", "selectOrderTaskListCount",
+				"selectOrderTaskListSum",
+				params, ib.getPageNo(), ib.getPageSize());
 		List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) p.getList();
 		for (TOrderTaskListBo t : list) {
 			if(t.getSplitStatus()==1) {

+ 13 - 26
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -1,35 +1,23 @@
 package com.goafanti.organization.controller;
 
 
-
-import java.io.IOException;
-import java.math.BigDecimal;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
-import com.goafanti.common.model.OfficialFeePrice;
-import com.goafanti.common.model.PatentPrice;
-import com.goafanti.common.model.PaymentLog;
-import com.goafanti.common.model.SoftWritingPrice;
-import com.goafanti.common.model.TOrderPayment;
-import com.goafanti.common.model.ThirdPartyCompany;
+import com.goafanti.common.model.*;
 import com.goafanti.common.utils.StringUtils;
-import com.goafanti.organization.bo.InputNodeList;
-import com.goafanti.organization.bo.InputPaymentList;
-import com.goafanti.organization.bo.InputPaymentNode;
-import com.goafanti.organization.bo.InuptFinancialPayment;
-import com.goafanti.organization.bo.ThirdPartyError;
+import com.goafanti.organization.bo.*;
 import com.goafanti.organization.service.ThirdPartyCompanyService;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.math.BigDecimal;
 
 
 
@@ -42,10 +30,9 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 
 	/**
 	 * 新增第三方机构
-	 * @param t
 	 * @param calculation 0 其他 1软著 2专利
 	 *  patentType 专利名称 0实用新型 1发明专利 2外观专利 3 其他
-	 *  startType  0外包 1供应商  外包全为输入,供应商才分软著和专利从后台选取
+	 *  startType  0外包 1供应商 2专利转让  外包全为输入,供应商才分软著和专利从后台选取
 	 * @param type  type 0正常新增 1发起后新增
 	 * 	type=1用于发起供应商后,用来计算成本,正常则在发起时计算
 	 * @return

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

@@ -179,6 +179,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		String str="["+my.getName()+"]发起["+nickname+"]的外出申请,请及时审核。";
 		//默认上级审核
 		AtomicReference<Integer> status= new AtomicReference<>(1);
+		String formatDate = DateUtils.formatDate(in.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 		Map<String, Object>map=new HashMap<String, Object>();
 		//不是业务员
 		if (in.getType()==0){
@@ -203,15 +204,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				users.forEach(u->{
 					if (!u.getAid().equals(my.getId())){
 						StringBuffer str2=new StringBuffer();
-						str2=str2.append("业务员").append(my.getName()).append("(无需审核),准备公出您的企业");
-						str2=str2.append("[").append(u.getNickname()).append("]!!!");
+						str2=str2.append(my.getName()).append("计划公出您的企业").append(u.getNickname())
+								.append(",").append(formatDate).append("【小程序端广播提示】");
 						sendNoticeAndSoucket(u.getAid(),3,str2.toString());
 					}
 				});
 
 			}
 		}
-
 		if (status.get()==1){
 			pushNoticeAndSoucketAndEmail(my, in, date, a, str, map);
 		}

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -51,8 +51,8 @@ yxjl_max=100
 
 amb.maxLvl=6
 
-static.host=//static.jishutao.com/1.3.07
-#static.host=//172.16.1.187/1.3.04
+#static.host=//static.jishutao.com/1.3.09
+static.host=//172.16.1.187/1.3.09
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62
 avatar.host=//static.jishutao.com

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -52,7 +52,7 @@ amb.maxLvl=6
 
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.3.07
+static.host=//static.jishutao.com/1.3.09
 rd.static.host=//static.jishutao.com/RD/1.0.03
 avatar.upload.host=//static.jishutao.com/upload
 

+ 14 - 13
src/main/webapp/WEB-INF/views/common.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:th="http://www.thymeleaf.org"
-	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+	  xmlns:th="http://www.thymeleaf.org"
+>
 
 <head th:fragment="header(title, link)">
 <meta charset="utf-8" />
@@ -229,17 +229,17 @@
 						用户登录<a href="/user/signIn.html">免费注册有好礼呦!!</a>
 					</h5>
 					<form id="form_login">
-						<div class="login_uesr">
-							<label for="uesname"><img
-								th:src="${portalHost+'/img/login_use.png'}" /></label> <input
-								type="text" name="mobile" id="Lo_user" placeholder="请输入手机号码" />
-							<img th:src="${portalHost+'/img/login_del.png'}" class="log_del" />
-						</div>
-						<div class="login_pass">
-							<label for="pass"><img
-								th:src="${portalHost+'/img/login_password.png'}" /></label> <input
-								type="password" name="password" id="Lo_pass" placeholder="请输入密码" />
-						</div>
+<!--						<div class="login_uesr">-->
+<!--							<label for="uesname"><img-->
+<!--								th:src="${portalHost+'/img/login_use.png'}" /></label> <input-->
+<!--								type="text" name="mobile" id="Lo_user" placeholder="请输入手机号码" />-->
+<!--							<img th:src="${portalHost+'/img/login_del.png'}" class="log_del" />-->
+<!--						</div>-->
+<!--						<div class="login_pass">-->
+<!--							<label for="pass"><img-->
+<!--								th:src="${portalHost+'/img/login_password.png'}" /></label> <input-->
+<!--								type="password" name="password" id="Lo_pass" placeholder="请输入密码" />-->
+<!--						</div>-->
 						<div class="login_check">
 							<label for="checks" class="lab_check"> <input
 								type="checkbox" name="type" id="checks" value="0" />专家登录
@@ -369,6 +369,7 @@
 				isSuperAdmin : /*[[${shiro.hasRole('999999')}]]*/false,
 				isApprovalDecision : /*[[${shiro.hasRole('99999')}]]*/false,
 				isLegal: /*[[${shiro.hasRole('82')}]]*/false,
+				isTechTransfer: /*[[${shiro.hasRole('95')}]]*/false,
 				shiroList:/*[[${shiroList}]]*/'',
 			}
 			/*]]>*/