|
|
@@ -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;
|
|
|
+ }
|
|
|
+
|
|
|
}
|