Browse Source

修改本地

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
f0c5480784

+ 468 - 467
src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java

@@ -1,467 +1,468 @@
-package com.goafanti.business.service.impl;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.goafanti.app.bo.ProjectBo;
-import com.goafanti.app.bo.ProjectDetailBo;
-import com.goafanti.business.bo.BusinessProjectBo;
-import com.goafanti.business.bo.ProjectSizeBo;
-import com.goafanti.business.service.BusinessProjectService;
-import com.goafanti.common.dao.BusinessProjectMapper;
-import com.goafanti.common.dao.BusinessCategoryMapper;
-import com.goafanti.common.dao.ProjectInterestMapper;
-import com.goafanti.common.dao.BusinessProjectModelMapper;
-import com.goafanti.common.model.BusinessProject;
-import com.goafanti.common.model.BusinessCategory;
-import com.goafanti.common.model.BusinessProjectModel;
-import com.goafanti.common.utils.StringUtils;
-import com.goafanti.core.mybatis.BaseMybatisDao;
-import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.core.shiro.token.TokenManager;
-
-@Service
-public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMapper> implements BusinessProjectService {
-	@Autowired
-	BusinessProjectMapper businessProjectMapper;
-	@Autowired
-	BusinessCategoryMapper businessVarietiesMapper;
-	@Autowired
-	BusinessProjectModelMapper projectSizeMapper;
-	@Autowired
-	ProjectInterestMapper projectInterestMapper;
-	
-	@Override
-	public int insert(String bname, String cid, String country, String province, String city, String district,String boutique) {
-		BusinessProject bp=new BusinessProject();
-		bp.setId(UUID.randomUUID().toString());
-		bp.setBname(bname);
-		bp.setCid(cid);
-		bp.setCountry(country);
-		if (1!=Integer.valueOf(country)) {
-			bp.setProvince(province);
-			bp.setCity(city);
-			bp.setDistrict(district);
-		}
-		bp.setDeleteSign(0);
-		//bp.setCreateId("f31c0d1a-05bc-4f5c-b4a8-95f983d24131");
-		if (StringUtils.isNotBlank(TokenManager.getAdminId())) {
-			bp.setCreateId(TokenManager.getAdminId());
-		}
-		bp.setCreateTime(new Date());
-		bp.setStatus("0");
-		bp.setBoutique(Integer.valueOf(boutique));
-		bp.setFirstPayment(new BigDecimal("0"));
-		return businessProjectMapper.insert(bp);
-	}
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<BusinessProjectBo> listProject(String bname, String cid, String country,String province,String city,String district, String activityFlag,
-			String status,Integer type, Integer pNo, Integer pSize) {
-		if (pNo == null || pNo < 0)pNo = 1;
-		if (pSize == null || pSize < 0 )pSize = 10;
-		Pagination<BusinessProjectBo> pt=(Pagination<BusinessProjectBo>)findPage("findProjectListByPage", "findProjectListCount",
-				disposeParams(bname,  cid,  country, province, city, district,  activityFlag,
-						 status,type),pNo,pSize);
-		List<BusinessProjectBo> list=(List<BusinessProjectBo>) pt.getList();
-		for (BusinessProjectBo o : list) {
-			o.setCname(getAllCname(o.getCid()));
-		}
-		return pt;
-	}
-	private Map<String, Object> disposeParams(String bname, String cid, String country,String province,String city,String district, String activityFlag,
-			String status,Integer type) {
-		Map<String, Object> params = new HashMap<>();
-		if (StringUtils.isNotBlank(bname)) {
-			params.put("bname", bname);
-		}
-		if (StringUtils.isNotBlank(cid)) {
-			params.put("cid", cid);
-		}
-		if (StringUtils.isNotBlank(country)) {
-			params.put("country", country);
-		}
-		if (StringUtils.isNotBlank(province)) {
-			params.put("province", province);
-		}
-		if (StringUtils.isNotBlank(city)) {
-			params.put("city", city);
-		}
-		if (StringUtils.isNotBlank(district)) {
-			params.put("district", district);
-		}
-		if (StringUtils.isNotBlank(activityFlag)) {
-			params.put("activityFlag", activityFlag);
-		}
-		if (StringUtils.isNotBlank(status)) {
-			params.put("status", status);
-		}
-		if (type!=null ) {
-			params.put("type", type);
-		}
-		return params;
-	}
-	@Override
-	public int getBnamecount(String bname) {
-		
-		return businessProjectMapper.getBnamecount(bname);
-	}
-	@Override
-	public int deleteProject(String id) {
-		BusinessProject bp=businessProjectMapper.selectByPrimaryKey(id);
-		if (bp.getDeleteSign()==0) {
-			bp.setDeleteSign(1);
-		}else {
-			bp.setDeleteSign(0);
-		}
-		
-		return businessProjectMapper.updateByPrimaryKey(bp);
-	}
-	@Override
-	public int updateStopProject(String id) {
-		BusinessProject bp=businessProjectMapper.selectByPrimaryKey(id);
-		if (Integer.valueOf(bp.getStatus())==0) {
-			bp.setStatus("1");
-		}else {
-			bp.setStatus("0");
-		}
-		
-		return businessProjectMapper.updateByPrimaryKey(bp);
-	}
-	@Override
-	public BusinessProjectBo orgProjects(String id) {
-		BusinessProject bp=businessProjectMapper.selectByPrimaryKey(id);
-		BusinessProjectBo bpo=new BusinessProjectBo();
-		BeanUtils.copyProperties(bp,bpo);
-		String cname=getAllCname(bpo.getCid());
-		String createId=bpo.getCreateId();
-		bpo.setCreateName(businessProjectMapper.getCreateName(createId));
-		bpo.setCname(cname);
-		return bpo;
-	}
-	@Override
-	public ProjectDetailBo orgProject(String id) {
-		ProjectDetailBo pd=businessProjectMapper.selectAppProjectDetail(id);
-		int i=projectInterestMapper.checkUidAndDid(id,TokenManager.getUserId());
-		
-		if (TokenManager.isLogin()&&i>0) {
-			pd.setInterest("1");
-		}else {
-			pd.setInterest("0");
-		}
-		pd.setProjectSize(projectSizeMapper.selectPidList(id));
-		return pd;
-	}
-	
-	@Override
-	public List<Map<String, String>> getAllCnames(Integer flag) {
-		List<Map<String, String>> list=new ArrayList<Map<String, String>>();
-		List<String> listcid=businessVarietiesMapper.getListId();
-		for (String s : listcid) {
-			Map<String, String> map=new HashMap<>(); 
-			String cname=getAllCname(s);
-			map.put("id", s);
-			map.put("cname", cname);
-			if (flag==1) {
-				if (StringUtils.isBlank(cname)) {
-					map.put("cname", "平台超级业务品类");
-				}
-				list.add(map);
-			}else {
-				if (StringUtils.isNotBlank(cname)) {
-					list.add(map);
-				}
-			}
-		}
-		return list;
-	}
-	/**
-	 * 递归获取上级来获取全路径
-	 * @param s	ID
-	 * @return  路径
-	 */
-	private String getAllCname(String s) {
-		String cid=businessVarietiesMapper.getThisCid(s);
-		String cname=businessVarietiesMapper.getThisCname(cid);
-		BusinessCategory bv=businessVarietiesMapper.selectByPrimaryKey(s);
-		String sid="";
-		if(bv!=null&&null!=bv.getSuperId())sid=bv.getSuperId();
-		if(null==cid)return "";
-		if (cid.length()>4) {
-			if(bv.getSuperId().equals(bv.getId())){
-				return "";
-			}
-			String w=getAllCname(sid)+"-"+cname;
-			return w;
-		}else{
-			return cid.length()>3?cname:"";
-		}
-		
-	}
-	
-	
-	
-	@Override
-	public int updateProject(BusinessProject s) {
-		BusinessProject bp=businessProjectMapper.selectByPrimaryKey(s.getId());
-		TheGinseng(s, bp);
-		return businessProjectMapper.updateByPrimaryKey(bp);
-	}
-	private void TheGinseng(BusinessProject s, BusinessProject bp) {
-		
-		if (StringUtils.isNotBlank(s.getBname())) {
-			bp.setBname(s.getBname());
-		}
-		if (StringUtils.isNotBlank(s.getCid())) {
-			bp.setCid(s.getCid());
-		}
-		if (StringUtils.isNotBlank(s.getCountry())) {
-			bp.setCountry(s.getCountry());
-		}
-		if (StringUtils.isNotBlank(s.getProvince())) {
-			bp.setProvince(s.getProvince());
-			bp.setCity(s.getCity());
-			bp.setDistrict(s.getDistrict());
-		}
-		if (StringUtils.isNotBlank(s.getCity())) {
-			bp.setCity(s.getCity());
-			bp.setDistrict(s.getDistrict());
-		}
-		if (StringUtils.isNotBlank(s.getDistrict())) {
-			bp.setDistrict(s.getDistrict());
-		}
-
-		bp.setPrice(s.getPrice());
-		bp.setOffset(s.getOffset());
-		bp.setActivityFlag(s.getActivityFlag());
-		bp.setMemberPrice(s.getMemberPrice());
-		bp.setActivityPrice(s.getActivityPrice());
-		bp.setIntroduce(s.getIntroduce());
-		bp.setValueEffect(s.getValueEffect());
-		bp.setClientSize(s.getClientSize());
-		bp.setMinLogo(s.getMinLogo());
-		bp.setMaxLogo(s.getMaxLogo());
-		bp.setBoutique(s.getBoutique());
-		bp.setProjectUrl(s.getProjectUrl());
-		bp.setFirstPayment(s.getFirstPayment());
-		bp.setType(s.getType());
-		if (null!=(s.getStatus())) {
-			bp.setStatus(s.getStatus());
-		}
-		bp.setUpdateTime(new Date());
-	}
-	@Override
-	public int addProjectSize(BusinessProjectModel ps) {
-		ps.setId(UUID.randomUUID().toString());
-		if (StringUtils.isNotBlank(TokenManager.getAdminId())) {
-		ps.setCreateId(TokenManager.getAdminId());
-		}
-		//ps.setCreateId("f31c0d1a-05bc-4f5c-b4a8-95f983d24131");
-		ps.setCreateTime(new Date());
-		ps.setStatus(0);
-		return projectSizeMapper.insert(ps);
-	}
-	@Override
-	public int updateOrgProjectSize(BusinessProjectModel ps) {
-		BusinessProjectModel psz=projectSizeMapper.selectByPrimaryKey(ps.getId());
-		projectSizeConfiguration(ps, psz);
-		System.out.println(psz);
-		return projectSizeMapper.updateByPrimaryKeySelective(psz);
-	}
-	private void projectSizeConfiguration(BusinessProjectModel ps, BusinessProjectModel psz) {
-		if (StringUtils.isNotBlank(ps.getPid())) {
-			psz.setId(ps.getPid());
-		}
-		if (StringUtils.isNotBlank(ps.getPname())) {
-			psz.setPname(ps.getPname());
-		}
-		if (null!=ps.getPrice()) {
-			psz.setPrice(ps.getPrice());
-		}
-		if (null!=(ps.getOffset())) {
-			psz.setOffset(ps.getOffset());
-		}
-		if (null!=(ps.getActivityFlag())) {
-			psz.setActivityFlag(ps.getActivityFlag());
-		}
-		if (null!=(ps.getMemberPrice())) {
-			psz.setMemberPrice(ps.getMemberPrice());
-		}
-		if (null!=(ps.getActivityPrice())) {
-			psz.setActivityPrice(ps.getActivityPrice());
-		}
-		if (null!=(ps.getStatus())) {
-			psz.setStatus(ps.getStatus());
-		}
-		psz.setUpdateTime(new Date());
-	}
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<ProjectSizeBo>  listProjectSize(String pid,Integer pNo,Integer pSize) {
-		if (pNo == null || pNo < 0) {
-			pNo = 1;
-		}
-
-		if (pSize == null || pSize < 0 || pSize > 10) {
-			pSize = 10;
-		} 
-		Map<String, Object>map=new HashMap<>();
-		map.put("pid", pid);
-			
-		
-		Pagination<ProjectSizeBo> pt=(Pagination<ProjectSizeBo>)findPage("findProjectSizeListByPage", "findProjectSizeListCount",
-				map,pNo,pSize);
-		return pt;
-	}
-	@Override
-	public ProjectSizeBo getProjectSize(String id) {
-		return projectSizeMapper.selectByBusinessId(id);
-	}
-	@Override
-	public int deleteProjectSize(String id) {
-		
-		return projectSizeMapper.deleteByPrimaryKey(id);
-	}
-	@Override
-	public int updateSotpProjectSize(String id) {
-		BusinessProjectModel ps=projectSizeMapper.selectByPrimaryKey(id);
-			int i=ps.getStatus();
-			if (i==0) {
-				ps.setStatus(1);
-			}else {
-				ps.setStatus(0);
-			}
-		return projectSizeMapper.updateByPrimaryKey(ps);
-	}
-	@Override
-	public boolean WhetherRepeat(BusinessProjectModel ps) {
-		List<ProjectSizeBo> list=projectSizeMapper.getgetPnamecount(ps.getPname());
-		
-		for (ProjectSizeBo p : list) {
-			if (p.getPid().equals(ps.getPid())) {
-				return true;
-			}
-		}
-		return false;
-	}
-	@Override
-	public boolean judgeStatus(BusinessProjectModel ps) {
-		 BusinessProject bp=businessProjectMapper.selectByPrimaryKey(ps.getPid());
-		if (Integer.valueOf(bp.getStatus())==1) {
-			return true;
-		}else {
-			return false;
-		}
-		
-	}
-	@Override
-	public boolean judgeBeing(BusinessProject s) {
-		BusinessProject bp=businessProjectMapper.selectByPrimaryKey(s.getId());
-		BusinessProject bp1=businessProjectMapper.selectByPrimaryBname(s.getBname());
-		if (null==bp||null==bp1||bp.getId().equals(bp1.getId())) {
-			return false;
-		}else {
-			return true;
-		}
-		
-	}
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<ProjectBo> getBusinessProject(String id,Integer pNo,Integer pSize) {
-		if (pNo == null || pNo <= 0) {
-			pNo = 1;
-		}
-
-		if (pSize == null || pSize < 0 || pSize > 10) {
-			pSize = 10;
-		}
-		Map<String, Object> params = new HashMap<>();
-		if (StringUtils.isNotBlank(id)) {
-			params.put("id", id);
-		}
-		
-		Pagination<ProjectBo> data =  (Pagination<ProjectBo>)findPage("getBusinessProject", "getBusinessProjectCount",
-				params,pNo,pSize);
-		return data;
-		
-	}
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<ProjectBo> recommendProjectList(Integer pNo, Integer pSize) {
-		if (pNo == null || pNo <= 0) {
-			pNo = 1;
-		}
-		if (pSize == null || pSize < 0 || pSize > 10) {
-			pSize = 10;
-		}
-		Map<String, Object> params = new HashMap<>();
-		return (Pagination<ProjectBo>)findPage("findRecommendProjectListByPage", "findRecommendProjectListCount",
-				params,pNo,pSize);
-	}
-	@Override
-	public boolean checkProject(String id) {
-		if (businessProjectMapper.checkProject(id)>0) {
-			return true;
-		}
-		return false;
-	}
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<ProjectBo> portalRecommendList(Integer pNo, Integer pSize) {
-		Map<String, Object> params = new HashMap<>();
-		return (Pagination<ProjectBo>)findPage("findRecommendProjectListByPage", "findRecommendProjectListCount",
-				params,pNo,pSize);
-	}
-	@SuppressWarnings("unchecked")
-	@Override
-	public Pagination<ProjectBo> portalBusinessProject(String id, Integer pNo, Integer pSize) {
-		Map<String, Object> params = new HashMap<>();
-		if (StringUtils.isNotBlank(id)) {
-			params.put("id", id);
-		}
-		Pagination<ProjectBo> data =  (Pagination<ProjectBo>)findPage("getBusinessProject", "getBusinessProjectCount",
-				params,pNo,pSize);
-		return data;
-	
-	}
-	
-	@Override
-	public ProjectDetailBo ProjectDetail(String id) {
-		ProjectDetailBo pd=businessProjectMapper.selectAppProjectDetail(id);
-		if (StringUtils.isNotBlank(TokenManager.getUserId())&&projectInterestMapper.checkUidAndDid(id,TokenManager.getUserId())>0) {
-			pd.setInterest("1");
-		}else {
-			pd.setInterest("0");
-		}
-		pd.setProjectSize(projectSizeMapper.selectPidList(id));
-		return pd;
-	
-	}
-	
-	@Override
-	public List<ProjectBo> portalRecommend() {
-		return businessProjectMapper.selectServiceProjectDetail();
-	}
-	
-	@Override
-	public List<BusinessProject> selectBusinessProjectByName(String businessName,String cid) {
-		return businessProjectMapper.selectBusinessProjectByName(businessName,cid);
-	}
-	
-	@Override
-	public List<BusinessCategory> selectBusinessProjectCatalog() {
-		
-		return businessProjectMapper.selectBusinessProjectCatalog();
-	}
-	
-}
-
+package com.goafanti.business.service.impl;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.app.bo.ProjectBo;
+import com.goafanti.app.bo.ProjectDetailBo;
+import com.goafanti.business.bo.BusinessProjectBo;
+import com.goafanti.business.bo.ProjectSizeBo;
+import com.goafanti.business.service.BusinessProjectService;
+import com.goafanti.common.dao.BusinessProjectMapper;
+import com.goafanti.common.dao.BusinessCategoryMapper;
+import com.goafanti.common.dao.ProjectInterestMapper;
+import com.goafanti.common.dao.BusinessProjectModelMapper;
+import com.goafanti.common.model.BusinessProject;
+import com.goafanti.common.model.BusinessCategory;
+import com.goafanti.common.model.BusinessProjectModel;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
+
+@Service
+public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMapper> implements BusinessProjectService {
+	@Autowired
+	BusinessProjectMapper businessProjectMapper;
+	@Autowired
+	BusinessCategoryMapper businessVarietiesMapper;
+	@Autowired
+	BusinessProjectModelMapper projectSizeMapper;
+	@Autowired
+	ProjectInterestMapper projectInterestMapper;
+	
+	@Override
+	public int insert(String bname, String cid, String country, String province, String city, String district,String boutique) {
+		BusinessProject bp=new BusinessProject();
+		bp.setId(UUID.randomUUID().toString());
+		bp.setBname(bname);
+		bp.setCid(cid);
+		bp.setCountry(country);
+		bp.setType(0);
+		if (1!=Integer.valueOf(country)) {
+			bp.setProvince(province);
+			bp.setCity(city);
+			bp.setDistrict(district);
+		}
+		bp.setDeleteSign(0);
+		//bp.setCreateId("f31c0d1a-05bc-4f5c-b4a8-95f983d24131");
+		if (StringUtils.isNotBlank(TokenManager.getAdminId())) {
+			bp.setCreateId(TokenManager.getAdminId());
+		}
+		bp.setCreateTime(new Date());
+		bp.setStatus("0");
+		bp.setBoutique(Integer.valueOf(boutique));
+		bp.setFirstPayment(new BigDecimal("0"));
+		return businessProjectMapper.insert(bp);
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<BusinessProjectBo> listProject(String bname, String cid, String country,String province,String city,String district, String activityFlag,
+			String status,Integer type, Integer pNo, Integer pSize) {
+		if (pNo == null || pNo < 0)pNo = 1;
+		if (pSize == null || pSize < 0 )pSize = 10;
+		Pagination<BusinessProjectBo> pt=(Pagination<BusinessProjectBo>)findPage("findProjectListByPage", "findProjectListCount",
+				disposeParams(bname,  cid,  country, province, city, district,  activityFlag,
+						 status,type),pNo,pSize);
+		List<BusinessProjectBo> list=(List<BusinessProjectBo>) pt.getList();
+		for (BusinessProjectBo o : list) {
+			o.setCname(getAllCname(o.getCid()));
+		}
+		return pt;
+	}
+	private Map<String, Object> disposeParams(String bname, String cid, String country,String province,String city,String district, String activityFlag,
+			String status,Integer type) {
+		Map<String, Object> params = new HashMap<>();
+		if (StringUtils.isNotBlank(bname)) {
+			params.put("bname", bname);
+		}
+		if (StringUtils.isNotBlank(cid)) {
+			params.put("cid", cid);
+		}
+		if (StringUtils.isNotBlank(country)) {
+			params.put("country", country);
+		}
+		if (StringUtils.isNotBlank(province)) {
+			params.put("province", province);
+		}
+		if (StringUtils.isNotBlank(city)) {
+			params.put("city", city);
+		}
+		if (StringUtils.isNotBlank(district)) {
+			params.put("district", district);
+		}
+		if (StringUtils.isNotBlank(activityFlag)) {
+			params.put("activityFlag", activityFlag);
+		}
+		if (StringUtils.isNotBlank(status)) {
+			params.put("status", status);
+		}
+		if (type!=null ) {
+			params.put("type", type);
+		}
+		return params;
+	}
+	@Override
+	public int getBnamecount(String bname) {
+		
+		return businessProjectMapper.getBnamecount(bname);
+	}
+	@Override
+	public int deleteProject(String id) {
+		BusinessProject bp=businessProjectMapper.selectByPrimaryKey(id);
+		if (bp.getDeleteSign()==0) {
+			bp.setDeleteSign(1);
+		}else {
+			bp.setDeleteSign(0);
+		}
+		
+		return businessProjectMapper.updateByPrimaryKey(bp);
+	}
+	@Override
+	public int updateStopProject(String id) {
+		BusinessProject bp=businessProjectMapper.selectByPrimaryKey(id);
+		if (Integer.valueOf(bp.getStatus())==0) {
+			bp.setStatus("1");
+		}else {
+			bp.setStatus("0");
+		}
+		
+		return businessProjectMapper.updateByPrimaryKey(bp);
+	}
+	@Override
+	public BusinessProjectBo orgProjects(String id) {
+		BusinessProject bp=businessProjectMapper.selectByPrimaryKey(id);
+		BusinessProjectBo bpo=new BusinessProjectBo();
+		BeanUtils.copyProperties(bp,bpo);
+		String cname=getAllCname(bpo.getCid());
+		String createId=bpo.getCreateId();
+		bpo.setCreateName(businessProjectMapper.getCreateName(createId));
+		bpo.setCname(cname);
+		return bpo;
+	}
+	@Override
+	public ProjectDetailBo orgProject(String id) {
+		ProjectDetailBo pd=businessProjectMapper.selectAppProjectDetail(id);
+		int i=projectInterestMapper.checkUidAndDid(id,TokenManager.getUserId());
+		
+		if (TokenManager.isLogin()&&i>0) {
+			pd.setInterest("1");
+		}else {
+			pd.setInterest("0");
+		}
+		pd.setProjectSize(projectSizeMapper.selectPidList(id));
+		return pd;
+	}
+	
+	@Override
+	public List<Map<String, String>> getAllCnames(Integer flag) {
+		List<Map<String, String>> list=new ArrayList<Map<String, String>>();
+		List<String> listcid=businessVarietiesMapper.getListId();
+		for (String s : listcid) {
+			Map<String, String> map=new HashMap<>(); 
+			String cname=getAllCname(s);
+			map.put("id", s);
+			map.put("cname", cname);
+			if (flag==1) {
+				if (StringUtils.isBlank(cname)) {
+					map.put("cname", "平台超级业务品类");
+				}
+				list.add(map);
+			}else {
+				if (StringUtils.isNotBlank(cname)) {
+					list.add(map);
+				}
+			}
+		}
+		return list;
+	}
+	/**
+	 * 递归获取上级来获取全路径
+	 * @param s	ID
+	 * @return  路径
+	 */
+	private String getAllCname(String s) {
+		String cid=businessVarietiesMapper.getThisCid(s);
+		String cname=businessVarietiesMapper.getThisCname(cid);
+		BusinessCategory bv=businessVarietiesMapper.selectByPrimaryKey(s);
+		String sid="";
+		if(bv!=null&&null!=bv.getSuperId())sid=bv.getSuperId();
+		if(null==cid)return "";
+		if (cid.length()>4) {
+			if(bv.getSuperId().equals(bv.getId())){
+				return "";
+			}
+			String w=getAllCname(sid)+"-"+cname;
+			return w;
+		}else{
+			return cid.length()>3?cname:"";
+		}
+		
+	}
+	
+	
+	
+	@Override
+	public int updateProject(BusinessProject s) {
+		BusinessProject bp=businessProjectMapper.selectByPrimaryKey(s.getId());
+		TheGinseng(s, bp);
+		return businessProjectMapper.updateByPrimaryKey(bp);
+	}
+	private void TheGinseng(BusinessProject s, BusinessProject bp) {
+		
+		if (StringUtils.isNotBlank(s.getBname())) {
+			bp.setBname(s.getBname());
+		}
+		if (StringUtils.isNotBlank(s.getCid())) {
+			bp.setCid(s.getCid());
+		}
+		if (StringUtils.isNotBlank(s.getCountry())) {
+			bp.setCountry(s.getCountry());
+		}
+		if (StringUtils.isNotBlank(s.getProvince())) {
+			bp.setProvince(s.getProvince());
+			bp.setCity(s.getCity());
+			bp.setDistrict(s.getDistrict());
+		}
+		if (StringUtils.isNotBlank(s.getCity())) {
+			bp.setCity(s.getCity());
+			bp.setDistrict(s.getDistrict());
+		}
+		if (StringUtils.isNotBlank(s.getDistrict())) {
+			bp.setDistrict(s.getDistrict());
+		}
+
+		bp.setPrice(s.getPrice());
+		bp.setOffset(s.getOffset());
+		bp.setActivityFlag(s.getActivityFlag());
+		bp.setMemberPrice(s.getMemberPrice());
+		bp.setActivityPrice(s.getActivityPrice());
+		bp.setIntroduce(s.getIntroduce());
+		bp.setValueEffect(s.getValueEffect());
+		bp.setClientSize(s.getClientSize());
+		bp.setMinLogo(s.getMinLogo());
+		bp.setMaxLogo(s.getMaxLogo());
+		bp.setBoutique(s.getBoutique());
+		bp.setProjectUrl(s.getProjectUrl());
+		bp.setFirstPayment(s.getFirstPayment());
+		bp.setType(s.getType());
+		if (null!=(s.getStatus())) {
+			bp.setStatus(s.getStatus());
+		}
+		bp.setUpdateTime(new Date());
+	}
+	@Override
+	public int addProjectSize(BusinessProjectModel ps) {
+		ps.setId(UUID.randomUUID().toString());
+		if (StringUtils.isNotBlank(TokenManager.getAdminId())) {
+		ps.setCreateId(TokenManager.getAdminId());
+		}
+		//ps.setCreateId("f31c0d1a-05bc-4f5c-b4a8-95f983d24131");
+		ps.setCreateTime(new Date());
+		ps.setStatus(0);
+		return projectSizeMapper.insert(ps);
+	}
+	@Override
+	public int updateOrgProjectSize(BusinessProjectModel ps) {
+		BusinessProjectModel psz=projectSizeMapper.selectByPrimaryKey(ps.getId());
+		projectSizeConfiguration(ps, psz);
+		System.out.println(psz);
+		return projectSizeMapper.updateByPrimaryKeySelective(psz);
+	}
+	private void projectSizeConfiguration(BusinessProjectModel ps, BusinessProjectModel psz) {
+		if (StringUtils.isNotBlank(ps.getPid())) {
+			psz.setId(ps.getPid());
+		}
+		if (StringUtils.isNotBlank(ps.getPname())) {
+			psz.setPname(ps.getPname());
+		}
+		if (null!=ps.getPrice()) {
+			psz.setPrice(ps.getPrice());
+		}
+		if (null!=(ps.getOffset())) {
+			psz.setOffset(ps.getOffset());
+		}
+		if (null!=(ps.getActivityFlag())) {
+			psz.setActivityFlag(ps.getActivityFlag());
+		}
+		if (null!=(ps.getMemberPrice())) {
+			psz.setMemberPrice(ps.getMemberPrice());
+		}
+		if (null!=(ps.getActivityPrice())) {
+			psz.setActivityPrice(ps.getActivityPrice());
+		}
+		if (null!=(ps.getStatus())) {
+			psz.setStatus(ps.getStatus());
+		}
+		psz.setUpdateTime(new Date());
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<ProjectSizeBo>  listProjectSize(String pid,Integer pNo,Integer pSize) {
+		if (pNo == null || pNo < 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		} 
+		Map<String, Object>map=new HashMap<>();
+		map.put("pid", pid);
+			
+		
+		Pagination<ProjectSizeBo> pt=(Pagination<ProjectSizeBo>)findPage("findProjectSizeListByPage", "findProjectSizeListCount",
+				map,pNo,pSize);
+		return pt;
+	}
+	@Override
+	public ProjectSizeBo getProjectSize(String id) {
+		return projectSizeMapper.selectByBusinessId(id);
+	}
+	@Override
+	public int deleteProjectSize(String id) {
+		
+		return projectSizeMapper.deleteByPrimaryKey(id);
+	}
+	@Override
+	public int updateSotpProjectSize(String id) {
+		BusinessProjectModel ps=projectSizeMapper.selectByPrimaryKey(id);
+			int i=ps.getStatus();
+			if (i==0) {
+				ps.setStatus(1);
+			}else {
+				ps.setStatus(0);
+			}
+		return projectSizeMapper.updateByPrimaryKey(ps);
+	}
+	@Override
+	public boolean WhetherRepeat(BusinessProjectModel ps) {
+		List<ProjectSizeBo> list=projectSizeMapper.getgetPnamecount(ps.getPname());
+		
+		for (ProjectSizeBo p : list) {
+			if (p.getPid().equals(ps.getPid())) {
+				return true;
+			}
+		}
+		return false;
+	}
+	@Override
+	public boolean judgeStatus(BusinessProjectModel ps) {
+		 BusinessProject bp=businessProjectMapper.selectByPrimaryKey(ps.getPid());
+		if (Integer.valueOf(bp.getStatus())==1) {
+			return true;
+		}else {
+			return false;
+		}
+		
+	}
+	@Override
+	public boolean judgeBeing(BusinessProject s) {
+		BusinessProject bp=businessProjectMapper.selectByPrimaryKey(s.getId());
+		BusinessProject bp1=businessProjectMapper.selectByPrimaryBname(s.getBname());
+		if (null==bp||null==bp1||bp.getId().equals(bp1.getId())) {
+			return false;
+		}else {
+			return true;
+		}
+		
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<ProjectBo> getBusinessProject(String id,Integer pNo,Integer pSize) {
+		if (pNo == null || pNo <= 0) {
+			pNo = 1;
+		}
+
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+		Map<String, Object> params = new HashMap<>();
+		if (StringUtils.isNotBlank(id)) {
+			params.put("id", id);
+		}
+		
+		Pagination<ProjectBo> data =  (Pagination<ProjectBo>)findPage("getBusinessProject", "getBusinessProjectCount",
+				params,pNo,pSize);
+		return data;
+		
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<ProjectBo> recommendProjectList(Integer pNo, Integer pSize) {
+		if (pNo == null || pNo <= 0) {
+			pNo = 1;
+		}
+		if (pSize == null || pSize < 0 || pSize > 10) {
+			pSize = 10;
+		}
+		Map<String, Object> params = new HashMap<>();
+		return (Pagination<ProjectBo>)findPage("findRecommendProjectListByPage", "findRecommendProjectListCount",
+				params,pNo,pSize);
+	}
+	@Override
+	public boolean checkProject(String id) {
+		if (businessProjectMapper.checkProject(id)>0) {
+			return true;
+		}
+		return false;
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<ProjectBo> portalRecommendList(Integer pNo, Integer pSize) {
+		Map<String, Object> params = new HashMap<>();
+		return (Pagination<ProjectBo>)findPage("findRecommendProjectListByPage", "findRecommendProjectListCount",
+				params,pNo,pSize);
+	}
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<ProjectBo> portalBusinessProject(String id, Integer pNo, Integer pSize) {
+		Map<String, Object> params = new HashMap<>();
+		if (StringUtils.isNotBlank(id)) {
+			params.put("id", id);
+		}
+		Pagination<ProjectBo> data =  (Pagination<ProjectBo>)findPage("getBusinessProject", "getBusinessProjectCount",
+				params,pNo,pSize);
+		return data;
+	
+	}
+	
+	@Override
+	public ProjectDetailBo ProjectDetail(String id) {
+		ProjectDetailBo pd=businessProjectMapper.selectAppProjectDetail(id);
+		if (StringUtils.isNotBlank(TokenManager.getUserId())&&projectInterestMapper.checkUidAndDid(id,TokenManager.getUserId())>0) {
+			pd.setInterest("1");
+		}else {
+			pd.setInterest("0");
+		}
+		pd.setProjectSize(projectSizeMapper.selectPidList(id));
+		return pd;
+	
+	}
+	
+	@Override
+	public List<ProjectBo> portalRecommend() {
+		return businessProjectMapper.selectServiceProjectDetail();
+	}
+	
+	@Override
+	public List<BusinessProject> selectBusinessProjectByName(String businessName,String cid) {
+		return businessProjectMapper.selectBusinessProjectByName(businessName,cid);
+	}
+	
+	@Override
+	public List<BusinessCategory> selectBusinessProjectCatalog() {
+		
+		return businessProjectMapper.selectBusinessProjectCatalog();
+	}
+	
+}
+

+ 128 - 125
src/main/java/com/goafanti/order/bo/NewOderCahngeListBo.java

@@ -1,125 +1,128 @@
-package com.goafanti.order.bo;
-
-public class NewOderCahngeListBo {
-	private Integer id;
-	private String orderNo;
-	private String contractNo;
-	private String createTimes;
-	private String nickname;
-	private Integer orderType;
-	private String establishTimes;
-	private Integer type;
-	private Integer status;
-	private Integer orderStatus;
-	private String totalAmount;
-	private String settlementAmount;
-	private String arrears;
-	private String salesmanName;
-	private String depName;
-	private Integer processState;
-	private Integer backStatus;
-	public String getCreateTimes() {
-		return createTimes;
-	}
-	public void setCreateTimes(String createTimes) {
-		this.createTimes = createTimes;
-	}
-	public String getNickname() {
-		return nickname;
-	}
-	public void setNickname(String nickname) {
-		this.nickname = nickname;
-	}
-	public Integer getOrderType() {
-		return orderType;
-	}
-	public void setOrderType(Integer orderType) {
-		this.orderType = orderType;
-	}
-	public String getEstablishTimes() {
-		return establishTimes;
-	}
-	public void setEstablishTimes(String establishTimes) {
-		this.establishTimes = establishTimes;
-	}
-	public Integer getOrderStatus() {
-		return orderStatus;
-	}
-	public void setOrderStatus(Integer orderStatus) {
-		this.orderStatus = orderStatus;
-	}
-	public String getTotalAmount() {
-		return totalAmount;
-	}
-	public void setTotalAmount(String totalAmount) {
-		this.totalAmount = totalAmount;
-	}
-	public String getSettlementAmount() {
-		return settlementAmount;
-	}
-	public void setSettlementAmount(String settlementAmount) {
-		this.settlementAmount = settlementAmount;
-	}
-	public String getArrears() {
-		return arrears;
-	}
-	public void setArrears(String arrears) {
-		this.arrears = arrears;
-	}
-	public String getSalesmanName() {
-		return salesmanName;
-	}
-	public void setSalesmanName(String salesmanName) {
-		this.salesmanName = salesmanName;
-	}
-	public String getDepName() {
-		return depName;
-	}
-	public void setDepName(String depName) {
-		this.depName = depName;
-	}
-	public String getOrderNo() {
-		return orderNo;
-	}
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-	public Integer getProcessState() {
-		return processState;
-	}
-	public void setProcessState(Integer processState) {
-		this.processState = processState;
-	}
-	public Integer getId() {
-		return id;
-	}
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	public Integer getType() {
-		return type;
-	}
-	public void setType(Integer type) {
-		this.type = type;
-	}
-	public Integer getStatus() {
-		return status;
-	}
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-	public String getContractNo() {
-		return contractNo;
-	}
-	public void setContractNo(String contractNo) {
-		this.contractNo = contractNo;
-	}
-	public Integer getBackStatus() {
-		return backStatus;
-	}
-	public void setBackStatus(Integer backStatus) {
-		this.backStatus = backStatus;
-	}
-	
-	
-}
+package com.goafanti.order.bo;
+
+import java.math.BigDecimal;
+
+public class NewOderCahngeListBo {
+	private Integer id;
+	private String orderNo;
+	private String contractNo;
+	private String createTimes;
+	private String nickname;
+	private Integer orderType;
+	private String establishTimes;
+	private Integer type;
+	private Integer status;
+	private Integer orderStatus;
+	private BigDecimal totalAmount;
+	private BigDecimal settlementAmount;
+	private BigDecimal arrears;
+	private String salesmanName;
+	private String depName;
+	private Integer processState;
+	private Integer backStatus;
+	public String getCreateTimes() {
+		return createTimes;
+	}
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+	public String getNickname() {
+		return nickname;
+	}
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
+	public Integer getOrderType() {
+		return orderType;
+	}
+	public void setOrderType(Integer orderType) {
+		this.orderType = orderType;
+	}
+	public String getEstablishTimes() {
+		return establishTimes;
+	}
+	public void setEstablishTimes(String establishTimes) {
+		this.establishTimes = establishTimes;
+	}
+	public Integer getOrderStatus() {
+		return orderStatus;
+	}
+	public void setOrderStatus(Integer orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+	public BigDecimal getTotalAmount() {
+		return totalAmount;
+	}
+	public void setTotalAmount(BigDecimal totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+	public BigDecimal getSettlementAmount() {
+		return settlementAmount;
+	}
+	public void setSettlementAmount(BigDecimal settlementAmount) {
+		this.settlementAmount = settlementAmount;
+	}
+	public BigDecimal getArrears() {
+		return arrears;
+	}
+	public void setArrears(BigDecimal arrears) {
+		this.arrears = arrears;
+	}
+	public String getSalesmanName() {
+		return salesmanName;
+	}
+	public void setSalesmanName(String salesmanName) {
+		this.salesmanName = salesmanName;
+	}
+	public String getDepName() {
+		return depName;
+	}
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public Integer getProcessState() {
+		return processState;
+	}
+	public void setProcessState(Integer processState) {
+		this.processState = processState;
+	}
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public Integer getBackStatus() {
+		return backStatus;
+	}
+	public void setBackStatus(Integer backStatus) {
+		this.backStatus = backStatus;
+	}
+	
+	
+	
+}

+ 114 - 112
src/main/java/com/goafanti/order/bo/ReceivablesListBo.java

@@ -1,112 +1,114 @@
-package com.goafanti.order.bo;
-
-public class ReceivablesListBo {
-	private Integer id;
-	private String orderNo;
-	private String contractNo;
-	private String corporateName;
-	private String nickname;
-	private String totalAmount;
-	private String settlementAmount;
-	private String depName;
-	private Integer status;
-	private Integer inptStatus;
-	private String amount;
-	private String receivablesTimes;
-	private String createTimes;
-	private String financialPayNo;
-	private String remarks;
-	public String getOrderNo() {
-		return orderNo;
-	}
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-	public String getContractNo() {
-		return contractNo;
-	}
-	public void setContractNo(String contractNo) {
-		this.contractNo = contractNo;
-	}
-	public String getCorporateName() {
-		return corporateName;
-	}
-	public void setCorporateName(String corporateName) {
-		this.corporateName = corporateName;
-	}
-	public String getNickname() {
-		return nickname;
-	}
-	public void setNickname(String nickname) {
-		this.nickname = nickname;
-	}
-	public String getTotalAmount() {
-		return totalAmount;
-	}
-	public void setTotalAmount(String totalAmount) {
-		this.totalAmount = totalAmount;
-	}
-	public String getDepName() {
-		return depName;
-	}
-	public void setDepName(String depName) {
-		this.depName = depName;
-	}
-	public String getReceivablesTimes() {
-		return receivablesTimes;
-	}
-	public void setReceivablesTimes(String receivablesTimes) {
-		this.receivablesTimes = receivablesTimes;
-	}
-	public String getCreateTimes() {
-		return createTimes;
-	}
-	public void setCreateTimes(String createTimes) {
-		this.createTimes = createTimes;
-	}
-	public String getRemarks() {
-		return remarks;
-	}
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
-	}
-	public Integer getStatus() {
-		return status;
-	}
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-	public String getAmount() {
-		return amount;
-	}
-	public void setAmount(String amount) {
-		this.amount = amount;
-	}
-	public Integer getId() {
-		return id;
-	}
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	public String getFinancialPayNo() {
-		return financialPayNo;
-	}
-	public void setFinancialPayNo(String financialPayNo) {
-		this.financialPayNo = financialPayNo;
-	}
-	public String getSettlementAmount() {
-		return settlementAmount;
-	}
-	public void setSettlementAmount(String settlementAmount) {
-		this.settlementAmount = settlementAmount;
-	}
-	public Integer getInptStatus() {
-		return inptStatus;
-	}
-	public void setInptStatus(Integer inptStatus) {
-		this.inptStatus = inptStatus;
-	}
-	
-	
-
-}
+package com.goafanti.order.bo;
+
+import java.math.BigDecimal;
+
+public class ReceivablesListBo {
+	private Integer id;
+	private String orderNo;
+	private String contractNo;
+	private String corporateName;
+	private String nickname;
+	private BigDecimal totalAmount;
+	private BigDecimal settlementAmount;
+	private String depName;
+	private Integer status;
+	private Integer inptStatus;
+	private BigDecimal amount;
+	private String receivablesTimes;
+	private String createTimes;
+	private String financialPayNo;
+	private String remarks;
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public String getCorporateName() {
+		return corporateName;
+	}
+	public void setCorporateName(String corporateName) {
+		this.corporateName = corporateName;
+	}
+	public String getNickname() {
+		return nickname;
+	}
+	public void setNickname(String nickname) {
+		this.nickname = nickname;
+	}
+	public BigDecimal getTotalAmount() {
+		return totalAmount;
+	}
+	public void setTotalAmount(BigDecimal totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+	public String getDepName() {
+		return depName;
+	}
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+	public String getReceivablesTimes() {
+		return receivablesTimes;
+	}
+	public void setReceivablesTimes(String receivablesTimes) {
+		this.receivablesTimes = receivablesTimes;
+	}
+	public String getCreateTimes() {
+		return createTimes;
+	}
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+	public String getRemarks() {
+		return remarks;
+	}
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public BigDecimal getAmount() {
+		return amount;
+	}
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getFinancialPayNo() {
+		return financialPayNo;
+	}
+	public void setFinancialPayNo(String financialPayNo) {
+		this.financialPayNo = financialPayNo;
+	}
+	public BigDecimal getSettlementAmount() {
+		return settlementAmount;
+	}
+	public void setSettlementAmount(BigDecimal settlementAmount) {
+		this.settlementAmount = settlementAmount;
+	}
+	public Integer getInptStatus() {
+		return inptStatus;
+	}
+	public void setInptStatus(Integer inptStatus) {
+		this.inptStatus = inptStatus;
+	}
+	
+	
+
+}

+ 6 - 6
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -43,8 +43,8 @@ public class TOrderTaskListBo {
 	//判断是不是自己的单 0 是 1否
 	//private Integer distributeSign;
 	
-	private String costAmount;
-	private String partyAmount;
+	private BigDecimal costAmount;
+	private BigDecimal partyAmount;
 	public String getSplitSuper() {
 		return splitSuper;
 	}
@@ -243,16 +243,16 @@ public class TOrderTaskListBo {
 	public void setProjectType(Integer projectType) {
 		this.projectType = projectType;
 	}
-	public String getCostAmount() {
+	public BigDecimal getCostAmount() {
 		return costAmount;
 	}
-	public void setCostAmount(String costAmount) {
+	public void setCostAmount(BigDecimal costAmount) {
 		this.costAmount = costAmount;
 	}
-	public String getPartyAmount() {
+	public BigDecimal getPartyAmount() {
 		return partyAmount;
 	}
-	public void setPartyAmount(String partyAmount) {
+	public void setPartyAmount(BigDecimal partyAmount) {
 		this.partyAmount = partyAmount;
 	}
 	public Integer getOutsourceType() {

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

@@ -780,9 +780,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
     				case "订单类型": o = OrderType.getValueByCode(ob.getOrderType()); break;
     				case "下单时间": o = ob.getEstablishTimes(); break;
     				case "订单状态": o = OrderNewState.getValueByCode(ob.getOrderStatus()); break;
-    				case "合同额(万元)": o = ob.getTotalAmount(); break;
-    				case "已付额(万元)": o = ob.getSettlementAmount(); break;
-    				case "欠款(万元)": o = ob.getArrears(); break;
+    				case "合同额(万元)": o = ob.getTotalAmount().toString(); break;
+    				case "已付额(万元)": o = ob.getSettlementAmount().toString(); break;
+    				case "欠款(万元)": o = ob.getArrears().toString(); break;
     				case "订单负责人": o = ob.getSalesmanName(); break;
     				case "变更类型": o = OrderChangeType.getValueByCode(ob.getType()); break;
     				case "变更审核状态": o = getProcessState(ob.getProcessState(),ob.getStatus()); break;

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

@@ -768,8 +768,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
     				case "完成时间": o = ob.getTaskEndTime(); break;
     				case "签单日期": o = ob.getSignTime(); break;
     				case "派单日期": o = ob.getCreteTime();break;
-    				case "成本(万元)": o = ob.getCostAmount(); break;
-    				case "已付(万元)": o = ob.getPartyAmount(); break;
+    				case "成本(万元)": o = ob.getCostAmount().toString(); break;
+    				case "已付(万元)": o = ob.getPartyAmount().toString(); break;
     				default: o = ""; break;
     				}
     				XSSFCell c = r.createCell(i);
@@ -877,8 +877,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
     				case "订单部门": o =ob.getDepName(); break; 
     				case "累计工时": o = ob.getHours().toString(); break;
     				case "项目金额": o = ob.getCommodityPrice().toString(); break;
-    				case "成本(万元)": o = ob.getCostAmount(); break;
-    				case "已付(万元)": o = ob.getPartyAmount(); break;
+    				case "成本(万元)": o = ob.getCostAmount().toString(); break;
+    				case "已付(万元)": o = ob.getPartyAmount().toString(); break;
     				default: o = ""; break;
     				}
     				XSSFCell c = r.createCell(i);

File diff suppressed because it is too large
+ 735 - 735
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java


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

@@ -64,12 +64,12 @@ user_remind_days=15
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com:3000/1.1.48
+static.host=//sb.jishutao.com:3000/1.1.49
 avatar.host=//sb.jishutao.com
 
 #连测试
 #avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.48
+#static.host=//static.jishutao.com/1.1.49
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

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

@@ -59,7 +59,7 @@ user.private.max=1000
 #客户释放提醒
 user_remind_days=15
 
-static.host=//static.jishutao.com/1.1.48
+static.host=//static.jishutao.com/1.1.49
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload