Browse Source

新建完成修改订单状态

anderx 3 years ago
parent
commit
992ade7169

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

@@ -1742,7 +1742,7 @@
     <if test="shiroType ==2">
       left join department d on b.order_dep =d.id
     </if>
-    where  b.approval in (0,1,2)
+    where  b.delete_sign in (0,2) and b.approval in (0,1,2)
     <if test="shiroType ==1">
       and a.process_status in (1,2,3,4)
       and b.salesman_id = #{aid}
@@ -1810,7 +1810,7 @@
       <if test="shiroType ==2">
         left join department d on b.order_dep =d.id
       </if>
-      where  b.approval in (0,1,2)
+      where  b.delete_sign in (0,2) and b.approval in (0,1,2)
       <if test="shiroType ==1">
         and a.process_status in (1,2,3,4)
         and b.salesman_id = #{aid}

+ 0 - 1
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -78,7 +78,6 @@ public class ReleaseUserTask {
 				userTmpList = customerService.selectReleaseUserDays(u.getId());
 				for (userDaysBo ub : userTmpList) {
 					String str=null;
-					System.out.println(ub.getName());
 					if (ub.getChannel() == 0) {
 						String shareType="";
 						if(ub.getNewChannel()==0)shareType="私有";

+ 28 - 29
src/main/java/com/goafanti/common/utils/ExcelUtils.java

@@ -41,11 +41,11 @@ import java.util.regex.Matcher;
 public class ExcelUtils {
 	private Set<Integer> vacantRows = new HashSet<Integer>(); //数据不完整的
 	private final String DEFAULT_MOBILE = "0000-0000000";
-	DecimalFormat df = new DecimalFormat("0");  
+	DecimalFormat df = new DecimalFormat("0");
 	@SuppressWarnings ("resource")
 	public  Set<CustomerExcelBo> parseExcel(String excelPath) throws IOException{
 		InputStream excelFile = new FileInputStream(new File(excelPath));
-		XSSFWorkbook wb = new XSSFWorkbook(excelFile);	
+		XSSFWorkbook wb = new XSSFWorkbook(excelFile);
 		Set<CustomerExcelBo> result = new HashSet<CustomerExcelBo>();
 		XSSFSheet sheet = wb.getSheetAt(0);
 		Iterator<Row> rowIterator = sheet.iterator();
@@ -82,13 +82,13 @@ public class ExcelUtils {
 		}
 		return result;
 	}
-	
+
 	private String checkCustomerType(String customerType,int rowNumber){
 		if(StringUtils.isEmpty(customerType)) {
 			vacantRows.add(rowNumber);
 			return "";
 		}
-		if(customerType.equals("个人客户")) return "0"; 
+		if(customerType.equals("个人客户")) return "0";
 		if(customerType.equals("单位客户")) return "1";
 		vacantRows.add(rowNumber);
 		return "";
@@ -151,19 +151,19 @@ public class ExcelUtils {
 		vacantRows.add(rowNumber);
 		return "";
 	}*/
-	
+
 	private String checkOther(String cellValue,int rowNumber,int maxLength){
 		if(StringUtils.isBlank(cellValue) || cellValue.length() > maxLength){
 			vacantRows.add(rowNumber);
 			return "";
 		}else{
 			return String.valueOf(cellValue).trim();
-		} 
+		}
 	}
 
 	public String checkMobile(String mobile, int rowNumber){
 		mobile = mobile.trim();
-		String mobileRegex = "^1[3|4|5|7|8][0-9]{9}$"; 
+		String mobileRegex = "^1[3|4|5|7|8][0-9]{9}$";
 		String telRegex = "^\\d{3,4}-\\d{7,8}$";
 		if(StringUtils.isBlank(mobile)) return "";
 		if(DEFAULT_MOBILE.equals(mobile)) return mobile;
@@ -173,20 +173,20 @@ public class ExcelUtils {
 		}
 		return mobile;
 	}
-	
+
 	public String getVacantRows(){
 		if(vacantRows.size()>0)
 			return StringUtils.join(vacantRows.toArray(),",")+" 行数据不全或格式有误;";
-		else 
+		else
 			return "";
 	}
-	
-	
-	
+
+
+
 	@SuppressWarnings("resource")
 	public  Set<OrderReportBo> parseOrderExcel(String excelPath) throws IOException{
 		InputStream excelFile = new FileInputStream(new File(excelPath));
-		XSSFWorkbook wb = new XSSFWorkbook(excelFile);	
+		XSSFWorkbook wb = new XSSFWorkbook(excelFile);
 		Set<OrderReportBo> result = new HashSet<OrderReportBo>();
 		XSSFSheet sheet = wb.getSheetAt(0);
 		Iterator<Row> rowIterator = sheet.iterator();
@@ -199,7 +199,7 @@ public class ExcelUtils {
 			currentRow = rowIterator.next();
 			Iterator<Cell> cellIterator = currentRow.iterator();
 			OrderReportBo bo = new OrderReportBo();
-			
+
 			bo.setSaleName(checkEmptyStr(cellIterator.next().getStringCellValue(),rowNumber));
 			//电话
 			Cell cell = cellIterator.next();
@@ -235,18 +235,18 @@ public class ExcelUtils {
 		}
 		return result;
 	}
-	
+
 	private Integer checkOrderType(String OrderType,int rowNumber){
 		if(checkEmpty(OrderType, rowNumber)){
 			return null;
 		}
-		if(OrderType.equals("认证项目")) return 0; 
+		if(OrderType.equals("认证项目")) return 0;
 		if(OrderType.equals("科技项目")) return 1;
 		vacantRows.add(rowNumber);
 		return null;
 	}
 	private Integer checkOrderMonth(String month,int rowNumber){
-		
+
 		if(checkEmpty(month, rowNumber)){
 			return null;
 		}
@@ -276,7 +276,6 @@ public class ExcelUtils {
 				return re;
 			}else{
 				String ym = new SimpleDateFormat("yyyy").format(new Date()) + (m>10?m:"0"+m);
-				System.out.println(ym);
 				return Integer.valueOf(ym);
 			}
 		}else{
@@ -300,11 +299,11 @@ public class ExcelUtils {
 			return str;
 		}
 	}
-	
+
 	//检查表头
-	
 
-	
+
+
 	// 2007 版本以上 最大支持1048576行
     public final static String EXCEL_FILE_2007 = "2007";
     // 2003 版本 最大支持65536 行
@@ -318,7 +317,7 @@ public class ExcelUtils {
      * @param out     输出流
      * @param version 2003 或者 2007,不传时默认生成2003版本
      * @return void
-     * @author 
+     * @author
      * @date 2018-8-2
      */
     public void exportExcel(String title, Collection<T> dataset, OutputStream out, String version) {
@@ -338,7 +337,7 @@ public class ExcelUtils {
      * @param out     输出流
      * @param version 2003 或者 2007,不传时默认生成2003版本
      * @return void
-     * @author 
+     * @author
      * @date 2018-8-2
      */
     public void exportExcel(String title, String[] headers, Collection<T> dataset, OutputStream out, String version) {
@@ -361,7 +360,7 @@ public class ExcelUtils {
      * @param out     与输出设备关联的流对象,可以将EXCEL文档导出到本地文件或者网络中
      * @param pattern 如果有时间数据,设定输出格式。默认为"yyyy-MM-dd hh:mm:ss"
      * @return void
-     * @author 
+     * @author
      * @date 2018-8-2
      */
     @SuppressWarnings({"unchecked", "rawtypes"})
@@ -527,7 +526,7 @@ public class ExcelUtils {
      * @param out     与输出设备关联的流对象,可以将EXCEL文档导出到本地文件或者网络中
      * @param pattern 如果有时间数据,设定输出格式。默认为"yyyy-MM-dd hh:mm:ss"
      * @return void
-     * @author 
+     * @author
      * @date 2018-8-2
      */
     @SuppressWarnings({"unchecked", "rawtypes", "resource"})
@@ -775,7 +774,7 @@ public class ExcelUtils {
         }
         return value.trim();
     }
-    
+
 	public static Date getCellDate(Cell cell) {
 		Date date=new Date();
 		  if (cell != null) {
@@ -793,7 +792,7 @@ public class ExcelUtils {
 
 	}
 
-	
+
     public static Workbook getWorkBook(MultipartFile file) {
         //创建Workbook工作薄对象,表示整个excel
         Workbook workbook = null;
@@ -808,6 +807,6 @@ public class ExcelUtils {
         }
         return workbook;
         }
-    
-      
+
+
 }

+ 0 - 2
src/main/java/com/goafanti/common/utils/ParamUtils.java

@@ -15,10 +15,8 @@ public class ParamUtils {
     public static  <T> String  getParamName(T t,String param){
         Class clazz=t.getClass();
         for (Field f : clazz.getDeclaredFields()) {
-            System.out.println(f.getName());
             if (f.getName().equals(param)){
                 Param filedAnno = f.getAnnotation(Param.class);
-//                System.out.println(filedAnno.name());
                 return filedAnno.name();
             }
         }

+ 0 - 2
src/main/java/com/goafanti/common/utils/WeChatUtils.java

@@ -57,9 +57,7 @@ public class WeChatUtils {
 			map.put("template_id", jgtz);
 			map.put("data",getData(type,date, aname,remarks));
 		}
-		System.out.println("inupt="+JSONObject.toJSONString(map));
 		JSONObject res=HttpUtils.httpPost(url, map);
-		System.out.println("res="+JSONObject.toJSONString(res));
 		if (res.get("errcode")!=null) {
 			return res.getInteger("errcode");
 		}else {

+ 2 - 11
src/main/java/com/goafanti/common/utils/excel/ExcelConstant.java

@@ -3,18 +3,9 @@ package com.goafanti.common.utils.excel;
 import com.goafanti.order.enums.LiquidationNewState;
 
 public class ExcelConstant {
-	
-	public static void main(String[] args) {
-		StringBuffer str=new StringBuffer();
-		for (LiquidationNewState value : LiquidationNewState.values()) {
-			str.append(value.getCode()).append("=").append(value.getDesc()).append(",");
-		}
-		System.out.println(str.substring(0, str.length()-1));
-		
-	}
-	
+
 	public static final String TaskStateStr="0=未分配,1=已分配,2=材料已启动,3=材料已完成,10=未定义";
-	
+
 	public static final String NewProjectStatusStr="0=未启动,1=进行中,2=暂停(客户通知暂停),3=暂停(业务线通知暂停),"
 			+ "4=已提交,5=未推荐,6=已推荐,7=未拟公示,8=已拟公示,28=抽查未备案,9=已备案,10=已下证 ,11=退单(已申报),"
 			+ "12=退单(未申报),13=已答辩,14=未立项,15=已立项,16=前补助,17=后补助,18=立项已拨款,19=已完成/下证,20=已驳回,"

+ 3 - 5
src/main/java/com/goafanti/core/auth/RestClient.java

@@ -17,8 +17,6 @@ public class RestClient {
 	public void whenSecuredRestApiIsConsumed_then200OK() {
 	    RestTemplate restTemplate = new RestTempleteConfig().getRestTemplate();
 	    ResponseEntity<String> entity = restTemplate.exchange(BS_HOST, HttpMethod.GET, null, String.class);
-	    System.out.println(entity.getStatusCode());
-	    System.out.println(entity.getBody());
 	}
 	private HttpHeaders getHeaders(){
 		String plainCredentials="dev:123456";
@@ -27,15 +25,15 @@ public class RestClient {
 		headers.add("Authorization", "Basic " + base64Credentials);
 		return headers;
 	}
- 
+
 	public String sendToBs(String apiUrl,HttpMethod method,LinkedMultiValueMap<String, String> params) {
 		RestTemplate restTemplate = new RestTemplate();
 		HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<MultiValueMap<String, String>>(params,getHeaders());
 		ResponseEntity<String> response = restTemplate.exchange(BS_HOST + "/" + apiUrl, method,request, String.class);
-		
+
 		return response.getBody();
 	}
-	
+
 //	@Test
 	public void testLogin() {
 		System.out.println(sendToBs("login", HttpMethod.GET, null));

+ 0 - 2
src/main/java/com/goafanti/order/bo/OutNewOrderDunBo.java

@@ -27,9 +27,7 @@ public class OutNewOrderDunBo extends NewOrderDun {
 	}
 
 	public String getDunTypeName() {
-		System.out.println(getDunType()+","+getProjectType());
 		if(getDunType()!=null&&getProjectType()!=null) {
-			System.out.println(Integer.valueOf(""+getProjectType()+getDunType()));
 			return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
 		}
 		return dunTypeName;

+ 9 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -215,7 +215,15 @@ public interface OrderNewService {
 	 *
 	 */
 	void addNotic(Integer type,  TOrderNewBo b,String str);
-	void addNoticMember(Integer type,  TOrderNewBo b,Integer shiroType);
+
+	/**
+	 *
+	 * @param type 消息类型
+	 * @param b  订单信息
+	 * @param shiroType  0财务 1特批
+	 * @param  result 0审核 1通过
+	 */
+	void addNoticMember(Integer type,  TOrderNewBo b,Integer shiroType,Integer result);
 	Pagination<TOrderNewBo> statisticsOrderList(InputStatisticsOrderList in);
 
 	int updateSalesType(TOrderNew in);

+ 52 - 9
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -223,7 +223,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		tl.setAid(TokenManager.getAdminId());
 		addOrderLog(tl,"发起会员项目");
 		TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
-		addNoticMember(NoticeStatus.MENBER_START.getCode(),tn,null);
+		addNoticMember(NoticeStatus.MENBER_START.getCode(),tn,null,0);
 		return addOrderTask( t);
 	}
 
@@ -1208,24 +1208,28 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	@Override
-	public void addNoticMember(Integer type,  TOrderNewBo b,Integer shiroType) {
+	public void addNoticMember(Integer type,  TOrderNewBo b,Integer shiroType,Integer result) {
 		StringBuffer sb=new StringBuffer();
 		String aid=null;
-		List<Admin>admins=null;
+		List<Admin>admins=new ArrayList<>();
+		sb.append("客户名称【").append(b.getUserName()).append("】,订单编号【").append(b.getOrderNo()).append("】,");
 		if (type==NoticeStatus.MENBER_START.getCode()){
-			sb=sb.append("客户名称[").append(b.getUserName()).append("],发起会员项目,请及时审核");
+			sb=sb.append("发起会员项目,请及时审核");
 			aid=b.getFinanceId();
 		}else if (type==NoticeStatus.MENBER_YES.getCode()){
-			sb=sb.append("客户名称[").append(b.getUserName()).append("],会员项目审核");
+			sb=sb.append("会员项目审核");
 			if(shiroType==0){
 				sb=sb.append("财务已通过。");
-				admins=adminMapper.getAdminRoleList("总裁");
+				if (result==1) {
+					admins = MemberEnd(b);
+				}else{
+					admins=adminMapper.getAdminRoleList("总裁");
+				}
 			} else if(shiroType==1){
 				sb=sb.append("特批已通过。");
-				aid=b.getSalesmanId();
+				admins = MemberEnd(b);
 			}
 		}else if (type==NoticeStatus.MENBER_NO.getCode()){
-			sb=sb.append("客户名称[").append(b.getUserName()).append("],会员项目");
 			if(shiroType==0){
 				sb=sb.append("财务已驳回。");
 			} else if(shiroType==1){
@@ -1244,13 +1248,52 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 	}
 
+	/**
+	 * 会员项目完成审核调用
+	 * @param b
+	 * @return
+	 */
+	private List<Admin> MemberEnd(TOrderNewBo b) {
+		List<Admin> admins;
+		admins=adminMapper.getAdminRoleList("咨询师管理员");
+		Admin admin = new Admin();
+		admin.setId(b.getSalesmanId());
+		admins.add(admin);
+		pushTOrderNew(b);
+		return admins;
+	}
+
+	/**
+	 * 新建完成会员项目修改订单状态
+	 * @param b
+	 */
+	private void pushTOrderNew(TOrderNewBo b) {
+		List<TOrderTaskBo> l = tOrderTaskMapper.selectOrderTask(b.getOrderNo(), 0);
+		int counts =l.size();
+		int x=0;
+		for (TOrderTaskBo t : l) {
+			if (t.getTaskStatus()==0)x++;
+		}
+		TOrderNew n = new TOrderNew();
+		n.setOrderNo(b.getOrderNo());
+		if (x==0)n.setProcessStatus(4);
+		else if(x<counts)n.setProcessStatus(5);
+		else if(x==counts)n.setProcessStatus(6);
+		tOrderNewMapper.updateByPrimaryKeySelective(n);
+	}
+
+	/**
+	 * 发送邮件使用
+	 * @param type
+	 * @param aid
+	 * @param content
+	 */
 	private void sendMemberEmail(Integer type,String aid,String content) {
 		Admin admin = adminMapper.selectByPrimaryKey(aid);
 		EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), admin.getEmail(),content);
 		if(StringUtils.isNotBlank(admin.getEmail())) {
 			asyncUtils.send(bo);
 		}
-		LoggerUtils.debug(logger, "=========================================发送邮件成功");
 	}
 
 

+ 7 - 3
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1094,6 +1094,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		log.setAid(TokenManager.getAdminId());
 		TOrderTask nt=new TOrderTask();
 		nt.setId(task.getId());
+		Integer result=0;
 		TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
 		// 1=通过 0=驳回
 		if (in.getResult()==1){
@@ -1107,14 +1108,16 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				}else if (task.getMemberType()==0){
 					nt.setProcessStatus(3);
 					addLog(log,1);
+					result=1;
 				}
 			}else if(in.getType()==1){
 				if(task.getProcessStatus()!=2)throw  new BusinessException("审核状态错误");
 				nt.setProcessStatus(3);
 				log.setProcess(20);
 				addLog(log,1);
+				result=1;
 			}
-			orderNewService.addNoticMember(NoticeStatus.MENBER_YES.getCode(), ono, in.getType());
+			orderNewService.addNoticMember(NoticeStatus.MENBER_YES.getCode(), ono, in.getType(),result);
 		}else if (in.getResult()==0){
 			if (in.getType()==0){
 				log.setProcess(21);
@@ -1123,7 +1126,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			}
 			addLog(log,0);
 			nt.setProcessStatus(4);
-			orderNewService.addNoticMember(NoticeStatus.MENBER_NO.getCode(), ono, in.getType());
+			orderNewService.addNoticMember(NoticeStatus.MENBER_NO.getCode(), ono, in.getType(),result);
 		}
 		return tOrderTaskMapper.updateByPrimaryKeySelective(nt);
 	}
@@ -1145,10 +1148,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Override
 	public int updateMemberProject(TOrderTask t) {
 		TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(t.getId());
+		if(task.getProcessStatus()!=4)throw  new BusinessException("审核状态错误,无法提交。");
 		addOrderLog(task.getOrderNo(),OrderLogProcess.HYXMFQ.getCode(), "修改重新发起");
 		t.setProcessStatus(1);
 		TOrderNewBo ono = tOrderNewMapper.getSaleIdByOno(task.getOrderNo());
-		orderNewService.addNoticMember(NoticeStatus.MENBER_START.getCode(), ono, null);
+		orderNewService.addNoticMember(NoticeStatus.MENBER_START.getCode(), ono, null,0);
 		return orderNewService.updateOrderTask(t);
 	}
 

+ 45 - 46
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -36,10 +36,10 @@ import com.goafanti.organization.service.ThirdPartyCompanyService;
 @RestController
 @RequestMapping("/api/admin/company")
 public class ThirdPartyCompanyApiController extends BaseApiController{
-	
+
 	@Resource
 	private ThirdPartyCompanyService thirdPartyCompanyService;
-	
+
 	/**
 	 * 新增第三方机构
 	 * @param t
@@ -65,7 +65,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		}
 			if (calculation==1) {
 				thirdPartyCompanyService.calculationUnitPrice(t);
-				
+
 			}else if (calculation==2) {
 				thirdPartyCompanyService.calculationPatentUnitPrice(t);
 			}
@@ -83,8 +83,8 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.addCompany(t,calculation,type));
 		return res;
 	}
-	
-	
+
+
 	/**
 	 * 修改第三方机构
 	 * @param t
@@ -119,7 +119,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.updateCompany(t,calculation));
 		return res;
 	}
-	
+
 	/**
 	 * 删除第三方机构
 	 * @param t
@@ -150,8 +150,8 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.selectCompany(tid));
 		return res;
 	}
-	
-	
+
+
 	/**
 	 * 模糊查询机构列表
 	 * @param type 类型 0软著 1其他 2专利
@@ -163,7 +163,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.selectVague(name,type));
 		return res;
 	}
-	
+
 	/**
 	 * 新增付款节点
 	 * @param t
@@ -191,7 +191,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.addPaymentNode(p));
 		return res;
 	}
-	
+
 	/**
 	 * 删除付款节点
 	 * @param t
@@ -216,7 +216,6 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 	public Result updatePaymentNode(@Valid InputPaymentNode p,BindingResult bindingResult) {
 		Result res =new Result();
 		if (bindingResult.hasErrors()) {
-			System.out.println(ThirdPartyError.getValueByCode(bindingResult.getFieldError().getField()));
             res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
             		ThirdPartyError.getValueByCode(bindingResult.getFieldError().getField())));
             return res;
@@ -239,7 +238,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.updatePaymentNode(p));
 		return res;
 	}
-	
+
 	/**
 	 * 付款节点列表
 	 * @param t
@@ -255,7 +254,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.selectPaymentNode(tid));
 		return res;
 	}
-	
+
 	/**
 	 * 新增付款
 	 * @param t
@@ -315,7 +314,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.updateOrderPayment(p));
 		return res;
 	}
-	
+
 	/**
 	 * 付款详情
 	 * @param t
@@ -331,7 +330,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.OrderPaymentDetails(id));
 		return res;
 	}
-	
+
 	/**
 	 * 付款列表
 	 * @param t
@@ -347,7 +346,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.selectOrderPayment(id));
 		return res;
 	}
-	
+
 	/**
 	 * 付款日志
 	 * @param t
@@ -387,7 +386,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.addfinancialPayment(f));
 		return res;
 	}
-	
+
 	/**
 	 * 删除财务付款
 	 * @param t
@@ -418,7 +417,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.selectfinancialPayment(id));
 		return res;
 	}
-	
+
 	/**
 	 * 付款列表
 	 * @param t
@@ -430,7 +429,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.selectPaymentList(i));
 		return res;
 	}
-	
+
 	/**
 	 * 节点应收款列表
 	 * @param t
@@ -442,7 +441,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.selectPaymentList(i));
 		return res;
 	}
-	
+
 	/**
 	 *  新增软著价格表
 	 * @param t
@@ -463,7 +462,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.insertSoftWritingPrice(s));
 		return res;
 	}
-	
+
 
 	/**
 	 *  修改软著价格表
@@ -517,7 +516,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.deleteSoftWritingPrice(id));
 		return res;
 	}
-	
+
 	/**
 	 *  批量确认付款
 	 * @param t
@@ -533,7 +532,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.updateGroupPayment(ids));
 		return res;
 	}
-	
+
 	/**
 	 *  	新增官费信息
 	 * @param t
@@ -553,7 +552,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.addOfficialFeePrice(o));
 		return res;
 	}
-	
+
 
 	/**
 	 *  	修改官费信息
@@ -591,12 +590,12 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
 				return res;
 		}
-		
-		
+
+
 		res.data(thirdPartyCompanyService.deleteOfficialFeePrice(id));
 		return res;
 	}
-	
+
 	/**
 	 * 	 官费列表
 	 * @param t
@@ -608,9 +607,9 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.listOfficialFeePrice(type,patentType, pageSize, pageNo));
 		return res;
 	}
-	
-	
-	
+
+
+
 	/**
 	 *  	新增专利信息
 	 * @param t
@@ -627,7 +626,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.addpatentPrice(p));
 		return res;
 	}
-	
+
 
 	/**
 	 *  	修改专利信息
@@ -646,7 +645,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 			return res;
 	}
 	if(p.getCompanyName()!=null)p.setCid(thirdPartyCompanyService.pushSelectByCid(p.getCompanyName(),2));
-		
+
 		res.data(thirdPartyCompanyService.updatepatentPrice(p));
 		return res;
 	}
@@ -662,12 +661,12 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 				res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
 				return res;
 		}
-		
-		
+
+
 		res.data(thirdPartyCompanyService.deletepatentPrice(id));
 		return res;
 	}
-	
+
 	/**
 	 * 	 专利列表
 	 * @param t
@@ -679,22 +678,22 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.listpatentPrice(name));
 		return res;
 	}
-	
-	
+
+
 	/**
 	 * 	导出付款审核表
 	 * @throws IOException
-	 * type 0财务 1专利管理员 
+	 * type 0财务 1专利管理员
 	 */
 	@RequestMapping(value = "/exportPaymentList", method = RequestMethod.GET)
 	public Result exportPaymentList2(HttpServletResponse response,InputPaymentList ip,Integer type){
 		return thirdPartyCompanyService.exportPaymentList(response,ip,type);
-		
+
 	}
-	
+
 	/**
 	 * 	审核
-	 *  
+	 *
 	 */
 	@RequestMapping(value = "/paymentExamine", method = RequestMethod.POST)
 	public Result paymentExamine(PaymentLog in,String pids){
@@ -704,9 +703,9 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		}
 		res.data(thirdPartyCompanyService.pushPaymentExamine(in,pids));
 		return res;
-		
+
 	}
-	
+
 
     /**
 	 * 	查询第三方是否发起
@@ -721,7 +720,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.checkThirdParty(id));
 		return res;
 	}
-	
+
 	/**
 	 * 	查询第三方是否发起
 	 *  type 0检查 1删除
@@ -736,7 +735,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.updateCheck(id,type));
 		return res;
 	}
-	
+
 	/**
 	 * 	查询第三方是否发起
 	 */
@@ -750,5 +749,5 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		res.data(thirdPartyCompanyService.checkNode(id));
 		return res;
 	}
-	
+
 }

+ 12 - 13
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -82,37 +82,37 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 	private TaskAttributionLogMapper	taskAttributionLogMapper;
 	@Autowired
 	private TOrderLogMapper	tOrderLogMapper;
-	
-	
+
+
 	@Override
 	public Pagination<RoleBo> findRoles(RoleBo role, Integer pageNo, Integer pageSize) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Map<String,Object> params =disposeParams(role);
 		@SuppressWarnings("unchecked")
-		Pagination<RoleBo> p=(Pagination<RoleBo>)findPage("selectRoleList","selectRoleCount",params,pageNo,pageSize);		
+		Pagination<RoleBo> p=(Pagination<RoleBo>)findPage("selectRoleList","selectRoleCount",params,pageNo,pageSize);
 		@SuppressWarnings("unchecked")
 		List<RoleBo> list=(List<RoleBo>) p.getList();
 		for(RoleBo i:list){
 			if(i.getCreateTime()!=null){
 				i.setCreateTimez(sdf.format(i.getCreateTime()));
 			}
-			
+
 		}
 		return p;
 	}
 	private Map<String,Object> disposeParams(RoleBo role){
-		Map<String,Object> params = new HashMap<String, Object>();			
-		if(StringUtils.isNotBlank(role.getRoleName())) params.put("roleName", role.getRoleName());		
+		Map<String,Object> params = new HashMap<String, Object>();
+		if(StringUtils.isNotBlank(role.getRoleName())) params.put("roleName", role.getRoleName());
 		return params;
-		
+
 	}
-	
+
 	@Override
 	public Set<String> findRoleByUserId(String userId) {
 		return roleMapper.findRoleByUserId(userId);
 	}
 
-	
+
 
 	@Override
 	public int insert(List<Role> records) {
@@ -175,7 +175,7 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 			TokenManager.clearUserAuthByUserId(ids.toArray(new String[ids.size()]));
 		}
 		record.getId();
-		record.setCreater("管理员");		
+		record.setCreater("管理员");
 		record.setCreateTime(now);
 		return roleMapper.insert(record);
 	}
@@ -204,7 +204,7 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 		}
 		return 1;
 	}
-	
+
 	@Override
 	public int updatedimission(String aid, String transferId) {
 		List<Integer> list=roleResourcesMapper.selectAdminRoleResources(aid);
@@ -222,7 +222,6 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 				userMapper.updateDimissionTransfer(aid,transferId);
 			}
 			if (s==roleResources.QDYW.getCode()) {
-				System.out.println("\n\n业务转交");
 				userTransferLogMapper.insertUserLockLog(aid,transferId,date);
 				patentNewMapper.updateAdmin(aid,transferId);
 				roleResourcesMapper.updateLockRelease("1",aid,transferId);//将业务锁转给指定人
@@ -261,5 +260,5 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 	public List<RoleResources> ResourcesDetail(String rid) {
 		return roleResourcesMapper.selectByRid(rid);
 	}
-	
+
 }

+ 15 - 16
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -84,7 +84,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	private TOrderMapper	tOrderMapper;
 	@Autowired
 	AdminMapper		adminMapper;
-	
+
 	@Value(value = "${accessKey}")
 	private String					accessKey			= null;
 
@@ -376,18 +376,18 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 
 	@Override
 	public ProjectDetailBo selectTechProjectDetail(String contractId,Integer buyerType) {
-		
+
 		return techProjectMapper.selectTechProjectDetail(contractId,buyerType);
 	}
 
 	@Override
 	public List<TaskListBo> selectProjectTask(String contractId) {
-		
+
 		return techProjectMapper.selectProjectTask(contractId);
 	}
 
 	@Override
-	public int addProjectTask(String contractId,String commodityId,String commodityName, Integer commodityQuantity, 
+	public int addProjectTask(String contractId,String commodityId,String commodityName, Integer commodityQuantity,
 			String commodityMode, String taskComment) {
 		for(int i=0;i<commodityQuantity;i++){
 			ContractTask task = new ContractTask();
@@ -405,7 +405,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			task.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			contractTaskMapper.insert(task);
 			//项目任务日志流转
-			Admin a=adminMapper.selectAdminName(AFTConstants.CONSULTANT_MANAGER); 
+			Admin a=adminMapper.selectAdminName(AFTConstants.CONSULTANT_MANAGER);
 			ContractTaskLog c=new ContractTaskLog();
 			c.setId(UUID.randomUUID().toString());
 			c.setContractTaskId(task.getId());
@@ -420,7 +420,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 
 	@Override
 	public TaskDetailBo selectProjectTaskDetail(String taskId) {
-		
+
 		return contractTaskMapper.selectProjectTaskDetail(taskId);
 	}
 
@@ -443,7 +443,6 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		String mobile = "";
 		if (null!=tb&&tb.getOrderNo()!=null) {
 			ServiceOrderDetailBo t=tOrderMapper.selectServiceOrderDetail(tb.getOrderNo());
-			System.out.println(t.getSalesmanId());
 			if (null!=t&&t.getSalesmanId()!=null) {
 				ad=adminMapper.selectByPrimaryKey(t.getSalesmanId());
 				if(null!=ad&&null!=ad.getContactMobile()){
@@ -460,7 +459,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			mobile=mobile+","+a.getContactMobile();
 				}
 			}
-		String paramString = "{\"number\":\"" + tb.getOrderNo() 
+		String paramString = "{\"number\":\"" + tb.getOrderNo()
 		+ "\",\"operator\":\"" + TokenManager.getAdminToken().getName()
 		+ "\",\"time\":\"" +   sdf.format(new Date())
 		+ "\",\"name\":\"" +  tb.getBuyerName()
@@ -536,7 +535,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		if(contract != null){
 			contract.setPrincipal(projectReceiveId);
 			contract.setUpdateTime(new Date());
-			return contractMapper.updateByPrimaryKeySelective(contract); 
+			return contractMapper.updateByPrimaryKeySelective(contract);
 		}
 		return 0;
 	}
@@ -599,7 +598,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 					TOrder tb=tOrderMapper.selectByPrimaryKey(t.getOrderNo());
 					if (null!=tb&&tb.getSalesmanId()!=null) {
 						Admin ad=adminMapper.selectByPrimaryKey(tb.getSalesmanId());
-					if (null!=ad&&null!=ad.getContactMobile()){	
+					if (null!=ad&&null!=ad.getContactMobile()){
 						Matcher s1 = p.matcher(ad.getContactMobile());
 						if(s1.matches()){
 							 mobile=ad.getContactMobile();
@@ -615,7 +614,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			}
 			sendMessage(t.getOrderNo(),mobile,OrderFlowState.RWPD.getDesc());
 			return setTaskDistribution(task.getContractId());
-			
+
 		}
 		return 0;
 	}
@@ -624,10 +623,10 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		String userName=tOrderMapper.selectByUserName(orderNo);
 		//String message=noticeType.getDesc() + ": 订单编号-" + tOrder.getOrderNo() + ",变更内容:"+noticeComment+",操作人-" + TokenManager.getAdminToken().getName();
-		String paramString = "{\"number\":\"" + orderNo 
+		String paramString = "{\"number\":\"" + orderNo
 		+ "\",\"operator\":\"" + TokenManager.getAdminToken().getName()
 		+ "\",\"name\":\"" +  userName
-		+ "\",\"time\":\"" +  sdf.format(new Date()) 
+		+ "\",\"time\":\"" +  sdf.format(new Date())
 		+ "\",\"type\":\"" +  type +
 		"\"}";
 		MobileMessageUtils.sendMessage(mobileRemindCodeTemplate, paramString, mobile, accessKey, accessSecret);
@@ -662,7 +661,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		}
 		return (Pagination<ProjectListBo>)findPage("salesmanListProjectByPage", "salesmanListProjectCount", params, pageNo, pageSize);
 	}
-	
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TaskListBo> selectProjectTask(String projectNo, String buyerName, String taskReceiverId, String taskReceiverName,
@@ -683,8 +682,8 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		if(StringUtils.isNotBlank(deleteSign)) params.put("deleteSign", deleteSign);
 		if(StringUtils.isNotBlank(publishStatus)) params.put("publishStatus", publishStatus);
 		if(taskStatus != null) params.put("taskStatus", taskStatus);
-		params.put("taskReceiver", TokenManager.getAdminId()); 
+		params.put("taskReceiver", TokenManager.getAdminId());
 		return (Pagination<TaskListBo>)findPage("selectProjectTaskByPage", "selectProjectTaskCount", params, pageNo, pageSize);
 	}
-	
+
 }

+ 2 - 3
src/main/java/com/goafanti/user/service/impl/UserInterestServiceImpl.java

@@ -82,7 +82,6 @@ public class UserInterestServiceImpl extends BaseMybatisDao<UserInterestMapper>
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<UserIdentityBo> expertsList(String industry, Integer pNo, Integer pSize) {
-		System.out.println(industry);
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -92,7 +91,7 @@ public class UserInterestServiceImpl extends BaseMybatisDao<UserInterestMapper>
 		}
 		Map<String, Object> params =new HashMap<String, Object>();
 		if (StringUtils.isNotBlank( industry)) {
-			params.put("industry",industry); 
+			params.put("industry",industry);
 		}
 		Pagination<UserIdentityBo> p=(Pagination<UserIdentityBo>) findPage("findUserCareerListByPage",
 				"findUserCareerCount",params,
@@ -105,5 +104,5 @@ public class UserInterestServiceImpl extends BaseMybatisDao<UserInterestMapper>
 		return p;
 	}
 
-	
+
 }

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

@@ -528,12 +528,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			throw new BusinessException("转换异常");
 		}
 		List<Integer> is=publicReleaseMapper.checkTime(TokenManager.getAdminId(),in.getReleaseStart(),in.getReleaseEnd());
-		is.forEach(System.out::println);
-		System.out.println(in.getId());
 		if (is.size()>1) {
 			return true;
 		}else  if(is.size()==1){
-			System.out.println(is.get(0));
 			if (in.getId()!=null && !in.getId().equals(is.get(0))){
 				return true;
 			}