Browse Source

update OrgRatepay&&OrgFinance

Antiloveg 8 years ago
parent
commit
27342e7301

+ 59 - 3
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.model.OrgFinance;
 import com.goafanti.common.model.OrgHumanResource;
 import com.goafanti.common.model.OrgIntellectualProperty;
 import com.goafanti.common.model.OrgRatepay;
@@ -25,6 +26,7 @@ import com.goafanti.common.utils.DateUtils;
 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.service.OrgFinanceService;
 import com.goafanti.techservice.cognizance.service.OrgIntellectualPropertyService;
 import com.goafanti.techservice.cognizance.service.OrgRatepayService;
 import com.goafanti.techservice.cognizance.service.OrgStandardService;
@@ -55,6 +57,8 @@ public class AdminApiController extends BaseApiController {
 	private OrgTechProductService           orgTechProductService;
 	@Resource
 	private OrgRatepayService               orgRatepayService;
+	@Resource
+	private OrgFinanceService               orgFinanceService;
 
 	/**
 	 * 个人用户列表
@@ -369,10 +373,21 @@ public class AdminApiController extends BaseApiController {
 	 * 企业纳税申报信息入口
 	 * @return
 	 */
-	@RequestMapping(value = "/ratepay", method = RequestMethod.GET)
-	public Result ratepay (String uid){
+	@RequestMapping(value = "/ratepay", method = RequestMethod.POST)
+	public Result ratepay (Integer year, String pageNo, String pageSize, String uid){
 		Result res = new Result();
-		res.setData(orgRatepayService.selectOrgRatepayByUid(uid));
+		res = checkCertify(res);
+		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(orgRatepayService.listOrgRatepay(year, pNo, pSize, uid));
+		}
 		return res;
 	}
 	
@@ -391,6 +406,47 @@ public class AdminApiController extends BaseApiController {
 		return res;
 	}
 	
+	/**
+	 * 财务报表信息入口
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/finance", method = RequestMethod.POST)
+	public Result finance(Integer year, String pageNo, String pageSize, String uid) {
+		Result res = new Result();
+		res = checkCertify(res);
+		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(orgFinanceService.listFinance(year, pNo, pSize, uid));
+		}
+		return res;
+	}
+
+	/**
+	 * 财务报表录入+修改
+	 * 
+	 * @param orgFinance
+	 * @return
+	 */
+	@RequestMapping(value = "/disposeFinance", method = RequestMethod.POST)
+	public Result disposeFinance(OrgFinance orgFinance) {
+		Result res = new Result();
+		if (null == orgFinance.getId()) {
+			orgFinance.setId(UUID.randomUUID().toString());
+			orgFinanceService.insert(orgFinance);
+		} else {
+			orgFinanceService.updateByPrimaryKeySelective(orgFinance);
+		}
+		return res;
+	}
+	
 	
 	//判断用户是否通过认证
 	private Result checkCertify(Result res,String uid){

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

@@ -15,12 +15,13 @@
     <result column="gross_profit" property="grossProfit" jdbcType="INTEGER" />
     <result column="net_profit" property="netProfit" jdbcType="INTEGER" />
     <result column="sales_revenue" property="salesRevenue" jdbcType="INTEGER" />
+    <result column="year" property="year" jdbcType="INTEGER" />
     <result column="finance_url" property="financeUrl" jdbcType="VARCHAR" />
     <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, main_business_income, management_cost, operating_profit, various_tax, current_asset, 
-    net_fixed_asset, total_asset, net_asset, gross_profit, net_profit, sales_revenue, 
+    net_fixed_asset, total_asset, net_asset, gross_profit, net_profit, sales_revenue, year,
     finance_url, deleted_sign
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
@@ -38,12 +39,13 @@
       management_cost, operating_profit, various_tax, 
       current_asset, net_fixed_asset, total_asset, 
       net_asset, gross_profit, net_profit, 
-      sales_revenue, finance_url, deleted_sign)
+      sales_revenue, year, finance_url, deleted_sign)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{mainBusinessIncome,jdbcType=INTEGER}, 
       #{managementCost,jdbcType=INTEGER}, #{operatingProfit,jdbcType=INTEGER}, #{variousTax,jdbcType=INTEGER}, 
       #{currentAsset,jdbcType=INTEGER}, #{netFixedAsset,jdbcType=INTEGER}, #{totalAsset,jdbcType=INTEGER}, 
       #{netAsset,jdbcType=INTEGER}, #{grossProfit,jdbcType=INTEGER}, #{netProfit,jdbcType=INTEGER}, 
-      #{salesRevenue,jdbcType=INTEGER}, #{financeUrl,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER})
+      #{salesRevenue,jdbcType=INTEGER}, #{year,jdbcType=INTEGER}, #{financeUrl,jdbcType=VARCHAR}, 
+      #{deletedSign,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgFinance" >
     insert into org_finance
