Antiloveg лет назад: 8
Родитель
Сommit
197bfb9000

+ 9 - 12
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -206,9 +206,8 @@ public class AdminApiController extends BaseApiController {
 		}
 		if (StringUtils.isBlank(userIdentity.getId())){
 			userIdentity.setId(UUID.randomUUID().toString());
-			userIdentity.setAuditStatus(0);
-			userIdentity.setProcess(0);
-			userIdentity.setWrongCount(0);
+			userIdentity.setAuditStatus(null == userIdentity.getAuditStatus() ? 0 : userIdentity.getAuditStatus());
+			userIdentity.setProcess(null == userIdentity.getProcess() ? 0 : userIdentity.getProcess());
 			res.setData(userIdentityService.insert(userIdentity));
 		} else {
 			res.setData(userIdentityService.updateUserDetail(userIdentity));
@@ -275,12 +274,11 @@ public class AdminApiController extends BaseApiController {
 		}
 		if (StringUtils.isBlank(orgIdentity.getId())){
 			orgIdentity.setId(UUID.randomUUID().toString());
-			orgIdentity.setIdentityType(0);
-			orgIdentity.setAuditStatus(0);
-			orgIdentity.setProcess(0);
-			orgIdentity.setWrongCount(0);
-			orgIdentity.setListed(0);
-			orgIdentity.setListedType(0);
+			orgIdentity.setIdentityType(null == orgIdentity.getIdentityType() ? 0 : orgIdentity.getIdentityType());
+			orgIdentity.setAuditStatus(null == orgIdentity.getAuditStatus() ? 0 : orgIdentity.getAuditStatus());
+			orgIdentity.setProcess(null == orgIdentity.getProcess() ? 0 : orgIdentity.getProcess());
+			orgIdentity.setListed(null == orgIdentity.getListed() ? 0 : orgIdentity.getListed());
+			orgIdentity.setListedType(null == orgIdentity.getListedType() ? 0 : orgIdentity.getListedType());
 			res.setData(organizationIdentityService.insert(orgIdentity));
 		} else {
 			res.setData(organizationIdentityService.updateOrgDetail(orgIdentity));
@@ -601,7 +599,6 @@ public class AdminApiController extends BaseApiController {
 			orgActivityCost.setStartDate(ac.getStartDate());
 			orgActivityCost.setEndDate(ac.getEndDate());
 			orgActivityCost.setId(UUID.randomUUID().toString());
-			orgActivityCost.setUid(TokenManager.getUserId());
 			orgActivityCost.setDeletedSign(0);
 			orgActivityCostService.insert(orgActivityCost);
 		} else {
@@ -1144,7 +1141,7 @@ public class AdminApiController extends BaseApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/cultivate", method = RequestMethod.POST)
-	public Result cultivationList(String province, String uid, String pageNo, String pageSize){
+	public Result cultivationList(String province, String unitName, String pageNo, String pageSize){
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -1154,7 +1151,7 @@ public class AdminApiController extends BaseApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(orgCognizanceService.listCultivation(province, uid, pNo, pSize));
+		res.setData(orgCognizanceService.listCultivation(province, unitName, pNo, pSize));
 		return res;
 	}
 

+ 1 - 1
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -847,7 +847,7 @@ public class CognizanceApiController extends BaseApiController {
 			if (StringUtils.isBlank(orgTechCenterDetail.getId())) {
 				orgTechCenterDetail.setId(UUID.randomUUID().toString());
 				orgTechCenterDetail.setDeletedSign(0);
-				orgTechCenterDetailService.inset(orgTechCenterDetail);
+				orgTechCenterDetailService.insert(orgTechCenterDetail);
 			} else {
 				orgTechCenterDetailService.updateByPrimaryKeySelective(orgTechCenterDetail);
 			}

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/OrgCognizanceService.java

@@ -43,7 +43,7 @@ public interface OrgCognizanceService {
 
 	void insertCognizance(Integer contacts, String comment, Integer year, Integer state, String aid, String uid);
 
-	Pagination<CultivationListBo> listCultivation(String province, String uid, Integer pNo, Integer pSize);
+	Pagination<CultivationListBo> listCultivation(String province, String unitName, Integer pNo, Integer pSize);
 
 
 }

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/OrgTechCenterDetailService.java

@@ -9,7 +9,7 @@ public interface OrgTechCenterDetailService {
 
 	Pagination<OrgTechCenterDetail> listOrgTechCenterDetail(Integer pNo, Integer pSize, String cid);
 
-	OrgTechCenterDetail inset(OrgTechCenterDetail orgTechCenterDetail);
+	OrgTechCenterDetail insert(OrgTechCenterDetail orgTechCenterDetail);
 
 	int updateByPrimaryKeySelective(OrgTechCenterDetail orgTechCenterDetail);
 

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

@@ -34,7 +34,6 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 			params.put("activityNumber", activityNumber);
 		}
 		
-		
 		if (!StringUtils.isBlank(sDate)){
 			startDate = DateUtils.parseDate(sDate, "yyyy-MM-dd");
 			params.put("startDate", startDate);
@@ -49,7 +48,6 @@ public class OrgActivityCostServiceImpl extends BaseMybatisDao<OrgActivityCostMa
 			params.put("uid", uid);
 		}
 		
-		
 		if (pageNo == null || pageNo < 0) {
 			pageNo = 1;
 		}

+ 3 - 3
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -227,11 +227,11 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<CultivationListBo> listCultivation(String province, String uid, Integer pageNo, Integer pageSize) {
+	public Pagination<CultivationListBo> listCultivation(String province, String unitName, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 		
-		if (!StringUtils.isBlank(uid)){
-			params.put("uid", uid);
+		if (!StringUtils.isBlank(unitName)){
+			params.put("unitName", unitName);
 		}
 		
 		if (!StringUtils.isBlank(province)){

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgTechCenterDetailServiceImpl.java

@@ -41,7 +41,7 @@ public class OrgTechCenterDetailServiceImpl extends BaseMybatisDao<OrgTechCenter
 	}
 
 	@Override
-	public OrgTechCenterDetail inset(OrgTechCenterDetail orgTechCenterDetail) {
+	public OrgTechCenterDetail insert(OrgTechCenterDetail orgTechCenterDetail) {
 		orgTechCenterDetailMapper.insert(orgTechCenterDetail);
 		return null;
 	}

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

@@ -414,8 +414,8 @@
 	RIGHT JOIN user u  on u.id = i.uid 
 	LEFT JOIN admin a on a.id = i.consultant
 	where u.type = 1 and u.lvl = 1
-	<if test="uid != null">
-	    and u.id = #{uid,jdbcType=VARCHAR}
+	<if test="unitName != null">
+	    and i.unit_name = #{unitName,jdbcType=VARCHAR}
 	</if>
 	<if test="province != null">
 	    and i.location_province = #{province,jdbcType=VARCHAR}
@@ -431,8 +431,8 @@
 	RIGHT JOIN user u  on u.id = i.uid 
 	LEFT JOIN admin a on a.id = i.consultant
 	where u.type = 1 and u.lvl = 1
-	<if test="uid != null">
-	    and u.id = #{uid,jdbcType=VARCHAR}
+	<if test="unitName != null">
+	    and i.unit_name = #{unitName,jdbcType=VARCHAR}
 	</if>
 	<if test="province != null">
 	    and i.location_province = #{province,jdbcType=VARCHAR}

+ 4 - 1
src/main/java/com/goafanti/common/model/TechWebsite.java

@@ -2,6 +2,8 @@ package com.goafanti.common.model;
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 
 
 public class TechWebsite {
@@ -95,7 +97,8 @@ public class TechWebsite {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-
+    
+    @JsonIgnore
     public Integer getDeletedSign() {
         return deletedSign;
     }

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

@@ -51,7 +51,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.9
+static.host=//afts.hnzhiming.com/1.0.10
 
 upload.path=/data/wwwroot/aft/upload
 upload.private.path=/data/upload

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

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.9
+static.host=//afts.hnzhiming.com/1.0.10
 
 upload.path=/Users/xiaolong/Sites/upload
 upload.private.path=/Users/xiaolong/Sites/doc

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

@@ -51,4 +51,4 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//afts.hnzhiming.com/1.0.9
+static.host=//afts.hnzhiming.com/1.0.10

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

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.9
+static.host=//aftts.hnzhiming.com/1.0.10
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload