ソースを参照

update 高企年报详情

Antiloveg 8 年 前
コミット
df165ec02a

+ 178 - 42
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -10,6 +10,7 @@ import java.util.UUID;
 
 import javax.annotation.Resource;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -20,6 +21,7 @@ import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.model.OrgActivity;
 import com.goafanti.common.model.OrgActivityCost;
+import com.goafanti.common.model.OrgAnnualReport;
 import com.goafanti.common.model.OrgCognizance;
 import com.goafanti.common.model.OrgCognizanceLog;
 import com.goafanti.common.model.OrgFinance;
@@ -39,6 +41,9 @@ import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.techservice.cognizance.bo.ActivityNumberBo;
+import com.goafanti.techservice.cognizance.bo.AnnualReportBo;
+import com.goafanti.techservice.cognizance.bo.AnnualReportMainBo;
+import com.goafanti.techservice.cognizance.bo.AnnualReportPropertyRightBo;
 import com.goafanti.techservice.cognizance.bo.CognizanceCatagoryBo;
 import com.goafanti.techservice.cognizance.bo.CognizanceDetailBo;
 import com.goafanti.techservice.cognizance.bo.CognizanceManageCostBo;
@@ -46,6 +51,7 @@ import com.goafanti.techservice.cognizance.bo.CognizanceOrgInfoBo;
 import com.goafanti.techservice.cognizance.bo.CognizanceResearchCostBo;
 import com.goafanti.techservice.cognizance.service.OrgActivityCostService;
 import com.goafanti.techservice.cognizance.service.OrgActivityService;
+import com.goafanti.techservice.cognizance.service.OrgAnnualReportService;
 import com.goafanti.techservice.cognizance.service.OrgCognizanceLogService;
 import com.goafanti.techservice.cognizance.service.OrgCognizanceService;
 import com.goafanti.techservice.cognizance.service.OrgFinanceService;
@@ -100,7 +106,9 @@ public class AdminApiController extends BaseApiController {
 	@Resource
 	private OrgCognizanceLogService			orgCognizanceLogService;
 	@Resource
-	private UserAbilityService              userAbilityService;
+	private UserAbilityService				userAbilityService;
+	@Resource
+	private OrgAnnualReportService			orgAnnualReportService;
 
 	/**
 	 * 个人用户列表
@@ -223,7 +231,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/orgHumanResource", method = RequestMethod.POST)
 	public Result orgHumanResource(Integer year, String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res,uid);
+		res = checkCertify(res, uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -370,7 +378,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/techProductList", method = RequestMethod.POST)
 	public Result techProductList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res,uid);
+		res = checkCertify(res, uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -401,7 +409,7 @@ public class AdminApiController extends BaseApiController {
 	public Result activityList(String activityNumber, String activityName, String startDateFormattedDate,
 			String endDateFormattedDate, String pageNo, String pageSize, String uid) throws ParseException {
 		Result res = new Result();
-		res = checkCertify(res,uid);
+		res = checkCertify(res, uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -476,7 +484,7 @@ public class AdminApiController extends BaseApiController {
 	public Result activityCostList(String activityNumber, String startDateFormattedDate, String endDateFormattedDate,
 			String pageNo, String pageSize, String uid) throws ParseException {
 		Result res = new Result();
-		res = checkCertify(res,uid);
+		res = checkCertify(res, uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -534,7 +542,7 @@ public class AdminApiController extends BaseApiController {
 			Calendar now = Calendar.getInstance();
 			now.set(Calendar.MILLISECOND, 0);
 			orgTechProduct.setCreateTime(now.getTime());
-			orgTechProduct.setYear(Calendar.getInstance().get(Calendar.YEAR)-1);
+			orgTechProduct.setYear(Calendar.getInstance().get(Calendar.YEAR) - 1);
 			orgTechProductService.insert(orgTechProduct);
 		} else {
 			orgTechProductService.updateByPrimaryKeySelective(orgTechProduct);
@@ -551,7 +559,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/ratepay", method = RequestMethod.POST)
 	public Result ratepay(Integer year, String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res,uid);
+		res = checkCertify(res, uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -573,7 +581,7 @@ public class AdminApiController extends BaseApiController {
 	public Result disposeRatepay(OrgRatepay orgRatepay) {
 		Result res = new Result();
 		if (null == orgRatepay.getId()) {
-			if (null == orgRatepayService.selectRatepayByUidAndYear(orgRatepay.getUid(), orgRatepay.getYear())){
+			if (null == orgRatepayService.selectRatepayByUidAndYear(orgRatepay.getUid(), orgRatepay.getYear())) {
 				orgRatepay.setId(UUID.randomUUID().toString());
 				orgRatepay.setDeletedSign(0);
 				orgRatepayService.insert(orgRatepay);
@@ -595,7 +603,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/finance", method = RequestMethod.POST)
 	public Result finance(Integer year, String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res,uid);
+		res = checkCertify(res, uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -620,7 +628,7 @@ public class AdminApiController extends BaseApiController {
 	public Result disposeFinance(OrgFinance orgFinance) {
 		Result res = new Result();
 		if (null == orgFinance.getId()) {
-			if (null == orgFinanceService.selectFinanceByUidAndYear(orgFinance.getUid(), orgFinance.getYear())){
+			if (null == orgFinanceService.selectFinanceByUidAndYear(orgFinance.getUid(), orgFinance.getYear())) {
 				orgFinance.setId(UUID.randomUUID().toString());
 				orgFinance.setDeletedSign(0);
 				orgFinanceService.insert(orgFinance);
@@ -658,7 +666,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/achievementList", method = RequestMethod.POST)
 	public Result achievementList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res,uid);
+		res = checkCertify(res, uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -701,7 +709,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/honorList", method = RequestMethod.POST)
 	public Result honorList(String pageNo, String pageSize, String uid) {
 		Result res = new Result();
-		res = checkCertify(res,uid);
+		res = checkCertify(res, uid);
 		if (res.getError().isEmpty()) {
 			Integer pNo = 1;
 			Integer pSize = 10;
@@ -748,7 +756,7 @@ public class AdminApiController extends BaseApiController {
 	@RequestMapping(value = "/center", method = RequestMethod.POST)
 	public Result center(String uid) {
 		Result res = new Result();
-		res = checkCertify(res,uid);
+		res = checkCertify(res, uid);
 		if (res.getError().isEmpty()) {
 			res.setData(orgTechCenterService.selectOrgTechCenterByUid(uid));
 		}
@@ -833,7 +841,7 @@ public class AdminApiController extends BaseApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/listCognizance", method = RequestMethod.POST)
-	public Result listCognizance(String locationProvince, String unitName, String pageNo, String pageSize) {
+	public Result listCognizance(String uid, String locationProvince, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -844,44 +852,48 @@ public class AdminApiController extends BaseApiController {
 			pNo = Integer.parseInt(pageNo);
 		}
 
-		res.setData(orgCognizanceService.listCognizance(locationProvince, unitName, pNo, pSize));
+		res.setData(orgCognizanceService.listCognizance(uid, locationProvince, pNo, pSize));
 		return res;
 	}
-	
+
 	/**
 	 * 高企认定流转状态
+	 * 
 	 * @param cid
 	 * @return
 	 */
 	@RequestMapping(value = "/cognizanceLog", method = RequestMethod.POST)
-	public Result cognizanceLog(String cid){
+	public Result cognizanceLog(String cid) {
 		Result res = new Result();
 		List<OrgCognizanceLog> list = orgCognizanceLogService.selectOrgCognizanceLogByCid(cid);
 		res.setData(list);
 		return res;
 	}
-	
+
 	/**
 	 * 高企认定详情入口
+	 * 
 	 * @param uid
 	 * @param cid
 	 * @return
 	 */
 	@RequestMapping(value = "/cognizanceDetail", method = RequestMethod.POST)
-	public Result cognizanceDetail(String uid, String cid){
+	public Result cognizanceDetail(String uid, String cid) {
 		Result res = new Result();
 		res.setData(handleCognizanceDetail(uid, cid));
 		return res;
 	}
-	
+
 	/**
 	 * 保存高企认定详情
-	 * @throws ParseException 
+	 * 
+	 * @throws ParseException
 	 */
 	@RequestMapping(value = "/disposeCognizanceDetail", method = RequestMethod.POST)
-	public Result disposeCognizanceDetail(OrgCognizance cog, OrgCognizanceLog log, String recordTimeFormattedDate) throws ParseException{
+	public Result disposeCognizanceDetail(OrgCognizance cog, OrgCognizanceLog log, String recordTimeFormattedDate)
+			throws ParseException {
 		Result res = new Result();
-		if (null != log.getState()){
+		if (null != log.getState()) {
 			cog.setState(log.getState());
 			log.setId(UUID.randomUUID().toString());
 			log.setCid(cog.getId());
@@ -889,32 +901,34 @@ public class AdminApiController extends BaseApiController {
 				log.setRecordTime(DateUtils.parseDate(recordTimeFormattedDate, "yyyy-MM-dd"));
 			}
 			orgCognizanceLogService.insert(log);
-		} 
-			orgCognizanceService.updateByPrimaryKeySelective(cog);
+		}
+		orgCognizanceService.updateByPrimaryKeySelective(cog);
 		return res;
 	}
-	
+
 	/**
 	 * 企业创新能力入口
+	 * 
 	 * @param uid
 	 * @return
 	 */
 	@RequestMapping(value = "/able", method = RequestMethod.POST)
-	public Result able(String uid){
+	public Result able(String uid) {
 		Result res = new Result();
 		res.setData(userAbilityService.selectUserAbilityByUserId(uid));
 		return res;
 	}
-	
+
 	/**
 	 * 企业创新能力新增+保存
+	 * 
 	 * @param u
 	 * @return
 	 */
 	@RequestMapping(value = "disposeAble", method = RequestMethod.POST)
-	public Result disposeAble(UserAbility u){
+	public Result disposeAble(UserAbility u) {
 		Result res = new Result();
-		if (null == u.getId()){
+		if (null == u.getId()) {
 			u.setId(UUID.randomUUID().toString());
 			userAbilityService.insert(u);
 		} else {
@@ -922,7 +936,78 @@ public class AdminApiController extends BaseApiController {
 		}
 		return res;
 	}
-	
+
+	/**
+	 * 年报列表
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/annualReport", method = RequestMethod.POST)
+	public Result annualReport(String uid, Integer year, Integer state, String pageSize, String pageNo) {
+		Result res = new Result();
+		res = checkCertify(res, uid);
+		if (res.getError().isEmpty()) {
+			Integer pNo = 1;
+			Integer pSize = 10;
+			if (StringUtils.isNumeric(pageSize)) {
+				pSize = Integer.parseInt(pageSize);
+			}
+			if (StringUtils.isNumeric(pageNo)) {
+				pNo = Integer.parseInt(pageNo);
+			}
+			res.setData(orgAnnualReportService.listOrgAnnualReport(year, state, pNo, pSize, uid));
+		}
+		return res;
+	}
+
+	/**
+	 * 企业年报详情
+	 * 
+	 * @param uid
+	 * @param year
+	 * @return
+	 */
+	@RequestMapping(value = "/annualReportDetail", method = RequestMethod.POST)
+	public Result annualReportDetail(String uid, Integer year) {
+		Result res = new Result();
+		if (null == year) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "当前年份年报数据异常!"));
+			return res;
+		}
+		res.setData(handleAnnualReport(uid, year));
+		return res;
+	}
+
+	/**
+	 * 高企年报新增+修改
+	 * 
+	 * @param orgAnnualReport
+	 * @return
+	 */
+	@RequestMapping(value = "/disposeAnnualReport", method = RequestMethod.POST)
+	public Result disposeAnnualReport(OrgAnnualReport orgAnnualReport) {
+		Result res = new Result();
+		if (null == orgAnnualReport.getId()) {
+			if (null != orgAnnualReportService.selectAnnualReportByYearAndUid(orgAnnualReport.getYear(),
+					orgAnnualReport.getUid())) {
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年企业年报已录入!"));
+				return res;
+			} else {
+				orgAnnualReport.setId(UUID.randomUUID().toString());
+				Calendar now = Calendar.getInstance();
+				now.set(Calendar.MILLISECOND, 0);
+				orgAnnualReport.setCreateTime(now.getTime());
+				orgAnnualReport.setLastUpdateTime(orgAnnualReport.getCreateTime());
+				orgAnnualReportService.insert(orgAnnualReport);
+			}
+		} else {
+			Calendar now = Calendar.getInstance();
+			now.set(Calendar.MILLISECOND, 0);
+			orgAnnualReport.setLastUpdateTime(now.getTime());
+			orgAnnualReportService.updateByPrimaryKeySelective(orgAnnualReport);
+		}
+		return res;
+	}
 
 	// 判断用户是否通过认证
 	private Result checkCertify(Result res, String uid) {
@@ -945,10 +1030,10 @@ public class AdminApiController extends BaseApiController {
 		return (Pagination<UserListBo>) userService.listUser(mobile, email, createTime, number, aftUsername,
 				auditStatus, pNo, pSize);
 	}
-	
-	private CognizanceDetailBo handleCognizanceDetail(String uid, String cid){
+
+	private CognizanceDetailBo handleCognizanceDetail(String uid, String cid) {
 		CognizanceDetailBo cog = new CognizanceDetailBo();
-		
+
 		CognizanceOrgInfoBo orgInfo = orgCognizanceService.selectCognizanceOrgInfoBoByUid(uid, cid);
 		cog.setUid(null == orgInfo.getUid() ? "" : orgInfo.getUid());
 		cog.setCid(null == orgInfo.getCid() ? "" : orgInfo.getCid());
@@ -959,13 +1044,15 @@ public class AdminApiController extends BaseApiController {
 		cog.setTechnicalField1(null == orgInfo.getTechnicalField1() ? 0 : orgInfo.getTechnicalField1());
 		cog.setTechnicalField2(null == orgInfo.getTechnicalField2() ? 0 : orgInfo.getTechnicalField2());
 		cog.setTechnicalField3(null == orgInfo.getTechnicalField3() ? 0 : orgInfo.getTechnicalField3());
-		cog.setBasicResearchCost(null == orgInfo.getBasicResearchCost() ? new BigDecimal(0) : orgInfo.getBasicResearchCost());
+		cog.setBasicResearchCost(
+				null == orgInfo.getBasicResearchCost() ? new BigDecimal(0) : orgInfo.getBasicResearchCost());
 		cog.setAccident(null == orgInfo.getAccient() ? 0 : orgInfo.getAccient());
-		
-		CognizanceResearchCostBo  researchCost = orgCognizanceService.selectCognizanceResearchCostBoByUid(uid);
-		cog.setResearchCost(null == researchCost.getResearchCost() ? new BigDecimal(0) :  researchCost.getResearchCost());
+
+		CognizanceResearchCostBo researchCost = orgCognizanceService.selectCognizanceResearchCostBoByUid(uid);
+		cog.setResearchCost(
+				null == researchCost.getResearchCost() ? new BigDecimal(0) : researchCost.getResearchCost());
 		cog.setTerritory(null == researchCost.getTerritory() ? new BigDecimal(0) : researchCost.getTerritory());
-		
+
 		CognizanceManageCostBo manageCost = orgCognizanceService.selectCognizanceManageCostBoByUid(uid);
 		cog.setNetAsset1(null == manageCost.getNetAsset1() ? new BigDecimal(0) : manageCost.getNetAsset1());
 		cog.setNetAsset2(null == manageCost.getNetAsset2() ? new BigDecimal(0) : manageCost.getNetAsset2());
@@ -976,17 +1063,66 @@ public class AdminApiController extends BaseApiController {
 		cog.setGrossProfit1(null == manageCost.getGrossProfit1() ? new BigDecimal(0) : manageCost.getGrossProfit1());
 		cog.setGrossProfit2(null == manageCost.getGrossProfit2() ? new BigDecimal(0) : manageCost.getGrossProfit2());
 		cog.setGrossProfit3(null == manageCost.getGrossProfit3() ? new BigDecimal(0) : manageCost.getGrossProfit3());
-		
+
 		CognizanceCatagoryBo catagory = orgCognizanceService.selectCognizanceCatagoryBoByUid(uid);
 		cog.setFirstCatagory(null == catagory.getFirstCatagory() ? 0 : catagory.getFirstCatagory());
 		cog.setSecondCatagory(null == catagory.getSecondCatagory() ? 0 : catagory.getSecondCatagory());
 		cog.setFirmTotal(null == catagory.getFirmTotal() ? 0 : catagory.getFirmTotal());
 		cog.setTechTotal(null == catagory.getTechTotal() ? 0 : catagory.getTechTotal());
 		cog.setTotalRevenue(null == catagory.getTotalRevenue() ? new BigDecimal(0) : catagory.getTotalRevenue());
-		
+
 		cog.setLastYearRevenue(orgCognizanceService.selectLastYearRevenueByUid(uid));
 		return cog;
 	}
 
-	
+	private AnnualReportBo handleAnnualReport(String uid, Integer year) {
+		AnnualReportBo report = new AnnualReportBo();
+
+		AnnualReportPropertyRightBo p = orgAnnualReportService.selectAnnualReportPropertyRightBoByYearAndUid(year, uid);
+		report.setInventionPatent(null == p.getInventionPatent() ? 0 : p.getInventionPatent());
+		report.setDefensePatent(null == p.getDefensePatent() ? 0 : p.getDefensePatent());
+		report.setNationalCrop(null == p.getNationalCrop() ? 0 : p.getNationalCrop());
+		report.setNewPlantCariety(null == p.getNewPlantCariety() ? 0 : p.getNewPlantCariety());
+		report.setNationalDrug(null == p.getNationalDrug() ? 0 : p.getNationalDrug());
+		report.setChineseMedicine(null == p.getChineseMedicine() ? 0 : p.getChineseMedicine());
+		report.setUtilityPatent(null == p.getUtilityPatent() ? 0 : p.getUtilityPatent());
+		report.setCircuitDesign(null == p.getCircuitDesign() ? 0 : p.getCircuitDesign());
+		report.setExteriorPatent(null == p.getExteriorPatent() ? 0 : p.getExteriorPatent());
+		report.setSoftwareWorks(null == p.getSoftwareWorks() ? 0 : p.getSoftwareWorks());
+
+		BigDecimal t = orgAnnualReportService.selectAnnualReportTerritoryByYearAndUid(year, uid);
+		report.setTerritory(null == t ? new BigDecimal(0) : t);
+
+		AnnualReportMainBo m = orgAnnualReportService.selectAnnualReportMainBoByYearAndUid(year, uid);
+		report.setUid(m.getUid());
+		report.setUnitName(m.getUnitName());
+		report.setOrgCode(m.getOrgCode());
+		report.setLocationProvince(m.getLocationProvince());
+		report.setLocationCity(m.getLocationCity());
+		report.setLocationArea(m.getLocationArea());
+		report.setListed(m.getListed().toString());
+		if (null != m.getListedDate()) {
+			report.setListedDate(DateFormatUtils.format(m.getListedDate(), "yyyy-MM-dd"));
+		}
+		report.setListedType(m.getListedType().toString());
+		report.setStockCode(m.getStockCode());
+		report.setFirmTotal(null == m.getFirmTotal() ? 0 : m.getFirmTotal());
+		report.setTechTotal(null == m.getTechTotal() ? 0 : m.getTechTotal());
+		report.setNewEmployment(null == m.getNewEmployment() ? 0 : m.getNewEmployment());
+		report.setGraduateNumber(null == m.getGraduateNumber() ? 0 : m.getGraduateNumber());
+		report.setSalesRevenue(null == m.getSalesRevenue() ? new BigDecimal(0) : m.getSalesRevenue());
+		report.setGrossProfit(null == m.getGrossProfit() ? new BigDecimal(0) : m.getGrossProfit());
+		report.setNetAsset(null == m.getNetAsset() ? new BigDecimal(0) : m.getNetAsset());
+		report.setCertificateNumber(m.getCertificateNumber());
+		if (null != m.getIssuingDate()) {
+			report.setIssuingDate(DateFormatUtils.format(m.getIssuingDate(), "yyyy-MM-dd"));
+		}
+		report.setContacts(m.getContacts());
+		report.setResearchCost(null == m.getResearchCost() ? new BigDecimal(0) : m.getResearchCost());
+		report.setTotalRevenue(null == m.getTotalRevenue() ? new BigDecimal(0) : m.getTotalRevenue());
+		report.setLastYearRevenue(null == m.getLastYearRevenue() ? new BigDecimal(0) : m.getLastYearRevenue());
+
+		return report;
+	}
+
 }

+ 5 - 3
src/main/java/com/goafanti/common/dao/OrgAnnualReportMapper.java

@@ -22,9 +22,11 @@ public interface OrgAnnualReportMapper {
 
 	int batchDeleteByPrimaryKey(List<String> id);
 
-	AnnualReportPropertyRightBo selectAnnualReportPropertyRightBoByYearAndUid(String year, String uid);
+	AnnualReportPropertyRightBo selectAnnualReportPropertyRightBoByYearAndUid(Integer year, String uid);
 
-	BigDecimal selectAnnualReportTerritoryByYearAndUid(String year, String uid);
+	BigDecimal selectAnnualReportTerritoryByYearAndUid(Integer year, String uid);
 
-	AnnualReportMainBo selectAnnualReportMainBoByYearAndUid(String year, String uid);
+	AnnualReportMainBo selectAnnualReportMainBoByYearAndUid(Integer year, String uid);
+
+	OrgAnnualReport selectAnnualReportByYearAndUid(Integer year, String uid);
 }

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

@@ -19,10 +19,10 @@
     year, state, deleted_sign
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
-    <include refid="Base_Column_List" />
-    from org_annual_report
-    where id = #{id,jdbcType=VARCHAR}
+	    select 
+	    <include refid="Base_Column_List" />
+	    from org_annual_report
+	    where id = #{id,jdbcType=VARCHAR}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from org_annual_report
@@ -324,7 +324,6 @@ select uid, count(1) as inventionPatent
 			o.location_city as locationCity, o.location_area as locationArea, o.listed, o.listed_date as listedDate, 
 			o.listed_type as listedType, o.stock_code as stockCode, h.firm_total as firmTotal, h.tech_total as techTotal,
 			h.new_employment as newEmployment, h.graduate_number as graduateNumber,
-			a.total_tax as totalTax, a.income_tax_relief as incomeTaxRelief, a.total_export_volume as totalExportVolume,
 			f.sales_revenue as salesRevenue, f.gross_profit as grossProfit, f.net_asset as netAsset, 
 			c.certificate_number as certificateNumber, c.issuing_date as issuingDate, c.contacts, r.research_cost as researchCost,
 			x.totalRevenue, y.lastYearRevenue from 
@@ -332,7 +331,6 @@ select uid, count(1) as inventionPatent
 			LEFT JOIN organization_identity o
 			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_annual_report a on a.uid = u.id  AND a.year = #{0}  AND a.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_ratepay r on r.uid = u.id  AND r.year = #{0} AND r.deleted_sign = 0
@@ -348,4 +346,12 @@ select uid, count(1) as inventionPatent
 						and year = #{0} and deleted_sign = 0
 			      )   y on y.uid = u.id 
   </select>
+  
+  <select id="selectAnnualReportByYearAndUid" resultMap="BaseResultMap">
+  	 select 
+    <include refid="Base_Column_List" />
+    from org_annual_report
+    where year = #{0} and uid = #{1} and deleted_sign = 0
+  </select>
+  
 </mapper>

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

@@ -270,12 +270,12 @@
 	LEFT JOIN organization_identity i on i.uid = u.id) x  
 	LEFT JOIN  admin a on a.id = x.consultant
 	where 1 = 1
+	<if test="uid != null">
+		and x.uid = #{uid,jdbcType=VARCHAR}
+	</if>
 	<if test="locationProvince != null">
 		and x.location_province = #{locationProvince, jdbcType=VARCHAR}
 	</if>
-	<if test="unitName != null">
-		and x.unit_name = #{unitName,jdbcType=VARCHAR}
-	</if>
 	order by x.issuing_date desc
 	<if test="page_sql!=null">
 		${page_sql}
@@ -297,12 +297,12 @@
 	LEFT JOIN organization_identity i on i.uid = u.id) x  
 	LEFT JOIN  admin a on a.id = x.consultant
 	where 1 = 1
+	<if test="uid != null">
+		and x.uid = #{uid,jdbcType=VARCHAR}
+	</if>
 	<if test="locationProvince != null">
 		and x.location_province = #{locationProvince, jdbcType=VARCHAR}
 	</if>
-	<if test="unitName != null">
-		and x.unit_name = #{unitName,jdbcType=VARCHAR}
-	</if>
 	order by x.issuing_date desc
 	<if test="page_sql!=null">
 		${page_sql}

+ 17 - 30
src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportBo.java

@@ -1,10 +1,7 @@
 package com.goafanti.techservice.cognizance.bo;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonFormat.Shape;
 
 /**
  * 企业年报
@@ -47,22 +44,22 @@ public class AnnualReportBo {
 	/**
 	 * 高企认定时间
 	 */
-	private Date issuingDate;
+	private String issuingDate;
 	
 	 /**
      * 是否上市
      */
-    private Integer listed;
+    private String listed;
     
     /**
      * 上市时间
      */
-    private Date listedDate;
+    private String listedDate;
     
     /**
      * 上市类型
      */
-    private Integer listedType;
+    private String listedType;
     
     /**
      * 股票代码
@@ -179,10 +176,6 @@ public class AnnualReportBo {
 	 */
 	private BigDecimal territory;
 	
-	/**
-	 * 基础研究投入费用
-	 */
-	private BigDecimal basicResearchCost;
 
 	public String getUid() {
 		return uid;
@@ -232,37 +225,38 @@ public class AnnualReportBo {
 		this.locationArea = locationArea;
 	}
 	
-	public Date getIssuingDate() {
+	
+	
+
+	public String getIssuingDate() {
 		return issuingDate;
 	}
 
-	public void setIssuingDate(Date issuingDate) {
+	public void setIssuingDate(String issuingDate) {
 		this.issuingDate = issuingDate;
 	}
-	
-	@JsonFormat(shape = Shape.STRING)
-	public Integer getListed() {
+
+	public String getListed() {
 		return listed;
 	}
 
-	public void setListed(Integer listed) {
+	public void setListed(String listed) {
 		this.listed = listed;
 	}
 
-	public Date getListedDate() {
+	public String getListedDate() {
 		return listedDate;
 	}
 
-	public void setListedDate(Date listedDate) {
+	public void setListedDate(String listedDate) {
 		this.listedDate = listedDate;
 	}
-	
-	@JsonFormat(shape = Shape.STRING)
-	public Integer getListedType() {
+
+	public String getListedType() {
 		return listedType;
 	}
 
-	public void setListedType(Integer listedType) {
+	public void setListedType(String listedType) {
 		this.listedType = listedType;
 	}
 
@@ -458,13 +452,6 @@ public class AnnualReportBo {
 		this.territory = territory;
 	}
 
-	public BigDecimal getBasicResearchCost() {
-		return basicResearchCost;
-	}
-
-	public void setBasicResearchCost(BigDecimal basicResearchCost) {
-		this.basicResearchCost = basicResearchCost;
-	}
 
 	
 	

+ 0 - 28
src/main/java/com/goafanti/techservice/cognizance/bo/AnnualReportMainBo.java

@@ -34,11 +34,6 @@ public class AnnualReportMainBo {
 	
 	private Integer graduateNumber;
 	
-	private BigDecimal totalTax;
-	
-	private BigDecimal incomeTaxRelief;
-	
-	private BigDecimal totalExportVolume;
 	
 	private BigDecimal salesRevenue;
 	
@@ -170,29 +165,6 @@ public class AnnualReportMainBo {
 		this.graduateNumber = graduateNumber;
 	}
 
-	public BigDecimal getTotalTax() {
-		return totalTax;
-	}
-
-	public void setTotalTax(BigDecimal totalTax) {
-		this.totalTax = totalTax;
-	}
-
-	public BigDecimal getIncomeTaxRelief() {
-		return incomeTaxRelief;
-	}
-
-	public void setIncomeTaxRelief(BigDecimal incomeTaxRelief) {
-		this.incomeTaxRelief = incomeTaxRelief;
-	}
-
-	public BigDecimal getTotalExportVolume() {
-		return totalExportVolume;
-	}
-
-	public void setTotalExportVolume(BigDecimal totalExportVolume) {
-		this.totalExportVolume = totalExportVolume;
-	}
 
 	public BigDecimal getSalesRevenue() {
 		return salesRevenue;

+ 95 - 19
src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java

@@ -1,6 +1,7 @@
 package com.goafanti.techservice.cognizance.controller;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -12,6 +13,7 @@ import java.util.UUID;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -41,7 +43,9 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.techservice.cognizance.bo.ActivityNumberBo;
+import com.goafanti.techservice.cognizance.bo.AnnualReportBo;
 import com.goafanti.techservice.cognizance.bo.AnnualReportMainBo;
+import com.goafanti.techservice.cognizance.bo.AnnualReportPropertyRightBo;
 import com.goafanti.techservice.cognizance.service.OrgActivityCostService;
 import com.goafanti.techservice.cognizance.service.OrgActivityService;
 import com.goafanti.techservice.cognizance.service.OrgAnnualReportService;
@@ -891,6 +895,29 @@ public class CognizanceApiController extends BaseApiController {
 	}
 	
 	/**
+	 * 高企认定列表入口
+	 * 
+	 * @param locationProvince
+	 * @param unitName
+	 * @return
+	 */
+	@RequestMapping(value = "/listCognizance", method = RequestMethod.POST)
+	public Result listCognizance( String locationProvince,  String pageNo, String pageSize) {
+		Result res = new Result();
+		Integer pNo = 1;
+		Integer pSize = 10;
+		if (StringUtils.isNumeric(pageSize)) {
+			pSize = Integer.parseInt(pageSize);
+		}
+		if (StringUtils.isNumeric(pageNo)) {
+			pNo = Integer.parseInt(pageNo);
+		}
+
+		res.setData(orgCognizanceService.listCognizance(TokenManager.getUserId() , locationProvince,  pNo, pSize));
+		return res;
+	}
+	
+	/**
 	 * 申请高企认定
 	 * @return
 	 */
@@ -938,21 +965,17 @@ public class CognizanceApiController extends BaseApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/annualReportDetail", method = RequestMethod.POST)
-	public Result annualReportDetail(String uid, String year){
+	public Result annualReportDetail(Integer year){
 		Result res = new Result();
-		
-		//AnnualReportPropertyRightBo o = orgAnnualReportService.selectAnnualReportPropertyRightBoByYearAndUid(year, uid);
-		//BigDecimal o1 = orgAnnualReportService.selectAnnualReportTerritoryByYearAndUid(year, uid);
-		AnnualReportMainBo o2 = orgAnnualReportService.selectAnnualReportMainBoByYearAndUid(year, uid);
-		res.setData(o2);
-		//res.setData(handleAnnualReport(uid, year));
+		if (null == year){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "当前年份年报数据异常!"));
+			return res;
+		}
+		res.setData(handleAnnualReport(TokenManager.getUserId(), year));
 		return res;
 	}
 	
-	/*private AnnualReportBo handleAnnualReport(String uid, String year) {
-		// TODO Auto-generated method stub
-		return null;
-	}*/
+	
 
 	/**
 	 * 高企年报新增+修改
@@ -963,13 +986,18 @@ public class CognizanceApiController extends BaseApiController {
 	public Result disposeAnnualReport(OrgAnnualReport orgAnnualReport){
 		Result res = new Result();
 		if (null == orgAnnualReport.getId()){
-			orgAnnualReport.setId(UUID.randomUUID().toString());
-			orgAnnualReport.setUid(TokenManager.getUserId());
-			Calendar now = Calendar.getInstance();
-			now.set(Calendar.MILLISECOND, 0);
-			orgAnnualReport.setCreateTime(now.getTime());
-			orgAnnualReport.setLastUpdateTime(orgAnnualReport.getCreateTime());
-			orgAnnualReportService.insert(orgAnnualReport);
+			if (null != orgAnnualReportService.selectAnnualReportByYearAndUid(orgAnnualReport.getYear(), TokenManager.getUserId())){
+				res.getError().add(buildError(ErrorConstants.DUPLICATE_DATA_ERROR, "当年企业年报已录入!"));
+				return res;
+			} else {
+				orgAnnualReport.setId(UUID.randomUUID().toString());
+				orgAnnualReport.setUid(TokenManager.getUserId());
+				Calendar now = Calendar.getInstance();
+				now.set(Calendar.MILLISECOND, 0);
+				orgAnnualReport.setCreateTime(now.getTime());
+				orgAnnualReport.setLastUpdateTime(orgAnnualReport.getCreateTime());
+				orgAnnualReportService.insert(orgAnnualReport);
+			}
 		} else {
 			Calendar now = Calendar.getInstance();
 			now.set(Calendar.MILLISECOND, 0);
@@ -995,7 +1023,55 @@ public class CognizanceApiController extends BaseApiController {
 		return res;
 	}
 	
-	
+	private AnnualReportBo handleAnnualReport(String uid, Integer year) {
+		AnnualReportBo report = new AnnualReportBo();
+		
+		AnnualReportPropertyRightBo p = orgAnnualReportService.selectAnnualReportPropertyRightBoByYearAndUid(year, uid);
+		report.setInventionPatent(null == p.getInventionPatent() ? 0 : p.getInventionPatent());
+		report.setDefensePatent(null == p.getDefensePatent() ? 0 : p.getDefensePatent());
+		report.setNationalCrop(null == p.getNationalCrop() ? 0 : p.getNationalCrop());
+		report.setNewPlantCariety(null == p.getNewPlantCariety() ? 0 : p.getNewPlantCariety());
+		report.setNationalDrug(null == p.getNationalDrug() ? 0 : p.getNationalDrug());
+		report.setChineseMedicine(null == p.getChineseMedicine() ? 0 : p.getChineseMedicine());
+		report.setUtilityPatent(null == p.getUtilityPatent() ? 0 : p.getUtilityPatent());
+		report.setCircuitDesign(null == p.getCircuitDesign() ? 0 : p.getCircuitDesign());
+		report.setExteriorPatent(null == p.getExteriorPatent() ? 0 : p.getExteriorPatent());
+		report.setSoftwareWorks(null == p.getSoftwareWorks() ? 0 : p.getSoftwareWorks());
+		
+		BigDecimal t = orgAnnualReportService.selectAnnualReportTerritoryByYearAndUid(year, uid);
+		report.setTerritory(null == t ? new BigDecimal(0) : t);
+		
+		AnnualReportMainBo m = orgAnnualReportService.selectAnnualReportMainBoByYearAndUid(year, uid);
+		report.setUid(m.getUid());
+		report.setUnitName(m.getUnitName());
+		report.setOrgCode(m.getOrgCode());
+		report.setLocationProvince(m.getLocationProvince());
+		report.setLocationCity(m.getLocationCity());
+		report.setLocationArea(m.getLocationArea());
+		report.setListed(m.getListed().toString());
+		if (null != m.getListedDate()){
+			report.setListedDate(DateFormatUtils.format(m.getListedDate(), "yyyy-MM-dd"));
+		}
+		report.setListedType(m.getListedType().toString());
+		report.setStockCode(m.getStockCode());
+		report.setFirmTotal(null == m.getFirmTotal() ? 0 : m.getFirmTotal());
+		report.setTechTotal(null == m.getTechTotal() ? 0 : m.getTechTotal());
+		report.setNewEmployment(null == m.getNewEmployment() ? 0 : m.getNewEmployment());
+		report.setGraduateNumber(null == m.getGraduateNumber() ? 0 : m.getGraduateNumber());
+		report.setSalesRevenue(null == m.getSalesRevenue() ? new BigDecimal(0) : m.getSalesRevenue());
+		report.setGrossProfit(null == m.getGrossProfit() ? new BigDecimal(0) : m.getGrossProfit());
+		report.setNetAsset(null == m.getNetAsset() ? new BigDecimal(0) : m.getNetAsset());
+		report.setCertificateNumber(m.getCertificateNumber());
+		if (null != m.getIssuingDate()){
+			report.setIssuingDate(DateFormatUtils.format(m.getIssuingDate(), "yyyy-MM-dd"));
+		}
+		report.setContacts(m.getContacts());
+		report.setResearchCost(null == m.getResearchCost() ? new BigDecimal(0) : m.getResearchCost());
+		report.setTotalRevenue(null == m.getTotalRevenue() ? new BigDecimal(0) : m.getTotalRevenue());
+		report.setLastYearRevenue(null == m.getLastYearRevenue() ? new BigDecimal(0) : m.getLastYearRevenue());
+		
+		return report;
+	}
 	
 
 	private String handleFile(Result res, String path, boolean isPrivate, HttpServletRequest req, String sign,

+ 5 - 3
src/main/java/com/goafanti/techservice/cognizance/service/OrgAnnualReportService.java

@@ -18,10 +18,12 @@ public interface OrgAnnualReportService {
 
 	int updateByPrimaryKeySelective(OrgAnnualReport orgAnnualReport);
 
-	AnnualReportPropertyRightBo selectAnnualReportPropertyRightBoByYearAndUid(String year, String uid);
+	AnnualReportPropertyRightBo selectAnnualReportPropertyRightBoByYearAndUid(Integer year, String uid);
 
-	BigDecimal selectAnnualReportTerritoryByYearAndUid(String year, String uid);
+	BigDecimal selectAnnualReportTerritoryByYearAndUid(Integer year, String uid);
 
-	AnnualReportMainBo selectAnnualReportMainBoByYearAndUid(String year, String uid);
+	AnnualReportMainBo selectAnnualReportMainBoByYearAndUid(Integer year, String uid);
+
+	OrgAnnualReport selectAnnualReportByYearAndUid(Integer year, String uid);
 
 }

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

@@ -14,7 +14,7 @@ public interface OrgCognizanceService {
 
 	OrgCognizance insert(OrgCognizance c);
 
-	Pagination<CognizanceBo> listCognizance(String locationProvince, String unitName, Integer pNo, Integer pSize);
+	Pagination<CognizanceBo> listCognizance(String uid, String locationProvince, Integer pNo, Integer pSize);
 
 	CognizanceOrgInfoBo selectCognizanceOrgInfoBoByUid(String uid, String cid);
 

+ 8 - 3
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgAnnualReportServiceImpl.java

@@ -67,18 +67,23 @@ public class OrgAnnualReportServiceImpl extends BaseMybatisDao<OrgAnnualReportMa
 	}
 
 	@Override
-	public AnnualReportPropertyRightBo selectAnnualReportPropertyRightBoByYearAndUid(String year, String uid) {
+	public AnnualReportPropertyRightBo selectAnnualReportPropertyRightBoByYearAndUid(Integer year, String uid) {
 		// TODO Auto-generated method stub
 		return orgAnnualReportMapper.selectAnnualReportPropertyRightBoByYearAndUid(year, uid);
 	}
 
 	@Override
-	public BigDecimal selectAnnualReportTerritoryByYearAndUid(String year, String uid) {
+	public BigDecimal selectAnnualReportTerritoryByYearAndUid(Integer year, String uid) {
 		return orgAnnualReportMapper.selectAnnualReportTerritoryByYearAndUid(year, uid);
 	}
 
 	@Override
-	public AnnualReportMainBo selectAnnualReportMainBoByYearAndUid(String year, String uid) {
+	public AnnualReportMainBo selectAnnualReportMainBoByYearAndUid(Integer year, String uid) {
 		return orgAnnualReportMapper.selectAnnualReportMainBoByYearAndUid(year, uid);
 	}
+
+	@Override
+	public OrgAnnualReport selectAnnualReportByYearAndUid(Integer year, String uid) {
+		return orgAnnualReportMapper.selectAnnualReportByYearAndUid(year, uid);
+	}
 }

+ 5 - 4
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -31,17 +31,18 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<CognizanceBo> listCognizance(String locationProvince, String unitName, Integer pageNo,
+	public Pagination<CognizanceBo> listCognizance(String uid, String locationProvince,  Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 		
+		if (!StringUtils.isBlank(uid)){
+			params.put("uid", uid);
+		}
+		
 		if (!StringUtils.isBlank(locationProvince)){
 			params.put("locationProvince", locationProvince);
 		}
 		
-		if (!StringUtils.isBlank(unitName)){
-			params.put("unitName", unitName);
-		}
 		
 		if (pageNo == null || pageNo < 0) {
 			pageNo = 1;

+ 1 - 1
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -97,7 +97,7 @@ public class UserApiController extends BaseApiController {
 	@RequestMapping(value = "/pwd", method = RequestMethod.POST)
 	public Result updatePwd(String password, String newPassword) {
 		Result res = new Result();
-		if (password == null || newPassword == null) {
+		if (StringUtils.isBlank(password) || StringUtils.isBlank(newPassword)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "必须指定", "密码"));
 		}
 		if (password.equals(newPassword)) {

+ 1 - 1
src/main/resources/spring/spring-shiro.xml

@@ -21,7 +21,7 @@
 	    <constructor-arg index="1" value="${jedis.host}" name="host" type="java.lang.String"/>
 	    <constructor-arg index="2" value="${jedis.port}"  name="port" type="int"/>
 	    <constructor-arg index="3" value="${jedis.timeout}"  name="timeout" type="int"/>
-	    <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/>
+	    <!-- <constructor-arg index="4" value="${jedis.password}"  name="password" type="java.lang.String"/> -->
 	</bean>