@@ -87,6 +89,9 @@
       <if test="salesRevenue != null" >
         sales_revenue,
       </if>
+      <if test="year != null" >
+        year,
+      </if>
       <if test="financeUrl != null" >
         finance_url,
       </if>
@@ -134,6 +139,9 @@
       <if test="salesRevenue != null" >
         #{salesRevenue,jdbcType=INTEGER},
       </if>
+      <if test="year != null" >
+        #{year,jdbcType=INTEGER},
+      </if>
       <if test="financeUrl != null" >
         #{financeUrl,jdbcType=VARCHAR},
       </if>
@@ -181,6 +189,9 @@
       <if test="salesRevenue != null" >
         sales_revenue = #{salesRevenue,jdbcType=INTEGER},
       </if>
+      <if test="year != null" >
+        year = #{year,jdbcType=INTEGER},
+      </if>
       <if test="financeUrl != null" >
         finance_url = #{financeUrl,jdbcType=VARCHAR},
       </if>
@@ -204,15 +215,39 @@
       gross_profit = #{grossProfit,jdbcType=INTEGER},
       net_profit = #{netProfit,jdbcType=INTEGER},
       sales_revenue = #{salesRevenue,jdbcType=INTEGER},
+      year = #{year,jdbcType=INTEGER},
       finance_url = #{financeUrl,jdbcType=VARCHAR},
       deleted_sign = #{deletedSign,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
-   <select id="selectOrgFinanceByUid" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
+   <select id="findOrgFinanceListByPage" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
     <include refid="Base_Column_List" />
     from org_finance
-    where uid = #{uid,jdbcType=VARCHAR}
+    where deleted_sign = 0
+    <if test="uid != null">
+	    and  uid = #{uid,jdbcType=VARCHAR}
+	</if>
+	<if test="year != null">
+		and year = #{year,jdbcType=INTEGER}
+	</if>
+	order by year desc
+    <if test="page_sql != null">
+    	${page_sql}
+    </if>
+    
   </select>
+  
+  <select id="findOrgFinanceCount" resultType="java.lang.Integer" parameterType="String">
+   	select count(1) 
+	    from org_finance
+    where deleted_sign = 0
+	    <if test="uid != null">
+		    and  uid = #{uid,jdbcType=VARCHAR}
+		</if>
+		<if test="year != null">
+		and year = #{year,jdbcType=INTEGER}
+	    </if>
+    </select>
 </mapper>

+ 41 - 7
src/main/java/com/goafanti/common/mapper/OrgRatepayMapper.xml

@@ -11,12 +11,13 @@
     <result column="non_taxable_income" property="nonTaxableIncome" jdbcType="INTEGER" />
     <result column="tax_exempt_income" property="taxExemptIncome" jdbcType="INTEGER" />
     <result column="subsidy_income" property="subsidyIncome" jdbcType="INTEGER" />
+    <result column="year" property="year" jdbcType="INTEGER" />
     <result column="tax_return_url" property="taxReturnUrl" jdbcType="VARCHAR" />
     <result column="deleted_sign" property="deletedSign" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, uid, operating_income, management_cost, operating_profit, non_operating_income, 
-    non_taxable_income, tax_exempt_income, subsidy_income, tax_return_url, deleted_sign
+    non_taxable_income, tax_exempt_income, subsidy_income, year, tax_return_url, deleted_sign
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
@@ -31,12 +32,12 @@
   <insert id="insert" parameterType="com.goafanti.common.model.OrgRatepay" >
     insert into org_ratepay (id, uid, operating_income, 
       management_cost, operating_profit, non_operating_income, 
-      non_taxable_income, tax_exempt_income, subsidy_income, 
+      non_taxable_income, tax_exempt_income, subsidy_income, year,
       tax_return_url, deleted_sign)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{operatingIncome,jdbcType=INTEGER}, 
       #{managementCost,jdbcType=INTEGER}, #{operatingProfit,jdbcType=INTEGER}, #{nonOperatingIncome,jdbcType=INTEGER}, 
       #{nonTaxableIncome,jdbcType=INTEGER}, #{taxExemptIncome,jdbcType=INTEGER}, #{subsidyIncome,jdbcType=INTEGER}, 
-      #{taxReturnUrl,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER})
+      #{year,jdbcType=INTEGER}, #{taxReturnUrl,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OrgRatepay" >
     insert into org_ratepay
@@ -68,6 +69,9 @@
       <if test="subsidyIncome != null" >
         subsidy_income,
       </if>
+      <if test="year != null" >
+        year,
+      </if>
       <if test="taxReturnUrl != null" >
         tax_return_url,
       </if>
@@ -103,7 +107,10 @@
       <if test="subsidyIncome != null" >
         #{subsidyIncome,jdbcType=INTEGER},
       </if>
-      <if test="taxReturnUrl != null" >
+      <if test="year != null" >
+        #{year,jdbcType=INTEGER},
+      </if>
+       <if test="taxReturnUrl != null" >
         #{taxReturnUrl,jdbcType=VARCHAR},
       </if>
       <if test="deletedSign != null" >
@@ -138,6 +145,9 @@
       <if test="subsidyIncome != null" >
         subsidy_income = #{subsidyIncome,jdbcType=INTEGER},
       </if>
+      <if test="year != null" >
+        year = #{year,jdbcType=INTEGER},
+      </if>
       <if test="taxReturnUrl != null" >
         tax_return_url = #{taxReturnUrl,jdbcType=VARCHAR},
       </if>
@@ -157,15 +167,39 @@
       non_taxable_income = #{nonTaxableIncome,jdbcType=INTEGER},
       tax_exempt_income = #{taxExemptIncome,jdbcType=INTEGER},
       subsidy_income = #{subsidyIncome,jdbcType=INTEGER},
+      year = #{year,jdbcType=INTEGER},
       tax_return_url = #{taxReturnUrl,jdbcType=VARCHAR},
       deleted_sign = #{deletedSign,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   
-    <select id="selectOrgRatepayByUid" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select 
+    <select id="findOrgRatepayListByPage" parameterType="java.lang.String" resultMap="BaseResultMap">
+  	 select 
     <include refid="Base_Column_List" />
     from org_ratepay
-    where uid = #{uid,jdbcType=VARCHAR}
+    where deleted_sign = 0
+    <if test="uid != null">
+	    and  uid = #{uid,jdbcType=VARCHAR}
+	</if>
+	<if test="year != null">
+		and year = #{year,jdbcType=INTEGER}
+	</if>
+	order by year desc
+    <if test="page_sql != null">
+    	${page_sql}
+    </if>
+    
   </select>
+  
+  <select id="findOrgRatepayCount" resultType="java.lang.Integer" parameterType="String">
+   	select count(1) 
+	    from org_ratepay
+    where deleted_sign = 0
+	    <if test="uid != null">
+		    and  uid = #{uid,jdbcType=VARCHAR}
+		</if>
+		<if test="year != null">
+		and year = #{year,jdbcType=INTEGER}
+	    </if>
+    </select>
 </mapper>

+ 15 - 0
src/main/java/com/goafanti/common/model/OrgFinance.java

