Просмотр исходного кода

Merge remote-tracking branch 'origin/test' into dev

wanghui лет назад: 8
Родитель
Сommit
9a15d41d38
23 измененных файлов с 266 добавлено и 81 удалено
  1. 5 5
      src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java
  2. 2 2
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  3. 13 9
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  4. 3 0
      src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java
  5. 7 2
      src/main/java/com/goafanti/common/controller/WebpageController.java
  6. 4 0
      src/main/java/com/goafanti/common/dao/DailySalesReportMapper.java
  7. 7 0
      src/main/java/com/goafanti/common/dao/MarketingManagementMapper.java
  8. 1 3
      src/main/java/com/goafanti/common/mapper/AchievementDemandMapper.xml
  9. 12 0
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  10. 27 2
      src/main/java/com/goafanti/common/mapper/DailySalesReportMapper.xml
  11. 12 0
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  12. 40 25
      src/main/java/com/goafanti/common/mapper/MarketingManagementMapper.xml
  13. 4 2
      src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml
  14. 1 1
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  15. 5 6
      src/main/java/com/goafanti/demand/controller/AdminDemandApiController.java
  16. 2 2
      src/main/java/com/goafanti/demand/service/DemandService.java
  17. 60 11
      src/main/java/com/goafanti/marketing/bo/MarketingManagementBo.java
  18. 8 0
      src/main/java/com/goafanti/marketing/service/MarketingManagementService.java
  19. 10 0
      src/main/java/com/goafanti/marketing/service/impl/MarketingManagementServiceImpl.java
  20. 18 0
      src/main/java/com/goafanti/report/controller/ReportApiController.java
  21. 7 3
      src/main/java/com/goafanti/report/service/SalesReportServiceImpl.java
  22. 8 0
      src/main/java/com/goafanti/techproject/bo/ProjectListBo.java
  23. 10 8
      src/main/webapp/WEB-INF/views/portal/index.html

+ 5 - 5
src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java

@@ -96,7 +96,7 @@ public class AdminAchievementApiController extends CertifyApiController {
     @RequestMapping(value = "/orgList", method = RequestMethod.GET)
     private Result orgList(Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
             String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate,
-            Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot) {
+            Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot,String recordPerson) {
         Result res = new Result();
         Integer pNo = 1;
         Integer pSize = 10;
@@ -108,7 +108,7 @@ public class AdminAchievementApiController extends CertifyApiController {
         }
         
         Object o = achievementService.listOrgOwnerAchievement(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name,
-                keyword, category, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot);
+                keyword, category, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot, recordPerson);
         
         res.setData(o);
         
@@ -305,7 +305,7 @@ public class AdminAchievementApiController extends CertifyApiController {
         Achievement a = achievementService.selectByPrimaryKey(id);
         if (null == a || !AchievementAuditStatus.AUDITED.getCode().equals(a.getAuditStatus())
                 || !DeleteStatus.UNDELETE.getCode().equals(a.getDeletedSign())
-                || !AchievementReleaseStatus.RELEASED.getCode().equals(a.getReleaseStatus())) {
+                ) {
             res.getError().add(buildError("", "当前状态无法匹配!"));
             return res;
         }
@@ -674,7 +674,7 @@ public class AdminAchievementApiController extends CertifyApiController {
     @RequestMapping(value = "/manageList", method = RequestMethod.GET)
     private Result manageList(Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
             String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate,
-            Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot) {
+            Integer releaseStatus,String internationalFlag, String pageNo, String pageSize,Integer boutique,Integer hot,String recordPerson) {
         Result res = new Result();
         Integer pNo = 1;
         Integer pSize = 10;
@@ -686,7 +686,7 @@ public class AdminAchievementApiController extends CertifyApiController {
         }
         String techBrokerId=TokenManager.getAdminId();
         Object o = achievementService.listManageAchievement(techBrokerId,ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name,
-                keyword, category, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot);
+                keyword, category, status, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus,internationalFlag, pNo, pSize,boutique,hot,recordPerson);
         res.setData(o);     
         return res;
     }

+ 2 - 2
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -43,7 +43,7 @@ public interface AchievementService {
 
 	Pagination<AchievementListBo> listOrgOwnerAchievement(Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot,String recordPerson);
 
 	AchievementUserOwnerDetailBo selectUserOwnerDetail(String id );
 
@@ -101,7 +101,7 @@ public interface AchievementService {
 
 	Pagination<AchievementListBo> listManageAchievement(String techBrokerId,Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
-			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot);
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus,String internationalFlag, Integer pNo, Integer pSize,Integer boutique,Integer hot,String recordPerson);
 	
 	Pagination<AchievementListBo> listMyAchievement(String techBrokerId,Integer ownerType,String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,

+ 13 - 9
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -106,7 +106,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			Integer boutique, Integer hot) {
 		Map<String, Object> params = disposeParams(ownerType,username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique,null, hot);
+				boutique,null, hot,null);
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -128,10 +128,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	public Pagination<AchievementListBo> listOrgOwnerAchievement(Integer ownerType,String unitName, String ownerName, String ownerId,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
-			Integer boutique, Integer hot) {
+			Integer boutique, Integer hot,String recordPerson) {
 		Map<String, Object> params = disposeParams(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique,internationalFlag, hot);
+				boutique,internationalFlag, hot,recordPerson);
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -258,14 +258,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		}
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage", "findAchievementCount",
 				disposeParams(ownerType,null, null, TokenManager.getUserId(), auditStatus, serialNumber, name, keyword, category,
-						status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, null, null,null, null),
+						status, releaseDateStartDate, releaseDateEndDate,createDateStartDate,createDateEndDate, releaseStatus, null, null,null, null,null),
 				pNo, pSize);
 	}
 
 	private Map<String, Object> disposeParams(Integer ownerType,String username, String ownerName, String ownerId, Integer auditStatus,
 			Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, Integer type,
-			Integer boutique,String internationalFlag, Integer hot) {
+			Integer boutique,String internationalFlag, Integer hot,String recordPerson) {
 		Map<String, Object> params = new HashMap<>();
 
 		Date rStart = null;
@@ -275,6 +275,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 		if (null != ownerType) {
 			params.put("ownerType", ownerType);
 		}
+		if (null != recordPerson) {
+			params.put("recordPerson", recordPerson);
+		}
+		
 		if (!StringUtils.isBlank(releaseDateStartDate)) {
 			try {
 				rStart = DateUtils.parseDate(releaseDateStartDate, AFTConstants.YYYYMMDD);
@@ -778,7 +782,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			pSize = 10;
 		}
 		Map<String, Object> params=disposeParams(ownerType,null, null, ownerId, auditStatus, serialNumber, name, keyword, category,
-				status, releaseDateStartDate, releaseDateEndDate,null, null,  releaseStatus, null, null,null, null);
+				status, releaseDateStartDate, releaseDateEndDate,null, null,  releaseStatus, null, null,null, null,null);
 		if (null!=fieldA) {
 			params.put("fieldA", fieldA);
 		}
@@ -817,7 +821,7 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			Integer boutique, Integer hot) {
 		Map<String, Object> params = disposeParams(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique,internationalFlag, hot);
+				boutique,internationalFlag, hot,null);
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -839,10 +843,10 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 	public Pagination<AchievementListBo> listManageAchievement(String techBrokerId,Integer ownerType,String unitName, String ownerName, String ownerId,
 			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer releaseStatus, String internationalFlag,Integer pNo, Integer pSize,
-			Integer boutique, Integer hot) {
+			Integer boutique, Integer hot,String recordPerson) {
 		Map<String, Object> params = disposeParams(ownerType,unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode(),
-				boutique,internationalFlag, hot);
+				boutique,internationalFlag, hot,recordPerson);
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}

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

