albertshaw il y a 8 ans
Parent
commit
e2ae018746

+ 2 - 2
src/main/java/com/goafanti/cognizance/service/impl/OrgAnnualReportServiceImpl.java

@@ -109,8 +109,8 @@ public class OrgAnnualReportServiceImpl extends BaseMybatisDao<OrgAnnualReportMa
 			report.setSoftwareWorks(null == p.getSoftwareWorks() ? 0 : p.getSoftwareWorks());
 		}
 
-		BigDecimal t = orgAnnualReportMapper.selectAnnualReportTerritoryByYearAndUid(year, uid);
-		report.setTerritory(null == t ? new BigDecimal(0) : t);
+//		BigDecimal t = orgAnnualReportMapper.selectAnnualReportTerritoryByYearAndUid(year, uid);
+//		report.setTerritory(null == t ? new BigDecimal(0) : t);
 
 		AnnualReportMainBo m = orgAnnualReportMapper.selectAnnualReportMainBoByYearAndUid(year, uid);
 		if (null != m) {

+ 14 - 32
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -86,54 +86,36 @@ public class PortalController extends BaseController {
 				}
 			}
 			Integer industryCategoryA = demand.getIndustryCategoryA();
-			String industryCategory = "";
-			boolean a = Boolean.FALSE;
-			boolean b = Boolean.FALSE;
+			boolean hasCategoryA = false;
+			boolean hasCategoryB = false;
 			if (null != industryCategoryA) {
 				List<DemandPortalSimilarListBo> similarList = demandService.findByIndustryCategoryA(industryCategoryA,
 						demand.getId());
 				if (!similarList.isEmpty()) {
 					for (DemandPortalSimilarListBo s : similarList) {
-						a = Boolean.FALSE;
-						b = Boolean.FALSE;
-						industryCategory = "";
-						if (StringUtils.isNotBlank(s.getIndustryCategoryAS())) {
-							a = Boolean.TRUE;
-						}
-						if (StringUtils.isNotBlank(s.getIndustryCategoryBS())) {
-							b = Boolean.TRUE;
-						}
-						industryCategory += (a ? s.getIndustryCategoryAS() : "") + (a && b ? DELIMITER : "")
-								+ (b ? s.getIndustryCategoryBS() : "");
-						s.setIndustryCategory(industryCategory);
+						hasCategoryA = StringUtils.isNotBlank(s.getIndustryCategoryAS());
+						hasCategoryB = StringUtils.isNotBlank(s.getIndustryCategoryBS());
+						s.setIndustryCategory((hasCategoryA ? s.getIndustryCategoryAS() : "")
+								+ (hasCategoryA && hasCategoryB ? DELIMITER : "")
+								+ (hasCategoryB ? s.getIndustryCategoryBS() : ""));
 						if (null != s.getBudgetCost() || s.getBudgetCost().compareTo(BigDecimal.ZERO) > 0) {
 							s.setBudgetCostS(s.getBudgetCost() + UNIT);
 						} else {
 							s.setBudgetCostS(PRICE_NEGOTIABLE);
 						}
 					}
-
 				}
 				mv.addObject("similarList", similarList);
-				a = Boolean.FALSE;
-				if (StringUtils.isNotBlank(demand.getIndustryCategoryAS())) {
-					a = Boolean.TRUE;
-				}
-			}
-			b = Boolean.FALSE;
-			if (StringUtils.isNotBlank(demand.getIndustryCategoryBS())) {
-				b = Boolean.TRUE;
+				hasCategoryA = StringUtils.isNotBlank(demand.getIndustryCategoryAS());
 			}
+			hasCategoryB = StringUtils.isNotBlank(demand.getIndustryCategoryBS());
 
-			industryCategory += (a ? demand.getIndustryCategoryAS() : "") + (a && b ? DELIMITER : "")
-					+ (b ? demand.getIndustryCategoryBS() : "");
-			demand.setIndustryCategory(industryCategory);
+			demand.setIndustryCategory((hasCategoryA ? demand.getIndustryCategoryAS() : "")
+					+ (hasCategoryA && hasCategoryB ? DELIMITER : "")
+					+ (hasCategoryB ? demand.getIndustryCategoryBS() : ""));
 
-			String location = "";
-			String province = demand.getProvince();
-			String city = demand.getCity();
-			location += (StringUtils.isBlank(province) ? "" : province) + (StringUtils.isBlank(city) ? "" : city);
-			demand.setLocation(location);
+			demand.setLocation((StringUtils.isBlank(demand.getProvince()) ? "" : demand.getProvince())
+					+ (StringUtils.isBlank(demand.getCity()) ? "" : demand.getCity()));
 		}
 		mv.setViewName("/portal/detail/demandDetail");
 		mv.addObject("demand", demand);

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

@@ -1017,7 +1017,7 @@
 		    a.create_time as createTime, a.release_status as releaseStatus, 
 		    a.release_date as releaseDate, a.audit_status as auditStatus, a.tech_broker_id as techBrokerId,
 		    oi.unit_name as iOwnerName, oi.postal_address as iOwnerPostalAddress, u.email as iOwnerEmail,
-		    oi.org_code as iOwnerIdNumber
+		    oi.org_code as iOwnerIdNumber, u.mobile as iOwnerMobile
     from achievement a
     left join organization_identity oi on a.owner_id = oi.uid
     left join user u on u.id = a.owner_id

+ 6 - 4
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -659,6 +659,7 @@
 	</if>
 	<if test="employerName != null">
 		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
+		and  d.employer_id is null
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}
@@ -730,6 +731,7 @@
 	</if>
 	<if test="employerName != null">
 		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
+		and  d.employer_id is null
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}
@@ -1092,7 +1094,7 @@
 		u.lvl as level
 	FROM
 		demand d
-	LEFT JOIN <![CDATA[ user ]]> u on u.id = d.employer_id
+	LEFT JOIN `user` u on u.id = d.employer_id
 	LEFT JOIN user_identity ui on ui.uid = d.employer_id
 	LEFT JOIN district_glossory dg ON dg.id = ui.province
 	LEFT JOIN district_glossory dgg ON dgg.id = ui.city
@@ -1109,8 +1111,8 @@
 		d.name,
 		d.keyword,
 		d.industry_category_a AS industryCategoryA,
-		fg.name AS industryCategoryB,
-		fgg.name AS industryCategoryC,
+		fg.name AS industryCategoryAS,
+		fgg.name AS industryCategoryBS,
 		d.budget_cost AS budgetCost,
 		d.problem_des AS problemDes,
 		dg.name AS province,
@@ -1120,7 +1122,7 @@
 		u.lvl as level
 	FROM
 		demand d
-	LEFT JOIN <![CDATA[ user ]]> u on u.id = d.employer_id
+	LEFT JOIN `user` u on u.id = d.employer_id
 	LEFT JOIN organization_identity oi on oi.uid = d.employer_id
 	LEFT JOIN district_glossory dg ON dg.id = oi.licence_province
 	LEFT JOIN district_glossory dgg ON dgg.id = oi.licence_city

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

@@ -332,7 +332,7 @@
 			on u.id = o.uid  AND o.audit_status = 5  
 			LEFT JOIN org_human_resource h on h.uid = u.id  AND h.year = #{0} AND h.deleted_sign = 0
 			LEFT JOIN org_finance f on f.uid = u.id  AND f.year = #{0}  AND f.deleted_sign = 0
-			LEFT JOIN org_cognizance c on c.uid = u.id  AND c.year = #{0} AND c.deleted_sign = 0
+			LEFT JOIN org_cognizance c on c.uid = u.id  AND c.year <![CDATA[ <= ]]> #{0} AND c.year <![CDATA[ > ]]> (#{0} - 3) AND c.deleted_sign = 0
 			LEFT JOIN org_ratepay r on r.uid = u.id  AND r.year = #{0} AND r.deleted_sign = 0
 			LEFT JOIN
 			     (SELECT uid,(operating_income + non_operating_income - non_taxable_income) as totalRevenue

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/scienceTechnology/bigShot.html

@@ -113,7 +113,7 @@
 					<div class="lecture_content_info">
 						<h5 th:text="${lecture.name}" th:title="${lecture.name}"></h5>
 						<p class="mt20" th:text="${lecture.lectureTimeFormattedDate}" th:title="${lecture.lectureTimeFormattedDate}"></p>
-						<a href="#" class="customer-service" th:text="${lecture.lectureStatus} == 0 ? '报名中' : '已结束'">报名中</a>
+						<a href="javascript:;" th:class="${lecture.lectureStatus} == 0 ?'customer-service':'disable'" th:text="${lecture.lectureStatus} == 0 ? '报名中' : '已结束'">报名中</a>
 					</div>
 				</li>
 			</ul>