Skip to content

T
traffic-front
Commit 23766b40 authored by zhkwei's avatar zhkwei
Browse files
Options

CIT固定资产-导入、资产清单补充及优化

parent 905dfd13
Hide whitespace changes
Inline Side-by-side
Showing with 1074 additions and 669 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/AssetListController.java
View file @ 23766b40
package pwc.taxtech.atms.controller; package pwc.taxtech.atms.controller;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
import pwc.taxtech.atms.dto.ApiResultDto; import pwc.taxtech.atms.dto.ApiResultDto;
import pwc.taxtech.atms.dto.AssetDetailGroupDto;
import pwc.taxtech.atms.dto.AssetDetailGroupStringDto;
import pwc.taxtech.atms.dto.OperationResultDto; import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.entity.AssetDetailGroup;
import pwc.taxtech.atms.entity.AssetGroup;
import pwc.taxtech.atms.entity.CitAssetGroupResult; import pwc.taxtech.atms.entity.CitAssetGroupResult;
import pwc.taxtech.atms.service.impl.AssetGroupServiceImpl; import pwc.taxtech.atms.entity.CitAssetsList;
import pwc.taxtech.atms.service.impl.AssetListServiceImpl; import pwc.taxtech.atms.service.impl.AssetListServiceImpl;
import javax.annotation.Resource;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @Description 资产相关Controller * @Description 资产相关Controller
...@@ -66,13 +56,13 @@ public class AssetListController { ...@@ -66,13 +56,13 @@ public class AssetListController {
* @return * @return
*/ */
@RequestMapping(value = "/getAssetResultList", method = RequestMethod.GET) @RequestMapping(value = "/getAssetResultList", method = RequestMethod.GET)
public @ResponseBody ApiResultDto getAssetResultList(Integer assetType){ public @ResponseBody ApiResultDto getAssetResultList(Integer assetType, @RequestParam String projectId, @RequestParam Integer taxAccountCompare){
logger.info("根据资产类别获取资产清单"); logger.info("根据资产类别获取资产清单");
ApiResultDto apiResultDto = new ApiResultDto(); ApiResultDto apiResultDto = new ApiResultDto();
try{ try{
apiResultDto.setCode(1); apiResultDto.setCode(1);
apiResultDto.setMessage("获取成功"); apiResultDto.setMessage("获取成功");
apiResultDto.setData(assetListService.getAssetResultList(assetType)); apiResultDto.setData(assetListService.getAssetResultList(assetType,projectId,taxAccountCompare));
return apiResultDto; return apiResultDto;
}catch(Exception e){ }catch(Exception e){
e.printStackTrace(); e.printStackTrace();
...@@ -152,6 +142,16 @@ public class AssetListController { ...@@ -152,6 +142,16 @@ public class AssetListController {
return null; return null;
} }
@RequestMapping(value="updateAssetResultList",method = RequestMethod.POST)
public ApiResultDto updateAssetResultList(@RequestBody List<CitAssetsList> citAssetsLists,
@RequestParam String projectId){
ApiResultDto apiResultDto = new ApiResultDto();
assetListService.updateAssetResultList(citAssetsLists,projectId);
apiResultDto.setCode(1);
apiResultDto.setMessage("资产修改成功");
return apiResultDto;
}
/** /**
* CIT资产文件导入 * CIT资产文件导入
* @return * @return
......
atms-api/src/main/java/pwc/taxtech/atms/dto/CitAssetsListDto.java
View file @ 23766b40
...@@ -401,6 +401,28 @@ public class CitAssetsListDto implements Serializable { ...@@ -401,6 +401,28 @@ public class CitAssetsListDto implements Serializable {
*/ */
private Date updateTime; private Date updateTime;
/**
* Database Column Remarks:
* 税会折旧大小比较结果；1表示税大，2表示会大
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column assets_list.tax_account_compare
*
* @mbg.generated
*/
private Integer taxAccountCompare;
/**
* Database Column Remarks:
* 税法分类，也是资产二级分类（asset_detail_group表中的detailGroupName）
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column assets_list.tax_group_name
*
* @mbg.generated
*/
private String taxGroupName;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table assets_list * This field corresponds to the database table assets_list
...@@ -1249,6 +1271,42 @@ public class CitAssetsListDto implements Serializable { ...@@ -1249,6 +1271,42 @@ public class CitAssetsListDto implements Serializable {
this.updateTime = updateTime; this.updateTime = updateTime;
} }
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column assets_list.tax_account_compare
*
* @param taxAccountCompare the value for assets_list.tax_account_compare
*
* @mbg.generated
*/
public void setTaxAccountCompare(Integer taxAccountCompare) {
this.taxAccountCompare = taxAccountCompare;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column assets_list.tax_group_name
*
* @return the value of assets_list.tax_group_name
*
* @mbg.generated
*/
public String getTaxGroupName() {
return taxGroupName;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column assets_list.tax_group_name
*
* @param taxGroupName the value for assets_list.tax_group_name
*
* @mbg.generated
*/
public void setTaxGroupName(String taxGroupName) {
this.taxGroupName = taxGroupName == null ? null : taxGroupName.trim();
}
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table assets_list * This method corresponds to the database table assets_list
...@@ -1296,6 +1354,8 @@ public class CitAssetsListDto implements Serializable { ...@@ -1296,6 +1354,8 @@ public class CitAssetsListDto implements Serializable {
sb.append(", assetType=").append(assetType); sb.append(", assetType=").append(assetType);
sb.append(", createTime=").append(createTime); sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime); sb.append(", updateTime=").append(updateTime);
sb.append(", taxAccountCompare=").append(taxAccountCompare);
sb.append(", taxGroupName=").append(taxGroupName);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AssetListServiceImpl.java
View file @ 23766b40
...@@ -16,6 +16,7 @@ import pwc.taxtech.atms.dao.CitAssetGroupResultMapper; ...@@ -16,6 +16,7 @@ import pwc.taxtech.atms.dao.CitAssetGroupResultMapper;
import pwc.taxtech.atms.dao.CitAssetsListMapper; import pwc.taxtech.atms.dao.CitAssetsListMapper;
import pwc.taxtech.atms.dto.*; import pwc.taxtech.atms.dto.*;
import pwc.taxtech.atms.entity.*; import pwc.taxtech.atms.entity.*;
import pwc.taxtech.atms.vat.entity.AssetsList;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
...@@ -61,12 +62,16 @@ public class AssetListServiceImpl extends BaseService { ...@@ -61,12 +62,16 @@ public class AssetListServiceImpl extends BaseService {
/** /**
* 根据资产类别（固定资产、长期待摊、无形资产）查询出结果 * 根据资产类别（固定资产、长期待摊、无形资产）查询出结果
*/ */
public List<CitAssetsListDto> getAssetResultList(Integer assetType) throws Exception { public List<CitAssetsListDto> getAssetResultList(Integer assetType, String projectId,Integer taxAccountCompare) throws Exception {
logger.debug("根据资产类别（固定资产、长期待摊、无形资产）查询出结果"); logger.debug("根据资产类别（固定资产、长期待摊、无形资产）查询出结果");
CitAssetsListExample assetListExample = new CitAssetsListExample(); CitAssetsListExample assetListExample = new CitAssetsListExample();
CitAssetsListExample.Criteria criteria = assetListExample.createCriteria(); CitAssetsListExample.Criteria criteria = assetListExample.createCriteria();
criteria.andProjectIdEqualTo(projectId);
criteria.andAssetTypeEqualTo(assetType); criteria.andAssetTypeEqualTo(assetType);
criteria.andStatusEqualTo(1); criteria.andStatusEqualTo(1);
if(taxAccountCompare != 2){
criteria.andTaxAccountCompareEqualTo(taxAccountCompare);
}
List<CitAssetsList> citAssetsLists = assetListMapper.selectByExample(assetListExample); List<CitAssetsList> citAssetsLists = assetListMapper.selectByExample(assetListExample);
List<CitAssetsListDto> citAssetsListDtos = new ArrayList<>(); List<CitAssetsListDto> citAssetsListDtos = new ArrayList<>();
for (CitAssetsList citAssetsList:citAssetsLists){ for (CitAssetsList citAssetsList:citAssetsLists){
...@@ -283,9 +288,10 @@ public class AssetListServiceImpl extends BaseService { ...@@ -283,9 +288,10 @@ public class AssetListServiceImpl extends BaseService {
.filter(groupResult -> groupResult.getAssetName().equals(citAsset.getAssetGroupName())).collect(Collectors.toList()); .filter(groupResult -> groupResult.getAssetName().equals(citAsset.getAssetGroupName())).collect(Collectors.toList());
//通过判断过滤后的集合来确认是否已经对该资产类别进行过分类 //通过判断过滤后的集合来确认是否已经对该资产类别进行过分类
if(groupResults != null && groupResults.size()>0){ if(groupResults != null && groupResults.size()>0){
Integer assetGroupType = selectAssetGroup(groupResults.get(0).getAssetGroupId()).getAssetGroupType(); AssetDetailGroup assetDetailGroup = selectAssetDetailGroup(groupResults.get(0).getAssetDetailGroupId());
// Integer assetGroupType = selectAssetDetailGroup(groupResults.get(0).getAssetDetailGroupId()).getAssetGroupType();
//进行税务的计算 //进行税务的计算
setCitAssetTaxData(citAsset,groupResults.get(0),assetGroupType); setCitAssetTaxData(citAsset,groupResults.get(0),assetDetailGroup);
}else{ }else{
//没有进行过分类，放入Set集合里面 //没有进行过分类，放入Set集合里面
assetNameSet.add(assetName); assetNameSet.add(assetName);
...@@ -357,10 +363,11 @@ public class AssetListServiceImpl extends BaseService { ...@@ -357,10 +363,11 @@ public class AssetListServiceImpl extends BaseService {
for (CitAssetGroupResult assetGroupResult : assetGroupResults) { for (CitAssetGroupResult assetGroupResult : assetGroupResults) {
//根据主键修改资产类别有关数据，主要修改的字段为资产一级分类主键、资产二级分类主键 //根据主键修改资产类别有关数据，主要修改的字段为资产一级分类主键、资产二级分类主键
assetGroupResultMapper.updateByPrimaryKeySelective(assetGroupResult); assetGroupResultMapper.updateByPrimaryKeySelective(assetGroupResult);
Integer assetGroupType = selectAssetGroup(assetGroupResult.getAssetGroupId()).getAssetGroupType(); AssetDetailGroup assetDetailGroup = selectAssetDetailGroup(assetGroupResult.getAssetDetailGroupId());
List<CitAssetsList> citAssetsLists = selectAssetsList(projectId, assetGroupResult.getAssetName()); // Integer assetGroupType = selectAssetGroup(assetGroupResult.getAssetGroupId()).getAssetGroupType();
List<CitAssetsList> citAssetsLists = selectAssetsList(projectId, assetGroupResult.getAssetName(),saveGroupType);
citAssetsLists.stream().forEach(citAsset -> { citAssetsLists.stream().forEach(citAsset -> {
setCitAssetTaxData(citAsset,assetGroupResult,assetGroupType); setCitAssetTaxData(citAsset,assetGroupResult,assetDetailGroup);
}); });
} }
...@@ -373,14 +380,18 @@ public class AssetListServiceImpl extends BaseService { ...@@ -373,14 +380,18 @@ public class AssetListServiceImpl extends BaseService {
return null; return null;
} }
/** /**
* 设置税务数据 * 设置税务数据
* @param citAsset * @param citAsset
* @param assetGroupResult * @param assetGroupResult
* @param assetGroupType * @param assetDetailGroup
*/ */
public void setCitAssetTaxData(CitAssetsList citAsset,CitAssetGroupResult assetGroupResult,Integer assetGroupType){ public void setCitAssetTaxData(CitAssetsList citAsset,CitAssetGroupResult assetGroupResult,AssetDetailGroup assetDetailGroup){
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
//设置税法分类
citAsset.setTaxGroupName(assetDetailGroup.getDetailGroupName());
Integer assetGroupType = assetDetailGroup.getAssetGroupType();
//获取税务折旧期限,此值根据分类查数据库带出的值不在此进行操作 //获取税务折旧期限,此值根据分类查数据库带出的值不在此进行操作
citAsset.setTaxDepreciationPeriod(assetGroupResult.getTaxDepreciationPeriod()); citAsset.setTaxDepreciationPeriod(assetGroupResult.getTaxDepreciationPeriod());
//获取截止去年累计折旧期间,此值根据分类查数据库带出的值不在此进行操作 //获取截止去年累计折旧期间,此值根据分类查数据库带出的值不在此进行操作
...@@ -413,14 +424,23 @@ public class AssetListServiceImpl extends BaseService { ...@@ -413,14 +424,23 @@ public class AssetListServiceImpl extends BaseService {
citAsset.setYearDifferenceAmount(citAsset.getTaxCurrentYearDepreciationAmount().subtract(citAsset.getAccountYearDepreciationAmount())); citAsset.setYearDifferenceAmount(citAsset.getTaxCurrentYearDepreciationAmount().subtract(citAsset.getAccountYearDepreciationAmount()));
//获取保留差异 //获取保留差异
citAsset.setIsRetain(1); citAsset.setIsRetain(1);
//获取资产一级分类 //获取资产一级分类的类型
citAsset.setAssetType(assetGroupType); citAsset.setAssetType(assetGroupType);
//设置税会比较值
citAsset.setTaxAccountCompare(citAsset.getTaxCurrentYearDepreciationAmount().compareTo(citAsset.getAccountYearDepreciationAmount())==1?1:0);
//更改资产状态，已进行分类并有效 //更改资产状态，已进行分类并有效
citAsset.setStatus(1); citAsset.setStatus(1);
//根据主键修改资产清单数据 //根据主键修改资产清单数据
assetListMapper.updateByPrimaryKeySelective(citAsset); assetListMapper.updateByPrimaryKeySelective(citAsset);
} }
public ApiResultDto updateAssetResultList(List<CitAssetsList> assetsLists, String projectId){
for(CitAssetsList citAsset:assetsLists){
assetListMapper.updateByPrimaryKeySelective(citAsset);
}
return null;
}
/** /**
* 获取符合条件(projectId、未进行分类)的资产清单数据 * 获取符合条件(projectId、未进行分类)的资产清单数据
* @param projectId * @param projectId
...@@ -440,12 +460,16 @@ public class AssetListServiceImpl extends BaseService { ...@@ -440,12 +460,16 @@ public class AssetListServiceImpl extends BaseService {
* @param assetName * @param assetName
* @return * @return
*/ */
private List<CitAssetsList> selectAssetsList(String projectId, String assetName) { private List<CitAssetsList> selectAssetsList(String projectId, String assetName, Integer saveGroupType) {
CitAssetsListExample assetListExample = new CitAssetsListExample(); CitAssetsListExample assetListExample = new CitAssetsListExample();
CitAssetsListExample.Criteria criteria = assetListExample.createCriteria(); CitAssetsListExample.Criteria criteria = assetListExample.createCriteria();
criteria.andProjectIdEqualTo(projectId); criteria.andProjectIdEqualTo(projectId);
//0表示未进行分类的数据 //0表示未进行分类的数据
criteria.andStatusEqualTo(0); //当 saveGroupType为1时证明是初次导入进来时的数据需要进行状态的判断，当为其他或者为2时需要查询全部状态的数据
if(saveGroupType == 1){
criteria.andStatusEqualTo(0);
}
criteria.andAssetGroupNameEqualTo(assetName); criteria.andAssetGroupNameEqualTo(assetName);
return assetListMapper.selectByExample(assetListExample); return assetListMapper.selectByExample(assetListExample);
} }
...@@ -460,4 +484,8 @@ public class AssetListServiceImpl extends BaseService { ...@@ -460,4 +484,8 @@ public class AssetListServiceImpl extends BaseService {
AssetGroupExample.Criteria criteria = assetGroupExample.createCriteria(); AssetGroupExample.Criteria criteria = assetGroupExample.createCriteria();
return assetGroupMapper.selectByPrimaryKey(id); return assetGroupMapper.selectByPrimaryKey(id);
} }
private AssetDetailGroup selectAssetDetailGroup(Long id) {
return assetDetailGroupMapper.selectByPrimaryKey(id);
}
} }
atms-dao/src/main/java/pwc/taxtech/atms/dao/CitAssetGroupResultMapper.java
View file @ 23766b40
...@@ -105,5 +105,4 @@ public interface CitAssetGroupResultMapper extends MyMapper { ...@@ -105,5 +105,4 @@ public interface CitAssetGroupResultMapper extends MyMapper {
* @mbg.generated * @mbg.generated
*/ */
int updateByPrimaryKey(CitAssetGroupResult record); int updateByPrimaryKey(CitAssetGroupResult record);
} }
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/entity/CitAssetsList.java
View file @ 23766b40
...@@ -395,6 +395,28 @@ public class CitAssetsList extends BaseEntity implements Serializable { ...@@ -395,6 +395,28 @@ public class CitAssetsList extends BaseEntity implements Serializable {
*/ */
private Date updateTime; private Date updateTime;
/**
* Database Column Remarks:
* 税会折旧大小比较结果；1表示税大，2表示会大
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column assets_list.tax_account_compare
*
* @mbg.generated
*/
private Integer taxAccountCompare;
/**
* Database Column Remarks:
* 税法分类，也是资产二级分类（asset_detail_group表中的detailGroupName）
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column assets_list.tax_group_name
*
* @mbg.generated
*/
private String taxGroupName;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table assets_list * This field corresponds to the database table assets_list
...@@ -1243,6 +1265,54 @@ public class CitAssetsList extends BaseEntity implements Serializable { ...@@ -1243,6 +1265,54 @@ public class CitAssetsList extends BaseEntity implements Serializable {
this.updateTime = updateTime; this.updateTime = updateTime;
} }
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column assets_list.tax_account_compare
*
* @return the value of assets_list.tax_account_compare
*
* @mbg.generated
*/
public Integer getTaxAccountCompare() {
return taxAccountCompare;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column assets_list.tax_account_compare
*
* @param taxAccountCompare the value for assets_list.tax_account_compare
*
* @mbg.generated
*/
public void setTaxAccountCompare(Integer taxAccountCompare) {
this.taxAccountCompare = taxAccountCompare;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column assets_list.tax_group_name
*
* @return the value of assets_list.tax_group_name
*
* @mbg.generated
*/
public String getTaxGroupName() {
return taxGroupName;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column assets_list.tax_group_name
*
* @param taxGroupName the value for assets_list.tax_group_name
*
* @mbg.generated
*/
public void setTaxGroupName(String taxGroupName) {
this.taxGroupName = taxGroupName == null ? null : taxGroupName.trim();
}
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table assets_list * This method corresponds to the database table assets_list
...@@ -1290,6 +1360,8 @@ public class CitAssetsList extends BaseEntity implements Serializable { ...@@ -1290,6 +1360,8 @@ public class CitAssetsList extends BaseEntity implements Serializable {
sb.append(", assetType=").append(assetType); sb.append(", assetType=").append(assetType);
sb.append(", createTime=").append(createTime); sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime); sb.append(", updateTime=").append(updateTime);
sb.append(", taxAccountCompare=").append(taxAccountCompare);
sb.append(", taxGroupName=").append(taxGroupName);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/CitAssetsListExample.java
View file @ 23766b40
...@@ -2335,6 +2335,136 @@ public class CitAssetsListExample { ...@@ -2335,6 +2335,136 @@ public class CitAssetsListExample {
addCriterion("update_time not between", value1, value2, "updateTime"); addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTaxAccountCompareIsNull() {
addCriterion("tax_account_compare is null");
return (Criteria) this;
}
public Criteria andTaxAccountCompareIsNotNull() {
addCriterion("tax_account_compare is not null");
return (Criteria) this;
}
public Criteria andTaxAccountCompareEqualTo(Integer value) {
addCriterion("tax_account_compare =", value, "taxAccountCompare");
return (Criteria) this;
}
public Criteria andTaxAccountCompareNotEqualTo(Integer value) {
addCriterion("tax_account_compare <>", value, "taxAccountCompare");
return (Criteria) this;
}
public Criteria andTaxAccountCompareGreaterThan(Integer value) {
addCriterion("tax_account_compare >", value, "taxAccountCompare");
return (Criteria) this;
}
public Criteria andTaxAccountCompareGreaterThanOrEqualTo(Integer value) {
addCriterion("tax_account_compare >=", value, "taxAccountCompare");
return (Criteria) this;
}
public Criteria andTaxAccountCompareLessThan(Integer value) {
addCriterion("tax_account_compare <", value, "taxAccountCompare");
return (Criteria) this;
}
public Criteria andTaxAccountCompareLessThanOrEqualTo(Integer value) {
addCriterion("tax_account_compare <=", value, "taxAccountCompare");
return (Criteria) this;
}
public Criteria andTaxAccountCompareIn(List<Integer> values) {
addCriterion("tax_account_compare in", values, "taxAccountCompare");
return (Criteria) this;
}
public Criteria andTaxAccountCompareNotIn(List<Integer> values) {
addCriterion("tax_account_compare not in", values, "taxAccountCompare");
return (Criteria) this;
}
public Criteria andTaxAccountCompareBetween(Integer value1, Integer value2) {
addCriterion("tax_account_compare between", value1, value2, "taxAccountCompare");
return (Criteria) this;
}
public Criteria andTaxAccountCompareNotBetween(Integer value1, Integer value2) {
addCriterion("tax_account_compare not between", value1, value2, "taxAccountCompare");
return (Criteria) this;
}
public Criteria andTaxGroupNameIsNull() {
addCriterion("tax_group_name is null");
return (Criteria) this;
}
public Criteria andTaxGroupNameIsNotNull() {
addCriterion("tax_group_name is not null");
return (Criteria) this;
}
public Criteria andTaxGroupNameEqualTo(String value) {
addCriterion("tax_group_name =", value, "taxGroupName");
return (Criteria) this;
}
public Criteria andTaxGroupNameNotEqualTo(String value) {
addCriterion("tax_group_name <>", value, "taxGroupName");
return (Criteria) this;
}
public Criteria andTaxGroupNameGreaterThan(String value) {
addCriterion("tax_group_name >", value, "taxGroupName");
return (Criteria) this;
}
public Criteria andTaxGroupNameGreaterThanOrEqualTo(String value) {
addCriterion("tax_group_name >=", value, "taxGroupName");
return (Criteria) this;
}
public Criteria andTaxGroupNameLessThan(String value) {
addCriterion("tax_group_name <", value, "taxGroupName");
return (Criteria) this;
}
public Criteria andTaxGroupNameLessThanOrEqualTo(String value) {
addCriterion("tax_group_name <=", value, "taxGroupName");
return (Criteria) this;
}
public Criteria andTaxGroupNameLike(String value) {
addCriterion("tax_group_name like", value, "taxGroupName");
return (Criteria) this;
}
public Criteria andTaxGroupNameNotLike(String value) {
addCriterion("tax_group_name not like", value, "taxGroupName");
return (Criteria) this;
}
public Criteria andTaxGroupNameIn(List<String> values) {
addCriterion("tax_group_name in", values, "taxGroupName");
return (Criteria) this;
}
public Criteria andTaxGroupNameNotIn(List<String> values) {
addCriterion("tax_group_name not in", values, "taxGroupName");
return (Criteria) this;
}
public Criteria andTaxGroupNameBetween(String value1, String value2) {
addCriterion("tax_group_name between", value1, value2, "taxGroupName");
return (Criteria) this;
}
public Criteria andTaxGroupNameNotBetween(String value1, String value2) {
addCriterion("tax_group_name not between", value1, value2, "taxGroupName");
return (Criteria) this;
}
} }
/** /**
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/CitAssetsListMapper.xml
View file @ 23766b40
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
<result column="asset_type" jdbcType="INTEGER" property="assetType" /> <result column="asset_type" jdbcType="INTEGER" property="assetType" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="tax_account_compare" jdbcType="INTEGER" property="taxAccountCompare" />
<result column="tax_group_name" jdbcType="VARCHAR" property="taxGroupName" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -120,7 +122,8 @@ ...@@ -120,7 +122,8 @@
account_total_depreciation_amount, tax_depreciation_period, tax_to_last_year_depreciation_period, account_total_depreciation_amount, tax_depreciation_period, tax_to_last_year_depreciation_period,
tax_to_current_year_depreciation_period, tax_year_depreciation_period, tax_month_depreciation_amount, tax_to_current_year_depreciation_period, tax_year_depreciation_period, tax_month_depreciation_amount,
tax_to_current_year_depreciation_amount, tax_current_year_depreciation_amount, total_difference_amount, tax_to_current_year_depreciation_amount, tax_current_year_depreciation_amount, total_difference_amount,
year_difference_amount, is_retain, asset_type, create_time, update_time year_difference_amount, is_retain, asset_type, create_time, update_time, tax_account_compare,
tax_group_name
</sql> </sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.entity.CitAssetsListExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.CitAssetsListExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -186,7 +189,8 @@ ...@@ -186,7 +189,8 @@
tax_month_depreciation_amount, tax_to_current_year_depreciation_amount, tax_month_depreciation_amount, tax_to_current_year_depreciation_amount,
tax_current_year_depreciation_amount, total_difference_amount, tax_current_year_depreciation_amount, total_difference_amount,
year_difference_amount, is_retain, asset_type, year_difference_amount, is_retain, asset_type,
create_time, update_time) create_time, update_time, tax_account_compare,
tax_group_name)
values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER}, values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER},
#{assetNumber,jdbcType=VARCHAR}, #{assetGroupName,jdbcType=VARCHAR}, #{assetDetailGroupId,jdbcType=BIGINT}, #{assetNumber,jdbcType=VARCHAR}, #{assetGroupName,jdbcType=VARCHAR}, #{assetDetailGroupId,jdbcType=BIGINT},
#{assetDescription,jdbcType=VARCHAR}, #{buyDate,jdbcType=TIMESTAMP}, #{depreciationDate,jdbcType=TIMESTAMP}, #{assetDescription,jdbcType=VARCHAR}, #{buyDate,jdbcType=TIMESTAMP}, #{depreciationDate,jdbcType=TIMESTAMP},
...@@ -200,7 +204,8 @@ ...@@ -200,7 +204,8 @@
#{taxMonthDepreciationAmount,jdbcType=DECIMAL}, #{taxToCurrentYearDepreciationAmount,jdbcType=DECIMAL}, #{taxMonthDepreciationAmount,jdbcType=DECIMAL}, #{taxToCurrentYearDepreciationAmount,jdbcType=DECIMAL},
#{taxCurrentYearDepreciationAmount,jdbcType=DECIMAL}, #{totalDifferenceAmount,jdbcType=DECIMAL}, #{taxCurrentYearDepreciationAmount,jdbcType=DECIMAL}, #{totalDifferenceAmount,jdbcType=DECIMAL},
#{yearDifferenceAmount,jdbcType=DECIMAL}, #{isRetain,jdbcType=INTEGER}, #{assetType,jdbcType=INTEGER}, #{yearDifferenceAmount,jdbcType=DECIMAL}, #{isRetain,jdbcType=INTEGER}, #{assetType,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{taxAccountCompare,jdbcType=INTEGER},
#{taxGroupName,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.CitAssetsList"> <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.CitAssetsList">
<!-- <!--
...@@ -314,6 +319,12 @@ ...@@ -314,6 +319,12 @@
<if test="updateTime != null"> <if test="updateTime != null">
update_time, update_time,
</if> </if>
<if test="taxAccountCompare != null">
tax_account_compare,
</if>
<if test="taxGroupName != null">
tax_group_name,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -421,6 +432,12 @@ ...@@ -421,6 +432,12 @@
<if test="updateTime != null"> <if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="taxAccountCompare != null">
#{taxAccountCompare,jdbcType=INTEGER},
</if>
<if test="taxGroupName != null">
#{taxGroupName,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.entity.CitAssetsListExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="pwc.taxtech.atms.entity.CitAssetsListExample" resultType="java.lang.Long">
...@@ -545,6 +562,12 @@ ...@@ -545,6 +562,12 @@
<if test="record.updateTime != null"> <if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP}, update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="record.taxAccountCompare != null">
tax_account_compare = #{record.taxAccountCompare,jdbcType=INTEGER},
</if>
<if test="record.taxGroupName != null">
tax_group_name = #{record.taxGroupName,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -590,7 +613,9 @@ ...@@ -590,7 +613,9 @@
is_retain = #{record.isRetain,jdbcType=INTEGER}, is_retain = #{record.isRetain,jdbcType=INTEGER},
asset_type = #{record.assetType,jdbcType=INTEGER}, asset_type = #{record.assetType,jdbcType=INTEGER},
create_time = #{record.createTime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP} update_time = #{record.updateTime,jdbcType=TIMESTAMP},
tax_account_compare = #{record.taxAccountCompare,jdbcType=INTEGER},
tax_group_name = #{record.taxGroupName,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -704,6 +729,12 @@ ...@@ -704,6 +729,12 @@
<if test="updateTime != null"> <if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="taxAccountCompare != null">
tax_account_compare = #{taxAccountCompare,jdbcType=INTEGER},
</if>
<if test="taxGroupName != null">
tax_group_name = #{taxGroupName,jdbcType=VARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
...@@ -746,7 +777,9 @@ ...@@ -746,7 +777,9 @@
is_retain = #{isRetain,jdbcType=INTEGER}, is_retain = #{isRetain,jdbcType=INTEGER},
asset_type = #{assetType,jdbcType=INTEGER}, asset_type = #{assetType,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP} update_time = #{updateTime,jdbcType=TIMESTAMP},
tax_account_compare = #{taxAccountCompare,jdbcType=INTEGER},
tax_group_name = #{taxGroupName,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.entity.CitAssetsListExample" resultMap="BaseResultMap"> <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.entity.CitAssetsListExample" resultMap="BaseResultMap">
......
atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json
View file @ 23766b40
{ {
"@HowToUse": "在提交前，使用PWC.sortJson()对json内容进行排序", "@HowToUse": "在提交前，使用PWC.sortJson()对json内容进行排序",
"1stQuarterlyCITFilingReturn": "1st Quarterly CIT Filing Return", "1stQuarterlyCITFilingReturn": "1st Quarterly CIT Filing Return",
"2ndQuarterlyCITFilingReturn": "2nd Quarterly CIT Filing Return", "2ndQuarterlyCITFilingReturn": "2nd Quarterly CIT Filing Return",
"3rdQuarterlyCITFilingReturn": "3rd Quarterly CIT Filing Return", "3rdQuarterlyCITFilingReturn": "3rd Quarterly CIT Filing Return",
"4thQuarterlyCITFilingReturn": "4th Quarterly CIT Filing Return", "4thQuarterlyCITFilingReturn": "4th Quarterly CIT Filing Return",
"AllTask": "All", "AllTask": "All",
"AnnualCITFilingReturn": "Annual CIT Filing Return", "AnnualCITFilingReturn": "Annual CIT Filing Return",
"AnnualCITFilingWorkingPaper": "Annual CIT Filing Working Paper", "AnnualCITFilingWorkingPaper": "Annual CIT Filing Working Paper",
"AuditFeedback": "Tax audit feedback", "AuditFeedback": "Tax audit feedback",
"AuditImplementation": "Tax audit implementation", "AuditImplementation": "Tax audit implementation",
"AuditNotice": "Tax audit notice", "AuditNotice": "Tax audit notice",
"AuditReport": "Audit report", "AuditReport": "Audit report",
"AuditSolution": "Tax audit solution", "AuditSolution": "Tax audit solution",
"BNDKJTXE": "Amortization in current year:", "BNDKJTXE": "Amortization in current year:",
"BS": "Balance sheet", "BS": "Balance sheet",
"BankGroup": "Certificate of bank and group", "BankGroup": "Certificate of bank and group",
"Cancellation": "Establishment, liquidation and cancellation of branches", "Cancellation": "Establishment, liquidation and cancellation of branches",
"CompleteTask": "Completed", "CompleteTask": "Completed",
"CreateTask": "Create Task", "CreateTask": "Create Task",
"CreditRecord": "Tax credit record", "CreditRecord": "Tax credit record",
"DFFSETotal": "Total Credit Amt:", "DFFSETotal": "Total Credit Amt:",
"DFJETotal": "Total Credit Amt:", "DFJETotal": "Total Credit Amt:",
"DataProcessDataName_AnnualSettlement": "Annual CIT Filing Return", "DataProcessDataName_AnnualSettlement": "Annual CIT Filing Return",
"DataProcessDataName_CITFirstQuarterly": "1st Quarter", "DataProcessDataName_CITFirstQuarterly": "1st Quarter",
"DataProcessDataName_CITForthQuarterly": "4th Quarter", "DataProcessDataName_CITForthQuarterly": "4th Quarter",
"DataProcessDataName_CITQuarterly": "Quarterly CIT Filing Return", "DataProcessDataName_CITQuarterly": "Quarterly CIT Filing Return",
"DataProcessDataName_CITSecondQuarterly": "2nd Quarter", "DataProcessDataName_CITSecondQuarterly": "2nd Quarter",
"DataProcessDataName_CITThirdQuarterly": "3rd Quarter", "DataProcessDataName_CITThirdQuarterly": "3rd Quarter",
"DataProcessDataName_UpdateReportConfig": "Update Report Configuration", "DataProcessDataName_UpdateReportConfig": "Update Report Configuration",
"DataProcessDataName_FinanceReport": "Financial Report", "DataProcessDataName_FinanceReport": "Financial Report",
"DataProcessDataName_GenerateReport": "Generate Report", "DataProcessDataName_GenerateReport": "Generate Report",
"DataProcessDataName_ModelAnalysis": "Model Analytics", "DataProcessDataName_ModelAnalysis": "Model Analytics",
"DataProcessDataName_UpdateTB": "Update Trial Balance", "DataProcessDataName_UpdateTB": "Update Trial Balance",
"DataProcessDataName_YearWorkPaper": "Annual CIT Filing Working Paper", "DataProcessDataName_YearWorkPaper": "Annual CIT Filing Working Paper",
"DataProcessData_Generate": "Generate", "DataProcessData_Generate": "Generate",
"DataProcessData_PreGenerate": "Generate", "DataProcessData_PreGenerate": "Generate",
"DataProcessData_Update": "Update", "DataProcessData_Update": "Update",
"DepreciationCurrentYearTotal": "Total Depreciation", "DepreciationCurrentYearTotal": "Total Depreciation",
"DepreciationPerTaxCurrentYearTotal": "Total Tax Depreciation", "DepreciationPerTaxCurrentYearTotal": "Total Tax Depreciation",
"DividendReturn": "Dividend return", "DividendReturn": "Dividend return",
"DueDate": "Due Date", "DueDate": "Due Date",
"FinancialReport": "Financial Report", "FinancialReport": "Financial Report",
"InprogressTask": "In Progress", "InprogressTask": "In Progress",
"JFFSETotal": "Total Debit Amt:", "JFFSETotal": "Total Debit Amt:",
"JFJETotal": "Total Debit Amt:", "JFJETotal": "Total Debit Amt:",
"NeedToUpdate": "Need to update", "NeedToUpdate": "Need to update",
"NotBeginTask": "Not Started", "NotBeginTask": "Not Started",
"OtherRecordFiling": "Other record filing", "OtherRecordFiling": "Other record filing",
"OutDateTask": "Overdue", "OutDateTask": "Overdue",
"OutOfDateTask": "Overdue", "OutOfDateTask": "Overdue",
"PL": "Profit and Loss statement", "PL": "Profit and Loss statement",
"PZCITCount": "Total Records:", "PZCITCount": "Total Records:",
"Planning": "Tax planning", "Planning": "Tax planning",
"PleaseSelectAtLeastOneItem": "Please select at least one item!", "PleaseSelectAtLeastOneItem": "Please select at least one item!",
"ProfitAndLossStatement": "Profit and Loss statement", "ProfitAndLossStatement": "Profit and Loss statement",
"QCYETotal": "Total Begin Balance:", "QCYETotal": "Total Begin Balance:",
"QMYETotal": "Total End Balance:", "QMYETotal": "Total End Balance:",
"QNDKJZJE": "Depreciation last year:", "QNDKJZJE": "Depreciation last year:",
"QuarterlyCITFilingReturn": "Quarterly CIT Filing Return", "QuarterlyCITFilingReturn": "Quarterly CIT Filing Return",
"RecordFiling": "Record filing of tax deduction on asset loss", "RecordFiling": "Record filing of tax deduction on asset loss",
"SpecialTasks": "Special tax tasks", "SpecialTasks": "Special tax tasks",
"TBDataNum": "Total Records:", "TBDataNum": "Total Records:",
"TaskDescription": "Description", "TaskDescription": "Description",
"TaskEntity": "Entity", "TaskEntity": "Entity",
"TaskName": "Task Name", "TaskName": "Task Name",
"TaxInspection": "Tax inspection", "TaxInspection": "Tax inspection",
"TaxStatistics": "Investigation and statistics from tax bureau", "TaxStatistics": "Investigation and statistics from tax bureau",
"TaxTaskManage": "Tax Task Management", "TaxTaskManage": "Tax Task Management",
"TaxTaskType": "Task Type", "TaxTaskType": "Task Type",
"ThisWeek": "This Week", "ThisWeek": "This Week",
"Today": "Today", "Today": "Today",
"WaitCompleteTask": "In Progress", "WaitCompleteTask": "In Progress",
"dateFormat4YearMonthDay": "yyyy-mm-dd", "dateFormat4YearMonthDay": "yyyy-mm-dd",
"noData": "No Data", "noData": "No Data",
"toUpdate": "To be updated", "toUpdate": "To be updated",
"~MustBeEndOneApp": "I Must be the End One, please!" "~MustBeEndOneApp": "I Must be the End One, please!",
"TaxAccountDifference": "税会差异",
"TaxGreaterAccount": "会计折旧&lt;=税务折旧",
"TaxLessAccount": "会计折旧&gt;税务折旧"
} }
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ 23766b40
...@@ -81,6 +81,9 @@ ...@@ -81,6 +81,9 @@
"TaxGroupType": "税法分类", "TaxGroupType": "税法分类",
"TaxToLastYearDepreciationPeriod": "截止去年累计折旧期间", "TaxToLastYearDepreciationPeriod": "截止去年累计折旧期间",
"TaxToCurrentYearDepreciationPeriod": "截止本年累计折旧期间", "TaxToCurrentYearDepreciationPeriod": "截止本年累计折旧期间",
"TaxAccountDifference": "税会差异",
"TaxGreaterAccount": "会计折旧&lt;=税务折旧",
"TaxLessAccount": "会计折旧&gt;税务折旧",
"BuyDateType": "日期错误", "BuyDateType": "日期错误",
"AssetNumberType": "资产编号错误", "AssetNumberType": "资产编号错误",
"AssetGroupNameType": "资产类别错误", "AssetGroupNameType": "资产类别错误",
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js
View file @ 23766b40
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
'use strict'; 'use strict';
var projectId = vatSessionService.project.id; var projectId = vatSessionService.project.id;
var taxAccountCompare = 2;
var successCount = 0; var successCount = 0;
var uploadUrl = apiInterceptor.webApiHostUrl + '/asset/assetsImport'; var uploadUrl = apiInterceptor.webApiHostUrl + '/asset/assetsImport';
var webHost = loginContext.apiHost; var webHost = loginContext.apiHost;
...@@ -676,7 +677,7 @@ ...@@ -676,7 +677,7 @@
$scope.TotalAccountYearDepreciationAmount = 0; $scope.TotalAccountYearDepreciationAmount = 0;
$scope.TotalTaxCurrentYearDepreciationAmount = 0; $scope.TotalTaxCurrentYearDepreciationAmount = 0;
$scope.TotalYearDifferenceAmount = 0 $scope.TotalYearDifferenceAmount = 0
assetListService.getAssetResultList(assetType).success(function (assetListData) { assetListService.getAssetResultList(assetType,projectId,taxAccountCompare).success(function (assetListData) {
debugger; debugger;
var data = assetListData.data; var data = assetListData.data;
if (data) { if (data) {
...@@ -758,7 +759,7 @@ ...@@ -758,7 +759,7 @@
} }
} }
//初始化编辑dataGrid //初始化编辑d资产分类（asset_group_result）ataGrid
var InitGrid = function (showAdd) { var InitGrid = function (showAdd) {
$scope.assetsGridOptions = { $scope.assetsGridOptions = {
bindingOptions: { bindingOptions: {
...@@ -927,10 +928,6 @@ ...@@ -927,10 +928,6 @@
{ {
caption: $translate.instant('IsRetain'), alignment: 'center', dataField: "isRetain", dataType: "boolean", width: 120, allowEditing: true caption: $translate.instant('IsRetain'), alignment: 'center', dataField: "isRetain", dataType: "boolean", width: 120, allowEditing: true
}, },
{
caption: $translate.instant('IsRetain'), alignment: 'center', dataField: "isRetain", dataType: "boolean", width: 120, allowEditing: true
},
]; ];
$scope.assetsResultGridOptions = { $scope.assetsResultGridOptions = {
...@@ -962,6 +959,13 @@ ...@@ -962,6 +959,13 @@
e.cellElement.addClass('herder-center'); e.cellElement.addClass('herder-center');
e.cellElement.append($compile(inputElement)($scope)); e.cellElement.append($compile(inputElement)($scope));
} }
if(e.column.caption === $translate.instant('IsRetain'))
{
e.cellElement.empty();
var inputElement = $('<input type="checkbox" ng-model="SelectAll" ng-click="selectAllAsset()">保留差异</input>');
e.cellElement.addClass('herder-center');
e.cellElement.append($compile(inputElement)($scope));
}
} }
}, },
loadPanel: { loadPanel: {
...@@ -1001,7 +1005,7 @@ ...@@ -1001,7 +1005,7 @@
var defaultFun = savebutton.options.onClick; var defaultFun = savebutton.options.onClick;
var saveAsset = function () { var saveAsset = function () {
defaultFun(); defaultFun();
assetListService.updateAssetResultList(targetArray).success(function (data) { assetListService.updateAssetResultList(targetArray,projectId).success(function (data) {
if (data) { if (data) {
getAssetResultList($scope.displayType - 1); getAssetResultList($scope.displayType - 1);
SweetAlert.success($translate.instant('SaveSuccess')); SweetAlert.success($translate.instant('SaveSuccess'));
...@@ -1021,6 +1025,29 @@ ...@@ -1021,6 +1025,29 @@
} }
} }
} }
//税会差异选项内容
$scope.applyFilterTypes = [{
key: "2",
name: $translate.instant('AllTheItems')
}, {
key: "0",
name: $translate.instant('TaxLessAccount')
}, {
key: "1",
name: $translate.instant('TaxGreaterAccount')
}];
//初始化税会差异选项
$scope.taxAccountDifferenceOptions = {
items: $scope.applyFilterTypes,
value: $scope.applyFilterTypes[0].key,
valueExpr: "key",
displayExpr: "name",
onValueChanged: function(data) {
debugger;
taxAccountCompare = data.value;
getAssetResultList($scope.displayType - 1);
}
};
//获取数据服务 //获取数据服务
var getGroupList = function () { var getGroupList = function () {
...@@ -1231,7 +1258,7 @@ ...@@ -1231,7 +1258,7 @@
} }
}; };
//弹出分类界面 //弹出分类界面，1、先获取asset_group_result表中的数据，并赋值给数据集assetGroupResultDataSource
$scope.setAssetsGroup = function () { $scope.setAssetsGroup = function () {
assetListService.getAssetGroupResultData(projectId).success(function (groupResultData) { assetListService.getAssetGroupResultData(projectId).success(function (groupResultData) {
var data = groupResultData.data; var data = groupResultData.data;
...@@ -1243,7 +1270,9 @@ ...@@ -1243,7 +1270,9 @@
//orgAssetGroupList = angular.copy(data); //orgAssetGroupList = angular.copy(data);
$scope.assetGroupResultDataSource = data; $scope.assetGroupResultDataSource = data;
} }
//初始化资产分类Grid
InitGrid(true); InitGrid(true);
//此值传入后台用来分辨当前是导入文件时的保存资产分类或者是直接点击资产分类按钮保存资产分类
$scope.saveGroupType = 2; $scope.saveGroupType = 2;
$scope.isDisabled = false; $scope.isDisabled = false;
$scope.modalInstance = $uibModal.open({ $scope.modalInstance = $uibModal.open({
...@@ -1375,7 +1404,7 @@ ...@@ -1375,7 +1404,7 @@
initColumns(); initColumns();
initDxGrid(); initDxGrid();
initAssetResultDxGrid(); initAssetResultDxGrid();
getAssetResultList(1); getAssetResultList(1);
// initDataFromDB(); // initDataFromDB();
getGroupList(); getGroupList();
getGroupDetailList(); getGroupDetailList();
......
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.html
View file @ 23766b40
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
<div class="nav-header">{{'AssetList' | translate}}</div> <div class="nav-header">{{'AssetList' | translate}}</div>
<div class="nav-tab"> <div class="nav-tab">
<span ng-click="switchTab($event,1)">{{'AssetListImport' | translate}}</span>&nbsp;&nbsp; <span ng-click="switchTab($event,1)">{{'AssetListImport' | translate}}</span>&nbsp;&nbsp;
<span class="active" ng-click="switchTab($event,2)">{{'FixedAssets' | translate}}</span><span ng-click="switchTab($event,3)">{{'LongTermPrepaid' | translate}}</span><span ng-click="switchTab($event,4)">{{'InvisibleAssets' | translate}}</span> <span class="active" ng-click="switchTab($event,2)">{{'FixedAssets' | translate}}</span><span
ng-click="switchTab($event,3)">{{'LongTermPrepaid' | translate}}</span><span
ng-click="switchTab($event,4)">{{'InvisibleAssets' | translate}}</span>
</div> </div>
</div> </div>
...@@ -17,111 +19,118 @@ ...@@ -17,111 +19,118 @@
</div> </div>
<form class="form-inline"> <form class="form-inline">
<!--<div class="form-group" ng-style="setButtonWrapStyle()">--> <!--<div class="form-group" ng-style="setButtonWrapStyle()">-->
<!--<div class="import-wrapper">--> <!--<div class="import-wrapper">-->
<!--<button type="button" ng-show="hasEditPermission" --> <!--<button type="button" ng-show="hasEditPermission" -->
<!--ngf-select="" ng-model="fileNameWrapper" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx,.xlsm"--> <!--ngf-select="" ng-model="fileNameWrapper" ngf-drag-over-class="'dragover'" accept=".xls,.xlsx,.xlsm"-->
<!--ngf-multiple="false" ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px">--> <!--ngf-multiple="false" ngf-allow-dir="false" class="btn btn-vat-third" style="margin-right:10px">-->
<!--{{'SelectFile' | translate}}--> <!--{{'SelectFile' | translate}}-->
<!--</button>--> <!--</button>-->
<!--<div class="import-info-wrapper" ng-show="fileName">--> <!--<div class="import-info-wrapper" ng-show="fileName">-->
<!--<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>&nbsp;&nbsp;&nbsp;&nbsp;|--> <!--<span title="{{fileName}}">{{'FileName' | translate}}{{fileName | limitString:10}}</span>&nbsp;&nbsp;&nbsp;&nbsp;|-->
<!--<span translate="WorkSheet"></span>--> <!--<span translate="WorkSheet"></span>-->
<!--<div class="ui-select-no-border">--> <!--<div class="ui-select-no-border">-->
<!--<ui-select ng-model="sheetInfo.selectedSheetName" on-select="changeSheet($item)" search-enabled="false" style="width:120px;">--> <!--<ui-select ng-model="sheetInfo.selectedSheetName" on-select="changeSheet($item)" search-enabled="false" style="width:120px;">-->
<!--<ui-select-match placeholder="{{'SelectASheet' | translate}}">{{$select.selected.name}}</ui-select-match>--> <!--<ui-select-match placeholder="{{'SelectASheet' | translate}}">{{$select.selected.name}}</ui-select-match>-->
<!--<ui-select-choices repeat="sheetName in sheetData.sheetNameList | propsFilter: {name: $select.search}">--> <!--<ui-select-choices repeat="sheetName in sheetData.sheetNameList | propsFilter: {name: $select.search}">-->
<!--<div title="{{sheetName.name}}" ng-bind-html="sheetName.name | limitString:9"></div>--> <!--<div title="{{sheetName.name}}" ng-bind-html="sheetName.name | limitString:9"></div>-->
<!--</ui-select-choices>--> <!--</ui-select-choices>-->
<!--</ui-select>--> <!--</ui-select>-->
<!--</div>-->
<!--&nbsp;&nbsp;&nbsp;&nbsp;|-->
<!--<span translate="StartRowNum"></span>-->
<!--<input id="StartRowNum" ng-model="StartRowNum" type="text"-->
<!--onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"-->
<!--onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" />-->
<!--</div>-->
<!--<button class="btn btn-vat-primary" style="float:right; margin-right: 10px;" ng-if="isShowImportTotalBtn && hasEditPermission" translate="ImportBtn" ng-click="importData(importEnum.Import)"></button>-->
<!--<div class="btn-wrapper" ng-if="!isShowImportTotalBtn && hasEditPermission">-->
<!--<button class="btn btn-vat-primary" translate="ConverImportBtn" ng-click="importData(importEnum.CoverImport)"></button>|<button class="btn btn-vat-primary" translate="AddImportBtn" ng-click="importData(importEnum.AddImport)"></button>-->
<!--</div>-->
<!--</div>-->
<!--</div>--> <!--</div>-->
<!--&nbsp;&nbsp;&nbsp;&nbsp;|-->
<!--<span translate="StartRowNum"></span>-->
<!--<input id="StartRowNum" ng-model="StartRowNum" type="text"-->
<!--onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"-->
<!--onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}" />-->
<!--</div>-->
<!--<button class="btn btn-vat-primary" style="float:right; margin-right: 10px;" ng-if="isShowImportTotalBtn && hasEditPermission" translate="ImportBtn" ng-click="importData(importEnum.Import)"></button>-->
<!--<div class="btn-wrapper" ng-if="!isShowImportTotalBtn && hasEditPermission">-->
<!--<button class="btn btn-vat-primary" translate="ConverImportBtn" ng-click="importData(importEnum.CoverImport)"></button>|<button class="btn btn-vat-primary" translate="AddImportBtn" ng-click="importData(importEnum.AddImport)"></button>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="form-group"> <div class="form-group">
<div class="col-sm-5"> <div class="col-sm-5">
<input class="form-control" type="text" name="fileName" value="{{file ? file.name : '' | limitString :25}}" readonly placeholder="" required> <input class="form-control" type="text" name="fileName"
</div> value="{{file ? file.name : '' | limitString :25}}" readonly placeholder="" required>
<div class="col-sm-2"> </div>
<button type="button" type="file" ngf-select ng-model="file" accept=".xls,.xlsx" class="btn btn-secondary browse">{{'SelectFile' | translate}}</button> <div class="col-sm-4">
</div> <button type="button" type="file" ngf-select ng-model="file" accept=".xls,.xlsx"
<div class="col-sm-2"> class="btn btn-secondary browse">{{'SelectFile' | translate}}
<button class="btn btn-vat-primary" translate="ImportBtn" ng-click="importDataNew()"></button> </button>
</div> </div>
<div class="col-sm-3">
<button class="btn btn-vat-primary" style="height: 34px" translate="ImportBtn"
ng-click="importDataNew()"></button>
</div>
</div> </div>
<!--分页栏--> <!--分页栏-->
<!--<div class="form-group page-form-group" ng-show="!showImportTable">--> <!--<div class="form-group page-form-group" ng-show="!showImportTable">-->
<!--<div class="page-footer">--> <!--<div class="page-footer">-->
<!--<ack-pagination page-options="pagingOptions" refresh-table="pagingService.refreshInvoiceDataGrid()" hide-page-size-selector="true"></ack-pagination>--> <!--<ack-pagination page-options="pagingOptions" refresh-table="pagingService.refreshInvoiceDataGrid()" hide-page-size-selector="true"></ack-pagination>-->
<!--</div>--> <!--</div>-->
<!--</div>--> <!--</div>-->
</form> </form>
<!--导入数据界面--> <!--导入数据界面-->
<div class="dt-import-wrapper" ng-if="showImportTable"> <div class="dt-import-wrapper" ng-if="showImportTable">
<div class="import-table-cont" style="padding-top:40px;"> <div class="import-table-cont" style="padding-top:40px;">
<table class="import-table"> <table class="import-table">
<thead> <thead>
<tr style="height:30px;"> <tr style="height:30px;">
<th>&nbsp;</th> <th>&nbsp;</th>
<th ng-repeat="m in sheetData.dataList[0] track by $index">{{$index + 1}}</th> <th ng-repeat="m in sheetData.dataList[0] track by $index">{{$index + 1}}</th>
</tr> </tr>
<tr style="height:30px;"> <tr style="height:30px;">
<th>&nbsp;</th> <th>&nbsp;</th>
<th ng-repeat="i in sheetData.dataList[0] track by $index"> <th ng-repeat="i in sheetData.dataList[0] track by $index">
<div class="dropdown"> <div class="dropdown">
<button class="btn dropdown-toggle select-button" data-toggle="dropdown"> <button class="btn dropdown-toggle select-button" data-toggle="dropdown">
<span class="pull-left" ng-if="selectedColumnMap[$index]">{{selectedColumnMap[$index]}}</span> <span class="pull-left" ng-if="selectedColumnMap[$index]">{{selectedColumnMap[$index]}}</span>
<span class="pull-left" ng-if="!selectedColumnMap[$index]" <span class="pull-left" ng-if="!selectedColumnMap[$index]"
translate="PleaseSelectColumn"></span> translate="PleaseSelectColumn"></span>
<i class="fa fa-chevron-circle-down" aria-hidden="true"></i> <i class="fa fa-chevron-circle-down" aria-hidden="true"></i>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li ng-repeat="col in incomeInvoiceTotalColumns track by $index" <li ng-repeat="col in incomeInvoiceTotalColumns track by $index"
ng-click="mappingColumn($parent.$index,$index,col)"> ng-click="mappingColumn($parent.$index,$index,col)">
<i class="fa fa-star" aria-hidden="true" ng-show="isNeedMappingColumn(col)"></i> <i class="fa fa-star" aria-hidden="true" ng-show="isNeedMappingColumn(col)"></i>
{{col}} {{col}}
</li> </li>
</ul> </ul>
</div> </div>
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody style="margin-top:40px;"> <tbody style="margin-top:40px;">
<tr ng-repeat="thisrows in invoiceData track by $index" ng-class-even="'row-even'" ng-class-odd="'row-odd'"> <tr ng-repeat="thisrows in invoiceData track by $index" ng-class-even="'row-even'"
<td style="text-align: center; width: 30px;">{{$index+1}}</td> ng-class-odd="'row-odd'">
<td ng-repeat="cells in thisrows track by $index"> <td style="text-align: center; width: 30px;">{{$index+1}}</td>
{{ cells }} <td ng-repeat="cells in thisrows track by $index">
</td> {{ cells }}
</tr> </td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
<!--初始化数据界面--> <!--初始化数据界面-->
<div class="dt-init-wrapper" ng-if="showInitTable"> <div class="dt-init-wrapper" ng-if="showInitTable">
<div class="total-Wrapper"> <div class="total-Wrapper">
<span>{{'TotalNumber' | translate}}<span class="total_span">{{ImportTotalCount}}</span> {{'RecordCount' | translate}}</span> <span>{{'TotalNumber' | translate}}<span class="total_span">{{ImportTotalCount}}</span> {{'RecordCount' | translate}}</span>
<span style="margin-left:15px;">{{'TotalAccountAcquisitionValue' | translate}}<span class="total_span">{{ImportTotalAccountAcquisitionValue}}</span> {{'Yuan' | translate}}</span> <span style="margin-left:15px;">{{'TotalAccountAcquisitionValue' | translate}}<span class="total_span">{{ImportTotalAccountAcquisitionValue}}</span> {{'Yuan' | translate}}</span>
<span style="margin-left:15px;">{{'TotalAccountYearDepreciationAmount' | translate}}<span class="total_span">{{ImportTotalAccountYearDepreciationAmount}}</span> {{'Yuan' | translate}}</span> <span style="margin-left:15px;">{{'TotalAccountYearDepreciationAmount' | translate}}<span
class="total_span">{{ImportTotalAccountYearDepreciationAmount}}</span> {{'Yuan' | translate}}</span>
<!--<span style="margin-left:15px;">{{'TotalTaxCurrentYearDepreciationAmount' | translate}}<span class="total_span">{{ImportTotalTaxCurrentYearDepreciationAmount}}</span> {{'Yuan' | translate}}</span> <!--<span style="margin-left:15px;">{{'TotalTaxCurrentYearDepreciationAmount' | translate}}<span class="total_span">{{ImportTotalTaxCurrentYearDepreciationAmount}}</span> {{'Yuan' | translate}}</span>
<span style="margin-left:15px;">{{'TotalYearDifferenceAmount' | translate}}<span class="total_span">{{ImportTotalYearDifferenceAmount}}</span> {{'Yuan' | translate}}</span>--> <span style="margin-left:15px;">{{'TotalYearDifferenceAmount' | translate}}<span class="total_span">{{ImportTotalYearDifferenceAmount}}</span> {{'Yuan' | translate}}</span>-->
</div> </div>
<div id="gridInitData" dx-data-grid="gridInitDataOption"></div> <div id="gridInitData" dx-data-grid="gridInitDataOption"></div>
</div> </div>
<!--后台错误信息界面--> <!--后台错误信息界面-->
<div class="error-info-wrapper" id="error-info-wrapper" ng-show="showErrorTable"> <div class="error-info-wrapper" id="error-info-wrapper" ng-show="showErrorTable">
<div ui-grid="gridOptionsErrorMsg" style="width:100%;" ng-style="getErrorGridHeight()"></div> <div ui-grid="gridOptionsErrorMsg" style="width:100%;" ng-style="getErrorGridHeight()"></div>
...@@ -135,48 +144,61 @@ ...@@ -135,48 +144,61 @@
resizer-top="#balance-ouput-grid-wrapper" resizer-top="#balance-ouput-grid-wrapper"
resizer-bottom="#error-info-wrapper"> resizer-bottom="#error-info-wrapper">
<div id="topIcon" ng-click="toggleErrorTab()"> <div id="topIcon" ng-click="toggleErrorTab()">
<img src="../../../../app-resources/images/collapse.png" /> <img src="../../../../app-resources/images/collapse.png"/>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!--计算结果显示界面--> <!--计算结果显示界面-->
<div id="tab_Assets" ng-if="displayType >1"> <div id="tab_Assets" ng-if="displayType >1">
<div class="total-Wrapper" > <!--税会差异的选择-->
<div class="option">
<span>{{'TaxAccountDifference' | translate}}</span>
<div id="taxAccountDifferenceButton" dx-select-box="taxAccountDifferenceOptions"></div>
</div>
<!--计算结果-->
<div class="total-Wrapper">
<span>{{'TotalNumber' | translate}}<span class="total_span">{{TotalCount}}</span> {{'RecordCount' | translate}}</span> <span>{{'TotalNumber' | translate}}<span class="total_span">{{TotalCount}}</span> {{'RecordCount' | translate}}</span>
<span style="margin-left:15px;">{{'TotalAccountAcquisitionValue' | translate}}<span class="total_span">{{TotalAccountAcquisitionValue}}</span> {{'Yuan' | translate}}</span> <span style="margin-left:15px;">{{'TotalAccountAcquisitionValue' | translate}}<span class="total_span">{{TotalAccountAcquisitionValue}}</span> {{'Yuan' | translate}}</span>
<span style="margin-left:15px;">{{'TotalAccountYearDepreciationAmount' | translate}}<span class="total_span">{{TotalAccountYearDepreciationAmount}}</span> {{'Yuan' | translate}}</span> <span style="margin-left:15px;">{{'TotalAccountYearDepreciationAmount' | translate}}<span
<span style="margin-left:15px;">{{'TotalTaxCurrentYearDepreciationAmount' | translate}}<span class="total_span">{{TotalTaxCurrentYearDepreciationAmount}}</span> {{'Yuan' | translate}}</span> class="total_span">{{TotalAccountYearDepreciationAmount}}</span> {{'Yuan' | translate}}</span>
<span style="margin-left:15px;">{{'TotalTaxCurrentYearDepreciationAmount' | translate}}<span
class="total_span">{{TotalTaxCurrentYearDepreciationAmount}}</span> {{'Yuan' | translate}}</span>
<span style="margin-left:15px;">{{'TotalYearDifferenceAmount' | translate}}<span class="total_span">{{TotalYearDifferenceAmount}}</span> {{'Yuan' | translate}}</span> <span style="margin-left:15px;">{{'TotalYearDifferenceAmount' | translate}}<span class="total_span">{{TotalYearDifferenceAmount}}</span> {{'Yuan' | translate}}</span>
</div> </div>
<div class="dt-asset-result"> <!--资产清单结果集-->
<div class="dt-asset-result">
<!--<asset-list-edit-modal asset-type="displayType-1" type="0"></asset-list-edit-modal>--> <!--<asset-list-edit-modal asset-type="displayType-1" type="0"></asset-list-edit-modal>-->
<div id="assetsResultGrid" dx-data-grid="assetsResultGridOptions"></div> <div id="assetsResultGrid" dx-data-grid="assetsResultGridOptions"></div>
</div> </div>
</div> </div>
<!--本年与上年数据差异界面--> <!--本年与上年数据差异界面-->
<script type="text/ng-template" id="set-asset-validate-modal.html"> <script type="text/ng-template" id="set-asset-validate-modal.html">
<div class="modal-content" style="width:832px;"> <div class="modal-content" style="width:832px;">
<div class="modal-header"> <div class="modal-header">
<div class="modal-title"> <div class="modal-title">
{{'AssetDiffData' | translate}} {{'AssetDiffData' | translate}}
</div> </div>
</div> </div>
<div class="modal-body" style="margin:15px;padding:initial;"> <div class="modal-body" style="margin:15px;padding:initial;">
<div style="border: 1px solid #959595;height:450px; border-radius: 3px;width:800px;" dx-data-grid=" gridPeriodOptions"></div> <div style="border: 1px solid #959595;height:450px; border-radius: 3px;width:800px;"
dx-data-grid=" gridPeriodOptions"></div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-third" ng-click="cancelValidateAsset()">{{'ButtonCancel' | translate }}</button> <button type="button" class="btn btn-third" ng-click="cancelValidateAsset()">{{'ButtonCancel' |
</div> translate }}
</button>
</div>
</div> </div>
</script> </script>
<!--前台错误信息界面--> <!--前台错误信息界面-->
<div class="error-list-modal"> <div class="error-list-modal">
<div class="modal fade" id="errorListModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" data-backdrop="static" data-keyboard="false"> <div class="modal fade" id="errorListModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
data-backdrop="static" data-keyboard="false">
<div class="modal-dialog" style="width: 720px; height: 200px;" role="document"> <div class="modal-dialog" style="width: 720px; height: 200px;" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
...@@ -186,23 +208,25 @@ ...@@ -186,23 +208,25 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
{{'ImportErrorPopUpErrorDetail' | translate}}： {{'ImportErrorPopUpErrorDetail' | translate}}：
<br /> <br/>
<table> <table>
<thead> <thead>
<tr> <tr>
<th width="10%" style="text-align:center;">{{'ImportErrorPopUpNoCol' | translate}}</th> <th width="10%" style="text-align:center;">{{'ImportErrorPopUpNoCol' | translate}}</th>
<th width="20%">{{'ImportErrorPopUpErrorTypeCol' | translate}}</th> <th width="20%">{{'ImportErrorPopUpErrorTypeCol' | translate}}</th>
<th width="10%" style="text-align:center;">{{'ImportErrorPopUpErrorCountCol' | translate}}</th> <th width="10%" style="text-align:center;">{{'ImportErrorPopUpErrorCountCol' |
<th width="60%">{{'ImportErrorPopUpErrorDescCol' | translate}}</th> translate}}
</tr> </th>
<th width="60%">{{'ImportErrorPopUpErrorDescCol' | translate}}</th>
</tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="error in errorMsgMap track by $index"> <tr ng-repeat="error in errorMsgMap track by $index">
<td width="10%" style="text-align:center;">{{$index + 1}}</td> <td width="10%" style="text-align:center;">{{$index + 1}}</td>
<td width="20%">{{error.errorType}}</td> <td width="20%">{{error.errorType}}</td>
<td width="10%" style="text-align:center;">{{error.errorCount}}</td> <td width="10%" style="text-align:center;">{{error.errorCount}}</td>
<td width="60%" ng-bind-html="error.errorContent"></td> <td width="60%" ng-bind-html="error.errorContent"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
...@@ -213,7 +237,7 @@ ...@@ -213,7 +237,7 @@
</div> </div>
</div> </div>
</div> </div>
<!--资产分类设置界面--> <!--资产分类设置界面-->
<script type="text/ng-template" id="set-asset-group-modal.html"> <script type="text/ng-template" id="set-asset-group-modal.html">
<div class="modal-content"> <div class="modal-content">
...@@ -224,16 +248,21 @@ ...@@ -224,16 +248,21 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="grid-container"> <div class="grid-container">
<div id="assetsGroupGrid" dx-data-grid="assetsGridOptions" style="max-width: 760px; margin-top: -40px;"> <div id="assetsGroupGrid" dx-data-grid="assetsGridOptions"
style="max-width: 760px; margin-top: -40px;">
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button style="margin-left: 22px;" type="button" class="btn btn-primary" ng-click="saveAssetGroupInfo()" ng-disabled="!hasEditPermission">{{'Confirm' | translate }}</button> <button style="margin-left: 22px;" type="button" class="btn btn-primary" ng-click="saveAssetGroupInfo()"
<button type="button" class="btn btn-third" ng-click="cancelAsset()" ng-if="!isDisabled" ng-disabled="isDisabled">{{'ButtonCancel' | translate }}</button> ng-disabled="!hasEditPermission">{{'Confirm' | translate }}
</button>
<button type="button" class="btn btn-third" ng-click="cancelAsset()" ng-if="!isDisabled"
ng-disabled="isDisabled">{{'ButtonCancel' | translate }}
</button>
</div> </div>
</div> </div>
</script> </script>
<vat-operate-log period="period" module-type="moduleid" is-show="isShowLog"></vat-operate-log> <vat-operate-log period="period" module-type="moduleid" is-show="isShowLog"></vat-operate-log>
</div> </div>
\ No newline at end of file
atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.less
View file @ 23766b40
@import "~/app-resources/less/theme.less"; @import "~/app-resources/less/theme.less";
.cit-import-asset-list { .cit-import-asset-list {
padding-left: 20px; padding-left: 20px;
height: 96%; height: 96%;
.sweet-alert { .sweet-alert {
background-color: #eeeeee; background-color: #eeeeee;
} }
.nav-wrapper { .nav-wrapper {
padding-bottom: 10px; padding-bottom: 10px;
border-bottom: 1px solid #DBD8D3; border-bottom: 1px solid #DBD8D3;
.nav-header { .nav-header {
height: 54px; height: 54px;
line-height: 54px; line-height: 54px;
font-family: "Microsoft YaHei Bold", "Microsoft YaHei Regular", "Microsoft YaHei"; font-family: "Microsoft YaHei Bold", "Microsoft YaHei Regular", "Microsoft YaHei";
font-weight: 700; font-weight: 700;
font-style: normal; font-style: normal;
font-size: 15px; font-size: 15px;
color: #333; color: #333;
} }
.nav-tab { .nav-tab {
/*display: inline-block;*/ /*display: inline-block;*/
span { span {
display: inline-block; display: inline-block;
height: 34px; height: 34px;
width: 80px; width: 80px;
text-align: center; text-align: center;
line-height: 34px; line-height: 34px;
padding: 0 10px; padding: 0 10px;
background-color: #B90808; background-color: #B90808;
color: #FFF; color: #FFF;
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
font-weight: 400; font-weight: 400;
font-style: normal; font-style: normal;
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
} }
.active { .active {
background-color: #F91000; background-color: #F91000;
} }
} }
} }
.alert-warning { .alert-warning {
background-color: #FDE2DE; background-color: #FDE2DE;
cursor: pointer; cursor: pointer;
} }
.alert { .alert {
color: #CF2D1B; color: #CF2D1B;
font-weight: bold; font-weight: bold;
display: inline-block; display: inline-block;
padding: 5px; padding: 5px;
float: left; float: left;
margin: -45px 0 0 350px; margin: -45px 0 0 350px;
i { i {
font-size: 20px; font-size: 20px;
vertical-align: middle; vertical-align: middle;
margin-right: 5px; margin-right: 5px;
} }
} }
.dropdown-common() { .dropdown-common() {
display: inline-block; display: inline-block;
.select-button { .select-button {
background-color: #F5F5F5; background-color: #F5F5F5;
padding: 6px 0; padding: 6px 0;
width: 110px; width: 110px;
} }
.caret { .caret {
margin-top: 8px; margin-top: 8px;
} }
.dropdown-menu { .dropdown-menu {
min-width: 140px; min-width: 140px;
max-height: 400px; max-height: 400px;
overflow-y: scroll; overflow-y: scroll;
li { li {
text-align: left; text-align: left;
min-height: 0px; min-height: 0px;
height: 30px; height: 30px;
color: #000; color: #000;
font-weight: normal; font-weight: normal;
&:hover { &:hover {
background-color: #F91000; background-color: #F91000;
color: #FFF; color: #FFF;
cursor: pointer; cursor: pointer;
} }
i { i {
float: right; float: right;
font-size: 15px; font-size: 15px;
} }
} }
} }
} }
#tab_total { #tab_total {
display: block; display: block;
height: calc(~'100% - 80px'); height: calc(~'100% - 80px');
position: relative; position: relative;
.operation-wrapper { .operation-wrapper {
margin: -40px 15px 0 0; margin: -40px 15px 0 0;
span { span {
cursor: pointer; cursor: pointer;
} }
} }
.import-wrapper { .import-wrapper {
margin-top: 10px; margin-top: 10px;
span { span {
margin-left: 10px; margin-left: 10px;
color: #333; color: #333;
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
font-style: normal; font-style: normal;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
} }
.dropdown { .dropdown {
.dropdown-common(); .dropdown-common();
} }
input { input {
width: 50px; width: 50px;
outline: none; outline: none;
border-radius: 3px; border-radius: 3px;
border: 1px solid #3c3a36; border: 1px solid #3c3a36;
padding: 2px; padding: 2px;
text-align: center; text-align: center;
} }
> button:last-child { > button:last-child {
float: right; float: right;
margin-right: 20px; margin-right: 20px;
} }
.btn-wrapper { .btn-wrapper {
border-radius: 5px; border-radius: 5px;
background-color: #e0301e; background-color: #e0301e;
color: #FFF; color: #FFF;
display: inline-block; display: inline-block;
float: right; float: right;
margin-right: 10px; margin-right: 10px;
.btn-vat-primary { .btn-vat-primary {
min-width: 80px; min-width: 80px;
} }
} }
.import-info-wrapper { .import-info-wrapper {
display: inline-block; display: inline-block;
} }
} }
.dt-init-wrapper { .dt-init-wrapper {
margin: 10px 0; margin: 10px 0;
max-width: 99%; max-width: 99%;
height: calc(~'100% - 80px'); height: calc(~'100% - 80px');
position: relative; position: relative;
z-index: 1; z-index: 1;
.dropdown { .dropdown {
.dropdown-common(); .dropdown-common();
i { i {
color: #F85550; color: #F85550;
} }
} }
.total-Wrapper { .total-Wrapper {
width: 99%; width: 99%;
margin-left: 0px; margin-left: 0px;
font-size: 13px; font-size: 13px;
font-family: 'Microsoft YaHei'; font-family: 'Microsoft YaHei';
padding-bottom: 5px; padding-bottom: 5px;
.total_span { .total_span {
color: #B4122A !important; color: #B4122A !important;
background-color: #ddd !important; background-color: #ddd !important;
font-size: 12px !important; font-size: 12px !important;
font-weight: bold !important; font-weight: bold !important;
border-radius: 10px !important; border-radius: 10px !important;
padding-left: 8px !important; padding-left: 8px !important;
padding-right: 8px !important; padding-right: 8px !important;
} }
} }
/*.balance-ouput-grid-wrapper { /*.balance-ouput-grid-wrapper {
height: calc(~'100% - -10px'); height: calc(~'100% - -10px');
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
top: 0; top: 0;
bottom: 150px; bottom: 150px;
left: 0; left: 0;
right: 0; right: 0;
background-color: #FFF; background-color: #FFF;
}*/ }*/
} }
.dt-import-wrapper { .dt-import-wrapper {
margin: 10px 0; margin: 10px 0;
max-width: 99%; max-width: 99%;
overflow: auto; overflow: auto;
height: calc(~"100% - 70px"); height: calc(~"100% - 70px");
.dropdown { .dropdown {
.dropdown-common(); .dropdown-common();
i { i {
color: #F85550; color: #F85550;
} }
button { button {
color: #333; color: #333;
} }
} }
} }
.error-info-wrapper { .error-info-wrapper {
position: absolute; position: absolute;
height: 150px; height: 150px;
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
overflow: hidden; overflow: hidden;
background-color: #FFF; background-color: #FFF;
margin-left: -39px; margin-left: -39px;
z-index: 2; z-index: 2;
} }
#content-resizer { #content-resizer {
width: 110%; width: 110%;
position: absolute; position: absolute;
height: 4px; height: 4px;
bottom: 150px; bottom: 150px;
left: 0; left: 0;
right: 0; right: 0;
background-color: red; background-color: red;
cursor: n-resize; cursor: n-resize;
margin-left: -39px; margin-left: -39px;
#topIcon { #topIcon {
cursor: pointer; cursor: pointer;
margin-top: -19px; margin-top: -19px;
width: 38px; width: 38px;
margin-left: 46%; margin-left: 46%;
z-index: 999; z-index: 999;
bottom: -200px; bottom: -200px;
text-align: center; text-align: center;
display: block !important; display: block !important;
} }
} }
} }
#tab_Assets { #tab_Assets {
display: block; display: block;
height: calc(~'100% - 80px'); height: calc(~'100% - 80px');
position: relative; position: relative;
.total-Wrapper { .total-Wrapper {
width: 72%; width: 72%;
margin-left: 0px; margin-left: 0px;
font-size: 13px; font-size: 13px;
font-family: 'Microsoft YaHei'; font-family: 'Microsoft YaHei';
padding-top: 5px; padding-top: 5px;
position: absolute; position: absolute;
z-index: 9; z-index: 9;
.total_span { .total_span {
color: #B4122A !important; color: #B4122A !important;
background-color: #ddd !important; background-color: #ddd !important;
font-size: 12px !important; font-size: 12px !important;
font-weight: bold !important; font-weight: bold !important;
border-radius: 10px !important; border-radius: 10px !important;
padding-left: 8px !important; padding-left: 8px !important;
padding-right: 8px !important; padding-right: 8px !important;
} }
} }
.dt-asset-result { .dt-asset-result {
margin: 0px 0; margin: 0px 0;
max-width: 99%; max-width: 99%;
height: calc(~'100% - 20px'); height: calc(~'100% - 20px');
position: relative; position: relative;
margin-top: 10px; margin-top: 10px;
.herder-center { .herder-center {
text-align: center !important; text-align: center !important;
vertical-align: middle !important; vertical-align: middle !important;
/*font-size:13px !important;*/ /*font-size:13px !important;*/
} }
} }
} .option {
margin-top: 10px;
.error-list-modal { margin-bottom: 10px;
.modal-title { }
color: #FF0000;
} .option > span {
margin-right: 10px;
.modal-body { }
max-height: 300px;
overflow-y: auto; .option > .dx-selectbox {
display: inline-block;
table { vertical-align: middle;
border: 1px solid #CCC; }
}
thead tr th {
height: 30px; .error-list-modal {
border: 1px solid #CCC; .modal-title {
} color: #FF0000;
}
tbody tr td {
height: 25px; .modal-body {
border: 1px solid #CCC; max-height: 300px;
} overflow-y: auto;
}
} table {
border: 1px solid #CCC;
.modal-footer {
text-align: center; thead tr th {
} height: 30px;
} border: 1px solid #CCC;
}
.page-form-group {
float: right; tbody tr td {
margin-top: 10px; height: 25px;
border: 1px solid #CCC;
.page-size { }
margin: 0; }
} }
.pagination { .modal-footer {
margin: 0; text-align: center;
} }
} }
#gridInitData { .page-form-group {
border-radius: 3px; float: right;
border: 1px solid #d4d4d4; margin-top: 10px;
}
} .page-size {
margin: 0;
}
.set-asset-list-modal .modal-dialog {
height: 500px; .pagination {
width: 800px; margin: 0;
}
.modal-content { }
height: 100%;
width: 100%; #gridInitData {
} border-radius: 3px;
border: 1px solid #d4d4d4;
.modal-title { }
color: #333; }
font-size: 16px;
font-weight: bold;
} .set-asset-list-modal .modal-dialog {
height: 500px;
.modal-body { width: 800px;
height: 76%;
max-width: 760px !important; .modal-content {
margin-left: 22px; height: 100%;
overflow-y: auto; width: 100%;
}
.herder-center {
text-align: center !important; .modal-title {
} color: #333;
font-size: 16px;
.column-color { font-weight: bold;
color: red !important; }
}
} .modal-body {
height: 76%;
.modal-footer { max-width: 760px !important;
text-align:left; margin-left: 22px;
overflow-y: auto;
}
} .herder-center {
text-align: center !important;
}
.column-color {
color: red !important;
}
}
.modal-footer {
text-align:left;
}
}
atms-web/src/main/webapp/app/cit/import/cit-import-layout/cit-import-layout.html
View file @ 23766b40
<div id="vat-import-container"> <div id="vat-import-container">
<div class="vat-import-menu"> <div class="vat-import-menu">
<div class="vat-import-menu"> <div class="vat-import-menu">
<perfect-scrollbar class="scroller" wheel-propagation="true" wheel-speed="1" min-scrollbar-length="20"> <perfect-scrollbar class="scroller" wheel-propagation="true" wheel-speed="1" min-scrollbar-length="20">
<div class="li" ng-repeat="menu in ::menus" atms-permission permission-control-type="ngIf" permission-code="{{::menu.permission}}" ng-show="true"> <div class="li" ng-repeat="menu in ::menus" atms-permission permission-control-type="ngIf" permission-code="{{::menu.permission}}" ng-show="true">
<a ui-sref-active="active" ui-sref=".{{::menu.name}}"> <a ui-sref-active="active" ui-sref=".{{::menu.name}}">
<i ng-show="menu.name==='balanceSheet' && errorCount !== 0" class="fa fa-circle" style="/* display: block; *//* padding-bottom: 10px; */color: rgb(255, 140, 60);/* float: left; *//* padding-right: 10px; */margin-left: 40px;font-size: 10px;" aria-hidden="true"></i> <i ng-show="menu.name==='balanceSheet' && errorCount !== 0" class="fa fa-circle" style="/* display: block; *//* padding-bottom: 10px; */color: rgb(255, 140, 60);/* float: left; *//* padding-right: 10px; */margin-left: 40px;font-size: 10px;" aria-hidden="true"></i>
<i class="{{::menu.icon}}" style="display: block;padding-bottom: 10px;" aria-hidden="true"></i> <i class="{{::menu.icon}}" style="display: block;padding-bottom: 10px;" aria-hidden="true"></i>
<span>{{::menu.text}}</span> <span>{{::menu.text}}</span>
</a> </a>
</div> </div>
<!--分组的万能导入菜单 --> <!--分组的万能导入菜单 -->
<ul class="nav" id="sidebar" ng-show="isImportMenu"> <ul class="nav" id="sidebar" ng-show="isImportMenu">
<li ng-repeat="tableGroup in tableMenuList" ng-include="'menuTree'"> <li ng-repeat="tableGroup in tableMenuList" ng-include="'menuTree'">
</li> </li>
</ul> </ul>
<!--没有分组的万能导入菜单 --> <!--没有分组的万能导入菜单 -->
<div class="li" ng-repeat="table in noGroupTableList" atms-permission permission-control-type="ngIf" permission-code="{{::table.citQueryCode}}" ng-show="isImportMenu && table.show"> <div class="li" ng-repeat="table in noGroupTableList" atms-permission permission-control-type="ngIf" permission-code="{{::table.citQueryCode}}" ng-show="isImportMenu && table.show">
<a ui-sref-active="active" ui-sref=".importDataView({ id: table.id, serviceType: serviceTypeId })"> <a ui-sref-active="active" ui-sref=".importDataView({ id: table.id, serviceType: serviceTypeId })">
<i class="{{::importIcon}}" style="display: block;padding-bottom: 10px;" aria-hidden="true"></i> <i class="{{::importIcon}}" style="display: block;padding-bottom: 10px;" aria-hidden="true"></i>
<span>{{::table.chineseName}}</span> <span>{{::table.chineseName}}</span>
</a> </a>
</div> </div>
</perfect-scrollbar> </perfect-scrollbar>
</div> </div>
</div> </div>
<script type="text/ng-template" id="menuTree"> <script type="text/ng-template" id="menuTree">
<div class="table-menu" ng-click="showMenu(tableGroup)" title="{{::tableGroup.menuNameCN}}" ng-if="tableGroup.tableList && tableGroup.tableList.length>0"> <div class="table-menu" ng-click="showMenu(tableGroup)" title="{{::tableGroup.menuNameCN}}" ng-if="tableGroup.tableList && tableGroup.tableList.length>0">
<i class="fa fa-chevron-down" ng-if="!tableGroup.isMenuClosed" style="padding-bottom: 10px;" aria-hidden="true"></i> <i class="fa fa-chevron-down" ng-if="!tableGroup.isMenuClosed" style="padding-bottom: 10px;" aria-hidden="true"></i>
<i class="fa fa-chevron-right" ng-if="tableGroup.isMenuClosed" style="padding-bottom: 10px;" aria-hidden="true"></i> <i class="fa fa-chevron-right" ng-if="tableGroup.isMenuClosed" style="padding-bottom: 10px;" aria-hidden="true"></i>
<i class="fa fa-align-left" style="padding-bottom: 10px;padding-left:5px;" aria-hidden="true"></i> <i class="fa fa-align-left" style="padding-bottom: 10px;padding-left:5px;" aria-hidden="true"></i>
<span>{{::tableGroup.menuNameCN}}</span> <span>{{::tableGroup.menuNameCN}}</span>
</div> </div>
<div class="li" ng-repeat="table in ::tableGroup.tableList" atms-permission permission-control-type="ngIf" permission-code="{{::table.citQueryCode}}" <div class="li" ng-repeat="table in ::tableGroup.tableList" atms-permission permission-control-type="ngIf" permission-code="{{::table.citQueryCode}}"
ng-show="isImportMenu && !tableGroup.isMenuClosed && table.show"> ng-show="isImportMenu && !tableGroup.isMenuClosed && table.show">
<a ui-sref-active="active" ui-sref=".importDataView({ id: table.id, serviceType: serviceTypeId })"> <a ui-sref-active="active" ui-sref=".importDataView({ id: table.id, serviceType: serviceTypeId })">
<i class="{{::importIcon}}" style="display: block;padding-bottom: 10px;" aria-hidden="true"></i> <i class="{{::importIcon}}" style="display: block;padding-bottom: 10px;" aria-hidden="true"></i>
<span>{{::table.chineseName}}</span> <span>{{::table.chineseName}}</span>
</a> </a>
</div> </div>
</script> </script>
<div class="vat-import-content" ui-view></div> <div class="vat-import-content" ui-view style="overflow: auto"></div>
</div> </div>
atms-web/src/main/webapp/app/common/webservices/assetList.svc.js
View file @ 23766b40
...@@ -6,9 +6,9 @@ webservices.factory('assetListService', ['$http', 'apiConfig', function ($http, ...@@ -6,9 +6,9 @@ webservices.factory('assetListService', ['$http', 'apiConfig', function ($http,
debugger; debugger;
return $http.get('/asset/getAssetListData', apiConfig.create()); return $http.get('/asset/getAssetListData', apiConfig.create());
}, },
getAssetResultList: function (assetType) { getAssetResultList: function (assetType,projectId, taxAccountCompare) {
debugger; debugger;
return $http.get('/asset/getAssetResultList?assetType=' + assetType, apiConfig.create()); return $http.get('/asset/getAssetResultList?assetType=' + assetType + '&projectId=' + projectId + '&taxAccountCompare=' + taxAccountCompare, apiConfig.create());
}, },
getAssetGroupResultData: function (projectId) { getAssetGroupResultData: function (projectId) {
debugger; debugger;
...@@ -26,6 +26,10 @@ webservices.factory('assetListService', ['$http', 'apiConfig', function ($http, ...@@ -26,6 +26,10 @@ webservices.factory('assetListService', ['$http', 'apiConfig', function ($http,
debugger; debugger;
return $http.post('/asset/saveAssetGroupInfo?saveGroupType=' + saveGroupType + '&projectId=' + projectId,assetGroupResults, apiConfig.create()); return $http.post('/asset/saveAssetGroupInfo?saveGroupType=' + saveGroupType + '&projectId=' + projectId,assetGroupResults, apiConfig.create());
}, },
updateAssetResultList:function (assetsList,projectId) {
debugger;
return $http.post('/asset/updateAssetResultList?projectId=' + projectId,assetsList, apiConfig.create());
},
getAllFixedAssetDetailGroup: function (assetGroupType,pageIndex,pageSize) { getAllFixedAssetDetailGroup: function (assetGroupType,pageIndex,pageSize) {
debugger; debugger;
return $http.post('/asset/getFixedAssetDetailGroup',{"assetGroupType":assetGroupType,"pageIndex":pageIndex,"pageSize":pageSize}, apiConfig.create()); return $http.post('/asset/getFixedAssetDetailGroup',{"assetGroupType":assetGroupType,"pageIndex":pageIndex,"pageSize":pageSize}, apiConfig.create());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment