Antiloveg 8 years ago
parent
commit
d5a9ca122e

+ 16 - 3
src/main/java/com/goafanti/admin/controller/AdminTechProjectController.java

@@ -29,6 +29,8 @@ import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.techproject.bo.InputTechProject;
+import com.goafanti.techproject.bo.TechProjectManageListBo;
+import com.goafanti.techproject.bo.TechWebsiteDetailBo;
 import com.goafanti.techproject.bo.TechWebsiteListBo;
 import com.goafanti.techproject.service.TechProjectLogService;
 import com.goafanti.techproject.service.TechProjectService;
@@ -56,6 +58,7 @@ public class AdminTechProjectController extends CertifyApiController {
 	 * @param pageSize
 	 * @return
 	 */
+	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/listTechProject", method = RequestMethod.POST)
 	public Result listClientTechProject(String province, String unitName, String pageNo, String pageSize) {
 		Result res = new Result();
@@ -67,7 +70,17 @@ public class AdminTechProjectController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(techProjectService.listManageTechProject(province, unitName, pNo, pSize));
+		Pagination<TechProjectManageListBo> t = techProjectService.listManageTechProject(province, unitName, pNo, pSize);
+		if (null != t) {
+			List<TechProjectManageListBo> l = (List<TechProjectManageListBo>) t.getList();
+			for (TechProjectManageListBo w : l) {
+				if (!StringUtils.isBlank(w.getPassword())) {
+					w.setPassword(Base64Utils.decodeData(w.getPassword()));
+				}
+			}
+			t.setList(l);
+			res.setData(t);
+		}
 		return res;
 	}
 
@@ -93,7 +106,7 @@ public class AdminTechProjectController extends CertifyApiController {
 			return res;
 		}
 		User curUser = userService.selectByPrimaryKey(techProject.getUid());
-		if (checkCertify(res, curUser)) {
+		if (!checkCertify(res, curUser)) {
 			return res;
 		}
 		TechProject tp = new TechProject();
@@ -222,7 +235,7 @@ public class AdminTechProjectController extends CertifyApiController {
 	@RequestMapping(value = "/techWebsiteDetail", method = RequestMethod.POST)
 	public Result techWebsiteDetail(String id) {
 		Result res = new Result();
-		TechWebsite w = techWebsiteService.selectByPrimaryKey(id);
+		TechWebsiteDetailBo w = techWebsiteService.selectTechWebsiteDetail(id);
 		if (null != w && !StringUtils.isBlank(w.getPassword())) {
 			w.setPassword(Base64Utils.decodeData(w.getPassword()));
 		}

+ 3 - 0
src/main/java/com/goafanti/common/dao/TechWebsiteMapper.java

@@ -3,6 +3,7 @@ package com.goafanti.common.dao;
 import java.util.List;
 
 import com.goafanti.common.model.TechWebsite;
+import com.goafanti.techproject.bo.TechWebsiteDetailBo;
 
 public interface TechWebsiteMapper {
     int deleteByPrimaryKey(String id);
@@ -20,4 +21,6 @@ public interface TechWebsiteMapper {
 	List<TechWebsite> selectTechWebsiteByUid(String uid);
 
 	int batchDeleteByPrimaryKey(List<String> id);
+
+	TechWebsiteDetailBo selectTechWebsiteDetail(String id);
 }

+ 7 - 5
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -342,12 +342,13 @@
 		LEFT JOIN organization_identity i on i.uid = p.uid
 		LEFT JOIN admin a on p.consultant = a.id 
     LEFT JOIN tech_website w on p.department = w.id 
-		where p.deleted_sign = 0 and w.deleted_sign = 0
+		and p.deleted_sign = 0 and w.deleted_sign = 0
+		where 1 = 1
 		 <if test="province != null">
     	and i.location_province = #{province,jdbcType=VARCHAR}
     </if>
     <if test="unitName != null" >
-    	and p.unit_name like CONCAT('%', #{unitName,jdbcType=VARCHAR}, '%')  
+    	and i.unit_name like CONCAT('%', #{unitName,jdbcType=VARCHAR}, '%')  
     </if>
     order by p.serial_number desc
    <if test="page_sql!=null">
@@ -361,12 +362,13 @@
 		LEFT JOIN organization_identity i on i.uid = p.uid
 		LEFT JOIN admin a on p.consultant = a.id 
    		 LEFT JOIN tech_website w on p.department = w.id 
-		where p.deleted_sign = 0 and w.deleted_sign = 0
+		and p.deleted_sign = 0 and w.deleted_sign = 0
+		where 1 = 1
 	 <if test="province != null">
     	and i.location_province = #{province,jdbcType=VARCHAR}
     </if>
-    <if test="uid != null" >
-    	and p.uid = #{uid,jdbcType=VARCHAR}
+    <if test="unitName != null" >
+    	and i.unitName like CONCAT('%', #{unitName,jdbcType=VARCHAR}, '%') 
     </if>
   </select>
   

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TechWebsiteMapper.xml

@@ -171,4 +171,10 @@
 		#{item}
 	</foreach>
   </update>
+  
+  <select id="selectTechWebsiteDetail" resultType="com.goafanti.techproject.bo.TechWebsiteDetailBo" parameterType="java.lang.String" >
+   SELECT t.id, t.account_number, t.department,t.password, t.uid, t.website, i.unit_name as unitName
+		from tech_website t LEFT JOIN organization_identity i on t.uid = i.uid 
+    where t.id = #{id,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 17 - 0
src/main/java/com/goafanti/techproject/bo/TechWebsiteDetailBo.java

@@ -0,0 +1,17 @@
+package com.goafanti.techproject.bo;
+
+import com.goafanti.common.model.TechWebsite;
+
+public class TechWebsiteDetailBo extends TechWebsite{
+	private String unitName;
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
+	
+	
+}

+ 3 - 0
src/main/java/com/goafanti/techproject/service/TechWebsiteService.java

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import com.goafanti.common.model.TechWebsite;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techproject.bo.TechWebsiteDetailBo;
 import com.goafanti.techproject.bo.TechWebsiteListBo;
 
 public interface TechWebsiteService {
@@ -19,4 +20,6 @@ public interface TechWebsiteService {
 
 	int deleteByPrimaryKey(List<String> id);
 
+	TechWebsiteDetailBo selectTechWebsiteDetail(String id);
+
 }

+ 0 - 2
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -92,8 +92,6 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			log.setOperator(TokenManager.getAdminId());
 		}
 		techProjectLogMapper.insert(log);
-		
-		
 	}
 
 	@SuppressWarnings("unchecked")

+ 6 - 0
src/main/java/com/goafanti/techproject/service/impl/TechWebsiteServiceImpl.java

@@ -15,6 +15,7 @@ import com.goafanti.common.dao.TechWebsiteMapper;
 import com.goafanti.common.model.TechWebsite;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.techproject.bo.TechWebsiteDetailBo;
 import com.goafanti.techproject.bo.TechWebsiteListBo;
 import com.goafanti.techproject.service.TechWebsiteService;
 
@@ -81,4 +82,9 @@ public class TechWebsiteServiceImpl extends BaseMybatisDao<TechWebsiteMapper> im
 	public int deleteByPrimaryKey(List<String> id) {
 		return techWebsiteMapper.batchDeleteByPrimaryKey(id);
 	}
+
+	@Override
+	public TechWebsiteDetailBo selectTechWebsiteDetail(String id) {
+		return techWebsiteMapper.selectTechWebsiteDetail(id);
+	}
 }