@@ -1,5 +1,6 @@
 package com.goafanti.business.service.impl;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -59,6 +60,7 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		bp.setCreateTime(new Date());
 		bp.setStatus("0");
 		bp.setBoutique(Integer.valueOf(boutique));
+		bp.setFirstPayment(new BigDecimal("0"));
 		return businessProjectMapper.insert(bp);
 	}
 	@SuppressWarnings("unchecked")
@@ -460,5 +462,6 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		
 		return businessProjectMapper.selectBusinessProjectCatalog();
 	}
+	
 }
 

+ 7 - 2
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -15,6 +15,7 @@ import com.goafanti.banners.enums.BannersType;
 import com.goafanti.banners.service.BannersService;
 import com.goafanti.common.enums.MarketingPage;
 import com.goafanti.common.model.Banners;
+import com.goafanti.common.model.BusinessProject;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.demand.service.DemandService;
 import com.goafanti.marketing.bo.MarketingManagementBo;
@@ -229,8 +230,11 @@ public class WebpageController extends BaseController {
 		if (!banners.isEmpty()) {
 			modelview.addObject("banner", banners.get(0));
 		}
-		//modelview.addObject("zfwl", newsService.findIndexNewsList(0, NewsType.ZFWL.getCode(), 2));
+		//政策
 		modelview.addObject("jtdt", newsService.findIndexNewsList(0, NewsType.JTDT.getCode(), 4));
+		//服务项目
+		List<BusinessProject> projectList=marketingManagementService.selectHotProject(5);
+		
 		List<MarketingManagementBo> achievementList = marketingManagementService.selectMarketList(request,
 				MarketingPage.mainAchievement.getPageUrl(), MarketingPage.mainAchievement.getBoothType());
 		List<MarketingManagementBo> demandList = marketingManagementService.selectMarketList(request,
@@ -240,7 +244,8 @@ public class WebpageController extends BaseController {
 		modelview.addObject("achievementList", achievementList);
 		modelview.addObject("demandList", demandList);
 		modelview.addObject("speciaList", speciaList);
-		return modelview;
+		modelview.addObject("projectList", projectList);
+		return modelview; 
 	}
 
 	@RequestMapping(value = "/portal/technologyTrading/achievement", method = RequestMethod.GET)

+ 4 - 0
src/main/java/com/goafanti/common/dao/DailySalesReportMapper.java

@@ -28,6 +28,10 @@ public interface DailySalesReportMapper {
 			@Param("countField") String countField, @Param("amountField") String amountField,
 			@Param("depName") String depName, @Param("name") String name, @Param("position") String position);
 
+	List<PersonalSalesReportBO> selectPersonalByPage(@Param("pageNo") Integer pageNo,
+			@Param("pageSize") Integer pageSize, @Param("depName") String depName, @Param("name") String name,
+			@Param("position") String position);
+
 	Long selectSalesPersonalReportsCount(@Param("startTime") Date startTime, @Param("endTime") Date endTime,
 			@Param("depName") String depName, @Param("name") String name, @Param("position") String position);
 

+ 7 - 0
src/main/java/com/goafanti/common/dao/MarketingManagementMapper.java

@@ -1,5 +1,6 @@
 package com.goafanti.common.dao;
 
+import com.goafanti.common.model.BusinessProject;
 import com.goafanti.common.model.MarketingManagement;
 import com.goafanti.common.model.MarketingManagementExample;
 import com.goafanti.marketing.bo.MarketingManagementBo;
@@ -126,4 +127,10 @@ public interface MarketingManagementMapper {
 	 * @return
 	 */
 	List<MarketingManagementBo> selectMarketList(@Param("url")String url,@Param("showPage")String showPage, @Param("category")Integer category);
+	/**
+	 * 查询服务列表
+	 * @param pSize
+	 * @return
+	 */
+	List<BusinessProject> selectHotProject(@Param("pSize")Integer pSize);
 }

+ 1 - 3
src/main/java/com/goafanti/common/mapper/AchievementDemandMapper.xml

@@ -79,8 +79,7 @@
 		where ad.demand_id = #{id,jdbcType=VARCHAR}
 		and a.deleted_sign = 0  
 		and a.audit_status = 3 
-		and a.release_status = 1
-  </select>
+	</select>
   
   <select id="selectAchievementDemandListByAchievementId" parameterType="java.lang.String" resultType="com.goafanti.demand.bo.DemandAchievementListBo">
   	select
@@ -95,6 +94,5 @@
   	where ad.achievement_id = #{id,jdbcType=VARCHAR}
   	and d.deleted_sign = 0
   	and d.audit_status = 3
-  	and d.release_status = 1
   </select>
 </mapper>

+ 12 - 0
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -876,6 +876,9 @@
 		left join marketing_management mm on a.id = mm.product_id 
 	</if>
   	where a.deleted_sign = 0 
+  	<if test="recordPerson != null">
+		and ad.name = #{recordPerson,jdbcType=VARCHAR}
+	</if>
   	<if test="ownerType != null">
 		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
 	</if>
@@ -946,6 +949,9 @@
 		left join marketing_management mm on a.id = mm.product_id 
 	</if>
   	where a.deleted_sign = 0 
+  	<if test="recordPerson != null">
+		and ad.name = #{recordPerson,jdbcType=VARCHAR}
+	</if>
   	<if test="ownerType != null">
 		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
 	</if>
@@ -1996,6 +2002,9 @@
 		left join marketing_management mm on a.id = mm.product_id 
 	</if>
   	where a.deleted_sign = 0 
+  	<if test="recordPerson != null">
+		and ad.name = #{recordPerson,jdbcType=VARCHAR}
+	</if>
   	<if test="ownerType != null">
 		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
 	</if>
@@ -2077,6 +2086,9 @@
 		left join marketing_management mm on a.id = mm.product_id 
 	</if>
   	where a.deleted_sign = 0 
+  	<if test="recordPerson != null">
+		and ad.name = #{recordPerson,jdbcType=VARCHAR}
+	</if>
   	<if test="ownerType != null">
 		and a.owner_type = #{ownerType,jdbcType=VARCHAR}
 	</if>

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

@@ -25,9 +25,29 @@
     left join department_management dm on dm.id = a.department_id 
   </select>
   
+  <select id="selectPersonalByPage" resultType="com.goafanti.report.bo.PersonalSalesReportBO">
+    SELECT a.id, a.name, dm.name as departmentName, a.position, a.create_time as enrollTime
+	FROM admin a
+	left join department_management dm on dm.id = a.department_id 
+	where 1=1
+	<if test="depName != null">
+		and dm.name like concat(#{depName,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="name != null">
+		and a.name like concat(#{name,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="position != null">
+		and a.position like concat(#{position,jdbcType=VARCHAR},'%')
+	</if>
+	order by a.name asc
+	<if test="pageNo != null and pageSize != null">
+		limit #{pageNo,jdbcType=INTEGER}, #{pageSize,jdbcType=INTEGER}
+    </if>
+  </select>
+  
   <select id="selectDailySalesReports" resultMap="BaseResultMap">
     SELECT o.salesman_id as admin_id, a.department_id as dep_id,
-	count(o.order_no) as order_count, sum(o.order_amount) as order_amount
+	count(o.order_no) as order_count, sum(o.sign_total_amount) as order_amount
 	FROM aft.t_order o
 	left join aft.admin a on o.salesman_id=a.id
 	where o.order_status=3 and o.sign_time &gt;= #{startTime,jdbcType=TIMESTAMP} and o.sign_time &lt; #{endTime,jdbcType=TIMESTAMP}
@@ -77,11 +97,16 @@
   <select id="selectSalesPersonalReportsCount" resultType="java.lang.Long">
     SELECT count(distinct(a.id))
 	FROM admin a
+	<if test="startTime != null and endTime != null"> 
 	left join daily_sales_report dsr on dsr.admin_id = a.id
+	</if>
 	<if test="depName != null"> 
 	left join department_management dm on dm.id = a.department_id 
 	</if>
-	where dsr.create_time &gt;= #{startTime,jdbcType=TIMESTAMP} and dsr.create_time &lt; #{endTime,jdbcType=TIMESTAMP}
+	where 1=1
+	<if test="startTime != null and endTime != null"> 
+		and dsr.create_time &gt;= #{startTime,jdbcType=TIMESTAMP} and dsr.create_time &lt; #{endTime,jdbcType=TIMESTAMP}
+	</if>
 	<if test="depName != null">
 		and dm.name like concat(#{depName,jdbcType=VARCHAR},'%')
 	</if>

+ 12 - 0
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -736,6 +736,9 @@
 		left join marketing_management mm on d.id = mm.product_id 
 	</if>
 	where d.deleted_sign = 0 
+	<if test="recordPerson != null">
+		and a.name= #{recordPerson,jdbcType=VARCHAR}
+	</if>
 	<if test="dataCategory != null">
 		and d.data_category = #{dataCategory,jdbcType=VARCHAR}
 	</if>
@@ -813,6 +816,9 @@
 		left join marketing_management mm on d.id = mm.product_id 
 	</if>
 	where d.deleted_sign = 0 
+	<if test="recordPerson != null">
+		and a.name= #{recordPerson,jdbcType=VARCHAR}
+	</if>
 	<if test="dataCategory != null">
 		and d.data_category = #{dataCategory,jdbcType=VARCHAR}
 	</if>
@@ -1931,6 +1937,9 @@
 		left join marketing_management mm on d.id = mm.product_id 
 	</if>
 	where d.deleted_sign = 0 
+	<if test="recordPerson != null">
+		and a.name = #{recordPerson,jdbcType=VARCHAR}
+	</if>
 	<if test="techBrokerId != null">
 		and (d.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR} or a.department_id=(select department_id from admin where id=#{techBrokerId,jdbcType=VARCHAR}))
 	</if>
@@ -2018,6 +2027,9 @@
 		left join marketing_management mm on d.id = mm.product_id 
 	</if>
 	where d.deleted_sign = 0 
+	<if test="recordPerson != null">
+		and a.name = #{recordPerson,jdbcType=VARCHAR}
+	</if>
 	<if test="techBrokerId != null">
 		and (d.tech_broker_id = #{techBrokerId,jdbcType=VARCHAR} or a.department_id=(select department_id from admin where id=#{techBrokerId,jdbcType=VARCHAR}))
 	</if>

+ 40 - 25
src/main/java/com/goafanti/common/mapper/MarketingManagementMapper.xml

@@ -353,25 +353,25 @@
   </select>
   <select id="selectMarketList" resultType="com.goafanti.marketing.bo.MarketingManagementBo">
   	<if test="category == 1"> <!-- 成果 -->
-  		select
-	x.id as productId,
-	x.owner_type as ownerType,
-	x.summary,
-	x.name,
-	x.technical_picture_url  as coverImg,
-	bi.platform_url
+  		    select
+	x.id as productId,x.owner_type as ownerType,x.summary,x.introduction,x.name,x.field_a,fg.name as fieldA,
+	x.field_b,fg1.name as fieldB,x.technical_picture_url  as coverImg,bi.domain_name 
 from
 	 achievement x 
 right join achievement_publish ap on ap.achievement_id=x.id
 left join branch_information bi on bi.id=ap.publish_platform
+left join field_glossory fg on x.field_a=fg.id
+left join field_glossory fg1 on x.field_b=fg1.id
 where x.audit_status = 3
 	and x.deleted_sign = 0
 	and ap.publish_client='0'
 	and ap.publish_page='W01'
-	and bi.platform_url like "%"#{url,jdbcType=VARCHAR}"%"
+	and bi.domain_name like "%"#{url,jdbcType=VARCHAR}"%"
   	</if>
   	<if test="category == 2"> <!-- 需求 -->
-  		select x.id as productId,x.data_category as ownerType,x.name,x.picture_url as coverImg,x.problem_des
+  		select x.id as productId,x.data_category as ownerType,x.name,
+	x.picture_url as coverImg,x.problem_des as problemDes,
+	x.urgent_days as urgentDays,x.urgent_money as urgentMoney,bi.domain_name
 		from    demand x 
 		right join demand_publish dp on dp.demand_id=x.id
 		left join branch_information bi on bi.id=dp.publish_platform
@@ -383,21 +383,36 @@ where x.audit_status = 3
   	</if>
   	<if test="category == 7"> <!-- 智者 -->
   		select
-                u.id,i.username,ua.ability_label as abilityLabel,
-                u.introduction as achievement,u.head_portrait_url as headPortraitUrl,u.type,i.expert
-                from `user` u
-                left join user_ability ua on u.id=ua.uid
-                left join user_career c on u.id=c.uid
-                left join user_identity i on u.id=i.uid
-                right join expert_publish ep on ep.expert_id=u.id
-                left join branch_information bi on bi.id=ep.publish_platform
-                WHERE
-                u.type = 0 and
-                i.expert = 1
-                and ep.publish_client='0'
-                and ep.publish_page='W01'
-		and bi.domain_name like "%"#{url,jdbcType=VARCHAR}"%" 
-		
-  	</if>
+		u.id,i.username,i.work_unit as workUnit,i.professional_title as professionalTitle,u.introduction,
+	    u.head_portrait_url as headPortraitUrl,u.type,i.expert,bi.domain_name,ifnull(o.x,0) as reservationCount
+	    from `user` u
+	    left join user_ability ua on u.id=ua.uid
+	    left join user_career c on u.id=c.uid
+	    left join user_identity i on u.id=i.uid
+	    left join (select count(0) as x,seller_id from t_order
+				where order_status != 4
+				group by  seller_id ) o on u.id=o.seller_id
+	    right join expert_publish ep on ep.expert_id=u.id
+	    left join branch_information bi on bi.id=ep.publish_platform
+	    WHERE
+	    u.type = 0 
+	    and i.expert = 1
+	    and ep.publish_client='0'
+	    and ep.publish_page='W01'
+	    and bi.domain_name like "%"#{url,jdbcType=VARCHAR}"%" 
+	</if>
+  </select>
+  
+    <select id="selectHotProject" resultType="com.goafanti.common.model.BusinessProject">
+  	select 
+  	id, create_id as createId, create_time as createTime, update_time as updateTime, delete_sign as deleteSign, bname, cid, price, offset, 
+    activity_price as activityPrice, activity_flag as activityFlag, member_price as memberPrice, introduce, status, country, province, 
+    city, district, principal_id as principalId, Value_effect as ValueEffect, client_size as clientSize, max_logo as maxLogo, min_logo as minLogo, boutique, 
+    project_url as projectUrl, first_payment as firstPayment
+  	FROM business_project
+    where boutique=1
+    <if test="pSize != null">
+    LIMIT 0, #{pSize,jdbcType=VARCHAR}
+    </if>    
   </select>
 </mapper>

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

@@ -580,12 +580,14 @@
 		c.order_status as orderStatus,
 		c.liquidation_status as liquidationStatus,
 		c.approval,
-		d.name as salesmanName
+		d.name as salesmanName,
+		e.name as departmentName
 	from
 		contract a left join user b on
 		a.uid = b.id left join t_order c on
 		a.order_no = c.order_no left join admin d on
-		c.salesman_id = d.id
+		c.salesman_id = d.id left join department_management e on
+		d.department_id = e.id
 	where 1=1
 	<if test="deleteSign != null">
 		and a.delete_sign = #{deleteSign,jdbcType=INTEGER}

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

@@ -30,7 +30,7 @@
 		left join district_glossory dg3 on b.area = dg3.id
 		left join industry_category c on b.industry = c.id
 		left join admin d on a.aid = d.id 		
-		where a.type = 0  and a.status != 1 and a.audit_status = 1	
+		where a.type = 0  and a.status != 1 	
 		<if test="aid != null and aid !=''">
 			and a.aid = #{aid,jdbcType=VARCHAR}
 		</if>

+ 5 - 6
src/main/java/com/goafanti/demand/controller/AdminDemandApiController.java

@@ -79,8 +79,7 @@ public class AdminDemandApiController extends CertifyApiController {
 			return res;
 		}
 		Demand d = demandService.selectByPrimaryKey(id);
-		if (null == d || !DemandReleaseStatus.RELEASED.getCode().equals(d.getReleaseStatus())
-				|| !DeleteStatus.UNDELETE.getCode().equals(d.getDeletedSign())
+		if (null == d|| !DeleteStatus.UNDELETE.getCode().equals(d.getDeletedSign())
 				|| !DemandAuditStatus.AUDITED.getCode().equals(d.getAuditStatus())) {
 			res.getError().add(buildError("", "当前状态无法匹配!"));
 			return res;
@@ -224,7 +223,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	public Result orgList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			String unitName, Integer status, Integer releaseStatus, String releaseDateStartDate,
-			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot,String recordPerson) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -237,7 +236,7 @@ public class AdminDemandApiController extends CertifyApiController {
 		}
 		res.setData(demandService.selectOrgDemandManageList(dataCategory,employerName, auditStatus, province, serialNumber, name, keyword,
 				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, unitName, status,
-				releaseStatus, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, pNo, pSize,boutique,hot,TokenManager.getAdminId()));
+				releaseStatus, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, pNo, pSize,boutique,hot,TokenManager.getAdminId(),recordPerson));
 		return res;
 	}
 
@@ -696,7 +695,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	public Result manageList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			String unitName, Integer status, Integer releaseStatus, String releaseDateStartDate,
-			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
+			String releaseDateEndDate,String createDateStartDate, String createDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot,String recordPerson) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -709,7 +708,7 @@ public class AdminDemandApiController extends CertifyApiController {
 		}
 		res.setData(demandService.selectManageDemandManageList(dataCategory,employerName, auditStatus, province, serialNumber, name, keyword,
 				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, unitName, status,
-				releaseStatus, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, pNo, pSize,boutique,hot,TokenManager.getAdminId()));
+				releaseStatus, releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, pNo, pSize,boutique,hot,TokenManager.getAdminId(),recordPerson));
 		return res;
 	}
 	/**

+ 2 - 2
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -29,7 +29,7 @@ public interface DemandService {
 	Pagination<DemandManageListBo> selectOrgDemandManageList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber,
 			String name, String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
-			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId);
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId,String recordPerson);
 
 	void saveUserDemand(Demand d, String validityPeriodFormattedDate, String[] keywords);
 
@@ -106,5 +106,5 @@ public interface DemandService {
 	Pagination<DemandManageListBo> selectManageDemandManageList(Integer dataCategory,String employerName, Integer auditStatus, Integer province, Integer serialNumber,
 			String name, String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
-			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId);
+			String releaseDateStartDate, String releaseDateEndDate,String createDateStartDate, String createDateEndDate, Integer pNo, Integer pSize,Integer boutique,Integer hot,String techBrokerId,String recordPerson);
 }

+ 60 - 11
src/main/java/com/goafanti/marketing/bo/MarketingManagementBo.java

@@ -6,18 +6,48 @@ public class MarketingManagementBo extends MarketingManagement{
 	private String name; /** 名字 **/
 	private String summary; /** 简介 **/
 	private String ownerType; /** 用户类型 **/
-	private String problem_des;/** 问题说明 **/
-	
+	private String problemDes;/** 问题说明 **/
+	private String fieldA;
+	private String fieldB;
+	private String urgentDays;
+	private String urgentMoney;
+	private String workUnit;
+	private String professionalTitle;
 	private String abilityLabel;/** 领域 **/
 	private String username;/** 智者名字 **/
-	private String achievement;/** 主要成就 **/
+	private String introduction;/** 简介 **/
 	private String headPortraitUrl;/** 头像地址 **/
 	private String id;/** 智者ID **/
 	private String type;/** 个人,单位 **/
+	private Integer reservationCount;/**预约次数**/
 	
 	public String getName() {
 		return name;
 	}
+	public String getFieldA() {
+		return fieldA;
+	}
+	public void setFieldA(String fieldA) {
+		this.fieldA = fieldA;
+	}
+	public String getFieldB() {
+		return fieldB;
+	}
+	public void setFieldB(String fieldB) {
+		this.fieldB = fieldB;
+	}
+	public String getUrgentDays() {
+		return urgentDays;
+	}
+	public void setUrgentDays(String urgentDays) {
+		this.urgentDays = urgentDays;
+	}
+	public String getUrgentMoney() {
+		return urgentMoney;
+	}
+	public void setUrgentMoney(String urgentMoney) {
+		this.urgentMoney = urgentMoney;
+	}
 	public String getType() {
 		return type;
 	}
@@ -42,11 +72,11 @@ public class MarketingManagementBo extends MarketingManagement{
 	public void setUsername(String username) {
 		this.username = username;
 	}
-	public String getAchievement() {
-		return achievement;
+	public String getIntroduction() {
+		return introduction;
 	}
-	public void setAchievement(String achievement) {
-		this.achievement = achievement;
+	public void setIntroduction(String introduction) {
+		this.introduction = introduction;
 	}
 	public String getHeadPortraitUrl() {
 		return headPortraitUrl;
@@ -54,11 +84,11 @@ public class MarketingManagementBo extends MarketingManagement{
 	public void setHeadPortraitUrl(String headPortraitUrl) {
 		this.headPortraitUrl = headPortraitUrl;
 	}
-	public String getProblem_des() {
-		return problem_des;
+	public String getProblemDes() {
+		return problemDes;
 	}
-	public void setProblem_des(String problem_des) {
-		this.problem_des = problem_des;
+	public void setProblemDes(String problemDes) {
+		this.problemDes = problemDes;
 	}
 	public void setName(String name) {
 		this.name = name;
@@ -75,4 +105,23 @@ public class MarketingManagementBo extends MarketingManagement{
 	public void setOwnerType(String ownerType) {
 		this.ownerType = ownerType;
 	}
+	public Integer getReservationCount() {
+		if(reservationCount!=null)return 20;
+		return reservationCount+20;
+	}
+	public void setReservationCount(Integer reservationCount) {
+		this.reservationCount = reservationCount;
+	}
+	public String getWorkUnit() {
+		return workUnit;
+	}
+	public void setWorkUnit(String workUnit) {
+		this.workUnit = workUnit;
+	}
+	public String getProfessionalTitle() {
+		return professionalTitle;
+	}
+	public void setProfessionalTitle(String professionalTitle) {
+		this.professionalTitle = professionalTitle;
+	}
 }

+ 8 - 0
src/main/java/com/goafanti/marketing/service/MarketingManagementService.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.http.HttpRequest;
 
+import com.goafanti.common.model.BusinessProject;
 import com.goafanti.common.model.MarketingManagement;
 import com.goafanti.marketing.bo.MarketingManagementBo;
 
@@ -52,4 +53,11 @@ public interface MarketingManagementService {
 	 * @return
 	 */
 	public List<MarketingManagementBo> selectMarketList(HttpServletRequest res,String showPage,Integer category);
+	
+	/**
+	 * 查询营销活动
+	 * @param pSize 页面显示数
+	 * @return
+	 */
+	List<BusinessProject> selectHotProject(Integer pSize);
 }

+ 10 - 0
src/main/java/com/goafanti/marketing/service/impl/MarketingManagementServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.MarketingManagementMapper;
+import com.goafanti.common.model.BusinessProject;
 import com.goafanti.common.model.MarketingManagement;
 import com.goafanti.marketing.bo.MarketingManagementBo;
 import com.goafanti.marketing.service.MarketingManagementService;
@@ -48,7 +49,16 @@ public class MarketingManagementServiceImpl implements MarketingManagementServic
 	public List<MarketingManagementBo> selectMarketList(HttpServletRequest res,String showPage, Integer category) {
 		String url=res.getServerName();
 		url=url.substring(url.indexOf(".")+1, url.length());
+		if (url.equals("localhost")) {
+			url="jishutao.com";
+		}
 		return marketingManagementMapper.selectMarketList(url,showPage, category);
 	}
 	
+	@Override
+	public List<BusinessProject> selectHotProject(Integer pSize) {
+		
+		return marketingManagementMapper.selectHotProject(pSize);
+	}
+	
 }

+ 18 - 0
src/main/java/com/goafanti/report/controller/ReportApiController.java

@@ -37,6 +37,15 @@ public class ReportApiController extends BaseApiController {
 		} catch (Exception e) {
 			startTime = new Date();
 		}
+		if (StringUtils.isBlank(depName)) {
+			depName = null;
+		}
+		if (StringUtils.isBlank(name)) {
+			name = null;
+		}
+		if (StringUtils.isBlank(position)) {
+			position = null;
+		}
 		Integer pageSize = StringUtils.isBlank(pSize) ? null : handlePageSize(pSize);
 		Integer pageNo = StringUtils.isBlank(pNo) ? null : handlePageNo(pNo);
 		if (pageSize != null && pageNo != null) {
@@ -55,6 +64,15 @@ public class ReportApiController extends BaseApiController {
 		} catch (Exception e) {
 			startTime = new Date();
 		}
+		if (StringUtils.isBlank(depName)) {
+			depName = null;
+		}
+		if (StringUtils.isBlank(name)) {
+			name = null;
+		}
+		if (StringUtils.isBlank(position)) {
+			position = null;
+		}
 		return res().data(reportService.getReportTotal(startTime, depName, name, position));
 	}
 

+ 7 - 3
src/main/java/com/goafanti/report/service/SalesReportServiceImpl.java

@@ -64,8 +64,12 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 				name, position);
 		putField(mm, "annuallyTotalCount", "annuallyTotalAmount", rd.getYearStart(), rd.getYearEnd(), depName, name,
 				position);
-		mm.put("totalRecordCount", salesReportMapper.selectSalesPersonalReportsCount(rd.getDailyStart(),
-				rd.getDailyEnd(), depName, name, position));
+		long totalCount = salesReportMapper.selectSalesPersonalReportsCount(rd.getDailyStart(), rd.getDailyEnd(),
+				depName, name, position);
+		if (totalCount == 0) {
+			totalCount = salesReportMapper.selectSalesPersonalReportsCount(null, null, depName, name, position);
+		}
+		mm.put("totalRecordCount", totalCount);
 		return mm;
 	}
 
@@ -115,7 +119,7 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 		}
 
 		if (list.isEmpty()) {
-			return list;
+			list = salesReportMapper.selectPersonalByPage(pageNo, pageSize, depName, name, position);
 		}
 
 		Map<String, PersonalSalesReportBO> map = new HashMap<>();

+ 8 - 0
src/main/java/com/goafanti/techproject/bo/ProjectListBo.java

@@ -32,6 +32,8 @@ public class ProjectListBo {
 	private String technicianName;
 	/** 项目负责人 **/
 	private String principalName;
+	/** 订单部门 **/
+	private String departmentName;
 	/** 立项时间 **/
 	private String signDate;
 	/** 结项时间 **/
@@ -132,6 +134,12 @@ public class ProjectListBo {
 	public void setPrincipalName(String principalName) {
 		this.principalName = principalName;
 	}
+	public String getDepartmentName() {
+		return departmentName;
+	}
+	public void setDepartmentName(String departmentName) {
+		this.departmentName = departmentName;
+	}
 	public String getSignDate() {
 		return signDate;
 	}

+ 10 - 8
src/main/webapp/WEB-INF/views/portal/index.html

@@ -58,8 +58,7 @@
 					<div class="fruit_content" th:if="${#lists.size(achievementList) ge 1}">
 						<img th:src="${avatarUploadHost+achievementList[0].coverImg}" alt="" />
 						<div class="cont_p">
-							<h5 th:text="${achievementList[0].name}"></h5>
-							<p th:text="${achievementList[0].summary}"></p>
+							
 						</div>
 						<div class="cont_img">
 							<a th:href="@{/portal/technologyTrading/achievementDetail(id=${achievementList[0].productId},type=${achievementList[0].ownerType})}">
@@ -119,7 +118,8 @@
 				<h3>精品需求</h3>
 				<a th:href="${basePath + '/portal/technologyTrading/demand.html'}">MORE+</a>
 			</div>
-			<div class="demand_cont">				
+			<div class="demand_cont">
+										
 				<div >
 					<a th:each="item:${demandList}"
 					th:href="@{/portal/technologyTrading/demandDetail(id=${item.productId},type=${item.ownerType})}">
@@ -131,7 +131,7 @@
 								<p><span><img th:src="${portalHost + '/img/index_er4.png'}"/></span>长沙</p>
 							</div>
 						</div>
-						<p class="demand_p" th:text="${item.problem_des}"></p>
+						<p class="demand_p" th:text="${item.problemDes}"></p>
 					</div>	
 					</a>
 				</div>										
@@ -209,14 +209,16 @@
 					<span class="man_left">
 						<img th:src="${portalHost+'/img/index_er7.png'}" alt=""/>
 					</span>
+					
 					<div class="index_cont">
 						<div th:if="${#lists.size(speciaList) ge 1}">
 							<a th:href="@{/portal/subscriberDetail.html(uid=${speciaList[0].id},type=${speciaList[0].type})}">
+							
 								<div class="index_oneman">
 									<img th:src="${speciaList[0].headPortraitUrl}?${avatarUploadHost+speciaList[0].headPortraitUrl}:${avatarUploadHost + '/default/person.jpg'}" alt=""  />
 									<h4 class="appellation" th:text="${speciaList[0].abilityLabel}">湖南大学生物科学教授</h4>
 									<h3 class="definition" th:text="${speciaList[0].username}">梁晓欣</h3>
-									<p th:text="${speciaList[0].achievement}">食子酸在高温和中压条件下可以脱去羧基,从而获得焦性没食子酸,再通过升华的方式获得较纯的焦性没食子产品,
+									<p th:text="${speciaList[0].introduction}">食子酸在高温和中压条件下可以脱去羧基,从而获得焦性没食子酸,再通过升华的方式获得较纯的焦性没食子产品,
 								单升华方式产能较低且能耗高,希望通过其他方式(重结晶)等获得此产品,提高产品的产能降低能耗。</p>
 								</div>
 							</a>	
@@ -227,7 +229,7 @@
 									<img th:src="${speciaList[1].headPortraitUrl}?${avatarUploadHost+speciaList[1].headPortraitUrl}:${avatarUploadHost + '/default/person.jpg'}" alt=""  />
 									<h4 class="appellation" th:text="${speciaList[1].abilityLabel}">中医皮肤病医院专家</h4>
 									<h3 class="definition" th:text="${speciaList[1].username}">钱艳雯</h3>
-									<p th:text="${speciaList[1].achievement}">师从中医医院皮肤科师承中医泰斗、全国著名皮外科专家赵炳南先生20余年,深受其真传。
+									<p th:text="${speciaList[1].introduction}">师从中医医院皮肤科师承中医泰斗、全国著名皮外科专家赵炳南先生20余年,深受其真传。
 									尤其擅长治各种急性热性红斑性皮肤病,是著名的中西医结合皮肤病专家。</p>
 								</div>
 							</a>	
@@ -238,7 +240,7 @@
 									<img th:src="${speciaList[2].headPortraitUrl}?${avatarUploadHost+speciaList[2].headPortraitUrl}:${avatarUploadHost + '/default/person.jpg'}" alt=""  />
 									<h4 class="appellation" th:text="${speciaList[2].abilityLabel}">电子薄膜材料专家</h4>
 									<h3 class="definition" th:text="${speciaList[2].username}">刘钊鑫</h3>
-									<p th:text="${speciaList[2].achievement}">主要研究方向包括:BST铁电薄膜、半导体SiC 外延薄膜、半导体低维结构等</p>
+									<p th:text="${speciaList[2].introduction}">主要研究方向包括:BST铁电薄膜、半导体SiC 外延薄膜、半导体低维结构等</p>
 								</div>
 							</a>	
 						</div>
@@ -248,7 +250,7 @@
 									<img th:src="${speciaList[3].headPortraitUrl}?${avatarUploadHost+speciaList[3].headPortraitUrl}:${avatarUploadHost + '/default/person.jpg'}" alt=""  />
 									<h4 class="appellation" th:text="${speciaList[3].abilityLabel}">热轧平整工艺专家</h4>
 									<h3 class="definition" th:text="${speciaList[3].username}">郑纹光</h3>
-									<p th:text="${speciaList[3].achievement}">主要研究内容有热轧平整工艺的专家指导系统开发,板料冲压成型CAE和模具CAD设计。
+									<p th:text="${speciaList[3].introduction}">主要研究内容有热轧平整工艺的专家指导系统开发,板料冲压成型CAE和模具CAD设计。
 									在各类核心期刊发表研究论文18篇。研究方向:1、 模具优化设计理论及应用2、
 									人工智能技术在材料成型中的应用</p>
 								</div>