@@ -59,6 +59,11 @@ public class OrgFinance {
     * 销售收入(万元)
     */
     private Integer salesRevenue;
+    
+    /**
+     * 年份
+     */
+    private Integer year;
 
     /**
     * 财务报表URL
@@ -189,6 +194,16 @@ public class OrgFinance {
 	public void setDeletedSign(Integer deletedSign) {
 		this.deletedSign = deletedSign;
 	}
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+	
+	
     
     
 }

+ 14 - 2
src/main/java/com/goafanti/common/model/OrgRatepay.java

@@ -26,8 +26,7 @@ public class OrgRatepay {
     private Integer nonOperatingIncome;
 
     /**
-    * 不征税收入
(万元)
-    */
+    * 不征税收入(万元)
    */
     private Integer nonTaxableIncome;
 
     /**
@@ -39,6 +38,11 @@ public class OrgRatepay {
     * 政府补助收入(万元)
     */
     private Integer subsidyIncome;
+    
+    /**
+     * 年份
+     */
+    private Integer year;
 
     /**
     * 纳税申报表url
@@ -137,6 +141,14 @@ public class OrgRatepay {
 	public void setDeletedSign(Integer deletedSign) {
 		this.deletedSign = deletedSign;
 	}
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
     
     
 }

+ 26 - 4
src/main/java/com/goafanti/techservice/cognizance/controller/CognizanceApiController.java

@@ -440,9 +440,20 @@ public class CognizanceApiController extends BaseApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/ratepay", method = RequestMethod.GET)
-	public Result ratepay() {
+	public Result ratepay(Integer year, String pageNo, String pageSize) {
 		Result res = new Result();
-		res.setData(orgRatepayService.selectOrgRatepayByUid(TokenManager.getUserId()));
+		res = checkCertify(res);
+		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(orgRatepayService.listOrgRatepay(year, pNo, pSize, TokenManager.getUserId()));
+		}
 		return res;
 	}
 
@@ -468,9 +479,20 @@ public class CognizanceApiController extends BaseApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/finance", method = RequestMethod.GET)
-	public Result finance() {
+	public Result finance(Integer year, String pageNo, String pageSize) {
 		Result res = new Result();
-		res.setData(orgFinanceService.selectOrgFinanceByUid(TokenManager.getUserId()));
+		res = checkCertify(res);
+		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(orgFinanceService.listFinance(year, pNo, pSize, TokenManager.getUserId()));
+		}
 		return res;
 	}
 

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

@@ -1,13 +1,15 @@
 package com.goafanti.techservice.cognizance.service;
 
 import com.goafanti.common.model.OrgFinance;
+import com.goafanti.core.mybatis.page.Pagination;
 
 public interface OrgFinanceService {
 
-	OrgFinance selectOrgFinanceByUid(String userId);
 
 	OrgFinance insert(OrgFinance orgFinance);
 
 	int updateByPrimaryKeySelective(OrgFinance orgFinance);
 
+	Pagination<OrgFinance> listFinance(Integer year, Integer pNo, Integer pSize, String userId);
+
 }

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

@@ -1,13 +1,15 @@
 package com.goafanti.techservice.cognizance.service;
 
 import com.goafanti.common.model.OrgRatepay;
+import com.goafanti.core.mybatis.page.Pagination;
 
 public interface OrgRatepayService {
 
-	OrgRatepay selectOrgRatepayByUid(String userId);
 
 	OrgRatepay insert(OrgRatepay orgRatepay);
 
 	int updateByPrimaryKeySelective(OrgRatepay orgRatepay);
 
+	Pagination<OrgRatepay> listOrgRatepay(Integer year, Integer pNo, Integer pSize, String userId);
+
 }

+ 32 - 5
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgFinanceServiceImpl.java

@@ -1,20 +1,22 @@
 package com.goafanti.techservice.cognizance.service.impl;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.OrgFinanceMapper;
 import com.goafanti.common.model.OrgFinance;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.techservice.cognizance.service.OrgFinanceService;
 @Service
-public class OrgFinanceServiceImpl implements OrgFinanceService {
+public class OrgFinanceServiceImpl  extends BaseMybatisDao<OrgFinanceMapper> implements OrgFinanceService {
 	@Autowired
 	private OrgFinanceMapper orgFinanceMapper;
 
-	@Override
-	public OrgFinance selectOrgFinanceByUid(String uid) {
-		return orgFinanceMapper.selectOrgFinanceByUid(uid);
-	}
 
 	@Override
 	public OrgFinance insert(OrgFinance orgFinance) {
@@ -26,4 +28,29 @@ public class OrgFinanceServiceImpl implements OrgFinanceService {
 	public int updateByPrimaryKeySelective(OrgFinance orgFinance) {
 		return orgFinanceMapper.updateByPrimaryKeySelective(orgFinance);
 	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<OrgFinance> listFinance(Integer year, Integer pageNo, Integer pageSize, String uid) {
+		Map<String, Object> params = new HashMap<>();
+		
+		if (!StringUtils.isBlank(uid)){
+			params.put("uid", uid);
+		}
+		
+		if (null != year){
+			params.put("year", year);
+		}
+
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0) {
+			pageSize = 10;
+		}
+		return  (Pagination<OrgFinance>)findPage("findOrgFinanceListByPage",
+				"findOrgFinanceCount", params, pageNo, pageSize);
+	}
+	
 }

+ 31 - 5
src/main/java/com/goafanti/techservice/cognizance/service/impl/OrgRatepayServiceImpl.java

@@ -1,20 +1,22 @@
 package com.goafanti.techservice.cognizance.service.impl;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.OrgRatepayMapper;
 import com.goafanti.common.model.OrgRatepay;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.techservice.cognizance.service.OrgRatepayService;
 @Service
-public class OrgRatepayServiceImpl implements OrgRatepayService {
+public class OrgRatepayServiceImpl extends BaseMybatisDao<OrgRatepayMapper> implements OrgRatepayService {
 	@Autowired
 	private OrgRatepayMapper orgRatepayMapper;
 	
-	@Override
-	public OrgRatepay selectOrgRatepayByUid(String uid) {
-		return orgRatepayMapper.selectOrgRatepayByUid(uid);
-	}
 
 	@Override
 	public OrgRatepay insert(OrgRatepay orgRatepay) {
@@ -27,4 +29,28 @@ public class OrgRatepayServiceImpl implements OrgRatepayService {
 		return orgRatepayMapper.updateByPrimaryKeySelective(orgRatepay);
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<OrgRatepay> listOrgRatepay(Integer year, Integer pageNo, Integer pageSize, String uid) {
+		Map<String, Object> params = new HashMap<>();
+		
+		if (!StringUtils.isBlank(uid)){
+			params.put("uid", uid);
+		}
+		
+		if (null != year){
+			params.put("year", year);
+		}
+
+		if (pageNo == null || pageNo < 0) {
+			pageNo = 1;
+		}
+
+		if (pageSize == null || pageSize < 0) {
+			pageSize = 10;
+		}
+		return  (Pagination<OrgRatepay>)findPage("findOrgRatepayListByPage",
+				"findOrgRatepayCount", params, pageNo, pageSize);
+	}
+
 }