Преглед на файлове

项目汇总列表修改

anderx преди 3 години
родител
ревизия
76851a23c5

+ 2 - 0
src/main/java/com/goafanti/business/controller/AdminBusinessProjectController.java

@@ -225,4 +225,6 @@ public class AdminBusinessProjectController extends CertifyApiController{
 		res.setData(businessprojectService.updateSotpProjectSize(id));
 		return res;
 	}
+
+
 }

+ 1 - 2
src/main/java/com/goafanti/business/service/BusinessProjectService.java

@@ -28,7 +28,7 @@ public interface BusinessProjectService {
 
 	BusinessProjectBo orgProjects(String id);
 
-	List<Map<String, String>> getAllCnames(Integer flag);
+	List<Map<String, Object>> getAllCnames(Integer flag);
 
 	int updateProject(BusinessProject s);
 
@@ -67,5 +67,4 @@ public interface BusinessProjectService {
 	List<BusinessCategory> selectBusinessProjectCatalog();
 
 
-
 }

+ 34 - 3
src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import com.goafanti.order.enums.ProjectType;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -160,14 +161,16 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 	}
 
 	@Override
-	public List<Map<String, String>> getAllCnames(Integer flag) {
-		List<Map<String, String>> list=new ArrayList<Map<String, String>>();
+	public List<Map<String, Object>> getAllCnames(Integer flag) {
+		if (flag==null)flag=0;
+		List<Map<String, Object>> list=new ArrayList<Map<String, Object>>();
 		List<String> listcid=businessVarietiesMapper.getListId();
 		for (String s : listcid) {
-			Map<String, String> map=new HashMap<>();
+			Map<String, Object> map=new HashMap<>();
 			String cname=getAllCname(s);
 			map.put("id", s);
 			map.put("cname", cname);
+			map.put("typeList",selectProjectAndTypeById(s));
 			if (flag==1) {
 				if (StringUtils.isBlank(cname)) {
 					map.put("cname", "平台超级业务品类");
@@ -457,5 +460,33 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		return businessProjectMapper.selectBusinessProjectCatalog();
 	}
 
+
+	public List<Map> selectProjectAndTypeById(String id) {
+		List<Map> list=businessProjectMapper.selectProjectAndTypeAll();
+		for (Map map : list) {
+			if (id.equals(map.get("id"))){
+				List<Map> typeList=new ArrayList<>();
+				String groupCount= (String) map.get("groupCount");
+				if (groupCount!=null){
+					String[] ss=groupCount.split(",");
+					Map<String, String> typeBo = new HashMap<>();
+					typeBo.put("id",null);
+					typeBo.put("name", "全部");
+					typeList.add(typeBo);
+					if (ss.length>0){
+						for (String s : ss) {
+							Map<String, String> types = new HashMap<>();
+							types.put("id",s);
+							types.put("name", ProjectType.getValueByCode(Integer.valueOf(s)));
+							typeList.add(types);
+						}
+					}
+					return typeList;
+				}
+			}
+		}
+		return  new ArrayList<>();
+	}
+
 }
 

+ 3 - 1
src/main/java/com/goafanti/common/dao/BusinessProjectMapper.java

@@ -9,6 +9,8 @@ import com.goafanti.order.bo.Outproject;
 import com.goafanti.common.model.BusinessCategory;
 
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 
 public interface BusinessProjectMapper {
@@ -46,5 +48,5 @@ public interface BusinessProjectMapper {
 	 List<BusinessCategory> selectBusinessProjectCatalog();
 
 
-
+    List<Map> selectProjectAndTypeAll();
 }

+ 4 - 0
src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml

@@ -567,5 +567,9 @@
   <select id="selectBusinessProjectCatalog" resultType="com.goafanti.common.model.BusinessCategory">
   	select id,cname from business_category where delete_sign=0
   </select>
+    <select id="selectProjectAndTypeAll" resultType="java.util.Map">
+      select bc.id,  group_concat(distinct bp.`type`)groupCount  from business_category bc
+        left join business_project bp on bc.id =bp.cid group by bc.id
+    </select>
 
 </mapper>

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

@@ -1267,12 +1267,17 @@
       date_format(tp.licence_time, '%Y-%m-%d' ) licenceTime ,date_format(tp.authorize_time, '%Y-%m-%d ' )  authorizeTime,
       ttm.reject_count	rejectCount ,ttm.cost_amount costAmount ,(a.commodity_price-ttm.cost_amount)profit,
     </if>
-
+    <if test="status==5">
+      ,tm.service_life serviceLife, ,tm.service_year serviceyear, ,tm.year_sum yearsum, ,tm.contract_term contractTerm,
+    </if>
     a.commodity_quantity commodityQuantity , a.commodity_price commodityPrice ,a.special_comment specialComment,a.task_comment taskComment
     from t_order_task a left join t_order_new b on a.order_no =b.order_no left join department c on b.order_dep =c.id left join district_glossory d on c.province=d.id
     <if test="status==3 or status==4">
       left join task_progress tp  on a.id=tp.task_id
     </if>
+    <if test="status==5">
+      left join t_task_member tm on a.id=tm.tid
+    </if>
     left join t_order_mid e on b.order_no =e.order_no left join business_project bp on a.commodity_id =bp.id left join business_category bc on bp.cid =bc.id
     left join t_task_mid ttm on a.id=ttm.tid left join admin ta on a.task_receiver =ta.id left join department td on ta.department_id =td.id
     <if test="screen ==6">

+ 1 - 0
src/main/java/com/goafanti/order/bo/InputProjectStatistics.java

@@ -17,6 +17,7 @@ public class InputProjectStatistics {
 	private Integer pageNo;
 	private Integer pageSize;
 
+	/** 双软=2,软著=3,专利=4,高新=1,其他=0 */
 	private Integer status;
 	private String depName;
 	private String thchDepName;

+ 38 - 0
src/main/java/com/goafanti/order/bo/OutProjectStatistics.java

@@ -59,6 +59,44 @@ public class OutProjectStatistics {
 
 	private String orderRemarks;
 
+	//会员
+	private String serviceLife;
+	private String serviceyear;
+	private String yearsum;
+	private String contractTerm;
+
+	public String getServiceLife() {
+		return serviceLife;
+	}
+
+	public void setServiceLife(String serviceLife) {
+		this.serviceLife = serviceLife;
+	}
+
+	public String getServiceyear() {
+		return serviceyear;
+	}
+
+	public void setServiceyear(String serviceyear) {
+		this.serviceyear = serviceyear;
+	}
+
+	public String getYearsum() {
+		return yearsum;
+	}
+
+	public void setYearsum(String yearsum) {
+		this.yearsum = yearsum;
+	}
+
+	public String getContractTerm() {
+		return contractTerm;
+	}
+
+	public void setContractTerm(String contractTerm) {
+		this.contractTerm = contractTerm;
+	}
+
 	public String getOrderRemarks() {
 		return orderRemarks;
 	}

+ 8 - 2
src/main/java/com/goafanti/order/enums/ProjectType.java

@@ -19,9 +19,15 @@ public enum ProjectType {
 	SJ(3,"审计"),
 	/** 已撤项 **/
 	SR(4,"双软"),
+	/** 已撤项 **/
+	GX(5,"高新"),
+	/** 已撤项 **/
+	SB(6,"商标"),
+	/** 已撤项 **/
+	HY(7,"会员"),
 	/** 无效 **/
 	INVALID(10, "INVALID");
-	
+
 	private ProjectType(Integer code, String desc) {
 		this.code = code;
 		this.desc = desc;
@@ -37,7 +43,7 @@ public enum ProjectType {
         }
         return  null;
     }
-	
+
 	static {
 		for (ProjectType value : ProjectType.values()) {
 			status.put(value.getCode(), value);

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

@@ -303,6 +303,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		return processStatus;
 	}
 
+
+
 	private void insetLog(Integer taskId, String taskReceiverId) {
 		TTaskLog tl=new TTaskLog();
 		tl.setCreateTime(new Date());

+ 0 - 2
src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java

@@ -82,8 +82,6 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 			params.put("amountEnd", e);
 		}
 		params.put("status",ps.getStatus()==null?0:ps.getStatus());
-
-
 		if(ps.getProvince()!=null)	params.put("province", ps.getProvince());
 		if(ps.getProjectId()!=null) params.put("projectId", ps.getProjectId());
 		if(ps.getScreen()!=null) params.put("screen", ps.getScreen());

+ 6 - 2
src/main/java/com/goafanti/user/service/impl/UserFollowServiceImpl.java

@@ -56,8 +56,12 @@ public class UserFollowServiceImpl extends BaseMybatisDao<UserFollowMapper>  imp
         if (in.getDeps()!=null){
             map.put("deps", departmentService.parseArray(in.getDeps()));
         }
-        if (in.getShiroType()!=null)map.put("shiroType",in.getShiroType());
-        else map.put("shiroType",0);
+        if (in.getShiroType()!=null){
+            map.put("shiroType",in.getShiroType());
+        }
+        else{
+            map.put("shiroType",0);
+        }
         if(in.getShiroType()==0){
         map.put("aid", TokenManager.getAdminId());
         }else if(in.getShiroType()==1){