财务模块注释修改

skyeye-ifs/src/main/java/com/skyeye/controller/ExpenditureController.java

@@ -16,7 +16,7 @@ import com.skyeye.service.ExpenditureService;
 /**
  *
  * @ClassName: ExpenditureController
- * @Description: 支出单管理控制类
+ * @Description: 记账支出管理控制类
  * @author: skyeye云系列--卫志强
  * @date: 2021/10/6 9:21
  *
@@ -30,7 +30,7 @@ public class ExpenditureController {
     private ExpenditureService expenditureService;
 
     /**
-     * 查询支出单列表信息
+     * 查询记账支出列表信息
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -42,7 +42,7 @@ public class ExpenditureController {
     }
 
     /**
-     * 添加支出单
+     * 添加记账支出
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -54,7 +54,7 @@ public class ExpenditureController {
     }
 
     /**
-     * 查询支出单用于数据回显
+     * 查询记账支出用于数据回显
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -66,7 +66,7 @@ public class ExpenditureController {
     }
 
     /**
-     * 编辑支出单信息
+     * 编辑记账支出信息
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -78,7 +78,7 @@ public class ExpenditureController {
     }
 
     /**
-     * 删除支出单信息
+     * 删除记账支出信息
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -90,7 +90,7 @@ public class ExpenditureController {
     }
 
     /**
-     * 查看支出单详情
+     * 查看记账支出详情
      * @param inputObject
      * @param outputObject
      * @throws Exception

skyeye-ifs/src/main/java/com/skyeye/controller/IncomeController.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * @Author 卫志强
- * @Description 收入单
+ * @Description 记账收入
  * @Date 2019/10/20 10:22
  */
 @Controller
@@ -23,7 +23,7 @@ public class IncomeController {
     private IncomeService incomeService;
 
     /**
-     * 查询收入单列表信息
+     * 查询记账收入列表信息
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -35,7 +35,7 @@ public class IncomeController {
     }
 
     /**
-     * 添加收入单
+     * 添加记账收入
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -47,7 +47,7 @@ public class IncomeController {
     }
 
     /**
-     * 查询收入单用于数据回显
+     * 查询记账收入用于数据回显
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -59,7 +59,7 @@ public class IncomeController {
     }
 
     /**
-     * 编辑收入单信息
+     * 编辑记账收入信息
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -71,7 +71,7 @@ public class IncomeController {
     }
 
     /**
-     * 删除收入单信息
+     * 删除记账收入信息
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -83,7 +83,7 @@ public class IncomeController {
     }
 
     /**
-     * 查看收入单详情
+     * 查看记账收入详情
      * @param inputObject
      * @param outputObject
      * @throws Exception

skyeye-ifs/src/main/java/com/skyeye/dao/IncomeDao.java

@@ -10,7 +10,7 @@ import java.util.Map;
 /**
  *
  * @ClassName: IncomeDao
- * @Description: 收入单管理数据层
+ * @Description: 记账收入管理数据层
  * @author: skyeye云系列--卫志强
  * @date: 2021/7/8 22:22
  *

skyeye-ifs/src/main/java/com/skyeye/factory/impl/ExpenditureFactory.java

@@ -11,7 +11,7 @@ import com.skyeye.factory.IfsOrderFactoryResult;
 
 /**
  * @ClassName: ExpenditureFactory
- * @Description: 支出单服务工厂类
+ * @Description: 记账支出服务工厂类
  * @author: skyeye云系列--卫志强
  * @date: 2021/11/28 23:42
  * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved.

skyeye-ifs/src/main/java/com/skyeye/service/impl/ExpenditureServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.Map;
 /**
  *
  * @ClassName: ExpenditureServiceImpl
- * @Description: 支出单服务类
+ * @Description: 记账支出服务类
  * @author: skyeye云系列--卫志强
  * @date: 2021/6/6 23:41
  *
@@ -44,12 +44,12 @@ public class ExpenditureServiceImpl implements ExpenditureService {
     private SysEveUserStaffDao sysEveUserStaffDao;
 
     /**
-     * 支出单类型
+     * 记账支出类型
      */
     private static final String ORDER_TYPE = ErpConstants.DepoTheadSubType.EXPENDITURE_ORDER.getType();
 
     /**
-     * 查询支出单列表信息
+     * 查询记账支出列表信息
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -60,7 +60,7 @@ public class ExpenditureServiceImpl implements ExpenditureService {
     }
 
     /**
-     * 添加支出单
+     * 添加记账支出
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -81,7 +81,7 @@ public class ExpenditureServiceImpl implements ExpenditureService {
         Map<String, Object> accountHead = new HashMap<>();
         String orderNum = ErpConstants.DepoTheadSubType.getOrderNumBySubType(ORDER_TYPE);
         accountHead.put("id", useId);
-        accountHead.put("type", ORDER_TYPE);//支出单
+        accountHead.put("type", ORDER_TYPE);//记账支出
         accountHead.put("billNo", orderNum);
         accountHead.put("totalPrice", allPrice);
         accountHead.put("organId", params.get("organId"));
@@ -118,7 +118,7 @@ public class ExpenditureServiceImpl implements ExpenditureService {
     }
 
     /**
-     * 查询支出单用于数据回显
+     * 查询记账支出用于数据回显
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -140,7 +140,7 @@ public class ExpenditureServiceImpl implements ExpenditureService {
     }
 
     /**
-     * 编辑支出单信息
+     * 编辑记账支出信息
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -173,7 +173,7 @@ public class ExpenditureServiceImpl implements ExpenditureService {
     }
 
     /**
-     * 删除支出单信息
+     * 删除记账支出信息
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -188,7 +188,7 @@ public class ExpenditureServiceImpl implements ExpenditureService {
     }
 
     /**
-     * 查看支出单详情
+     * 查看记账支出详情
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -223,7 +223,7 @@ public class ExpenditureServiceImpl implements ExpenditureService {
         String[] key = new String[]{"billNo", "supplierName", "totalPrice", "hansPersonName", "billTime"};
         String[] column = new String[]{"单据编号", "往来单位", "合计金额", "经手人", "单据日期"};
         String[] dataType = new String[]{"", "data", "data", "data", "data"};
-        //支出单信息导出
-        ExcelUtil.createWorkBook("支出单", "支出单详细", beans, key, column, dataType, inputObject.getResponse());
+        //记账支出信息导出
+        ExcelUtil.createWorkBook("记账支出", "记账支出详细", beans, key, column, dataType, inputObject.getResponse());
 	}
 }

skyeye-ifs/src/main/java/com/skyeye/service/impl/IncomeServiceImpl.java

@@ -28,7 +28,7 @@ import java.util.Map;
 /**
  *
  * @ClassName: IncomeServiceImpl
- * @Description: 收入单管理服务类
+ * @Description: 记账收入管理服务类
  * @author: skyeye云系列--卫志强
  * @date: 2021/7/8 21:31
  *
@@ -45,12 +45,12 @@ public class IncomeServiceImpl implements IncomeService {
     private SysEveUserStaffDao sysEveUserStaffDao;
 
     /**
-     * 收入单类型
+     * 记账收入类型
      */
     private static final String ORDER_TYPE = ErpConstants.DepoTheadSubType.INCOME_ORDER.getType();
 
     /**
-     * 查询收入单列表信息
+     * 查询记账收入列表信息
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -66,7 +66,7 @@ public class IncomeServiceImpl implements IncomeService {
     }
 
     /**
-     * 添加收入单
+     * 添加记账收入
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -82,7 +82,7 @@ public class IncomeServiceImpl implements IncomeService {
             String useId = ToolUtil.getSurFaceId();
             //处理数据
             List<Map<String, Object>> jArray = JSONUtil.toList(initemStr, null);
-            //收入单中间转换对象，财务子表存储对象
+            //记账收入中间转换对象，财务子表存储对象
             Map<String, Object> bean;
             List<Map<String, Object>> entitys = new ArrayList<>();//财务子表实体集合信息
             BigDecimal allPrice = new BigDecimal("0");//主单总价
@@ -109,7 +109,7 @@ public class IncomeServiceImpl implements IncomeService {
             Map<String, Object> accountHead = new HashMap<>();
             String orderNum = ErpConstants.DepoTheadSubType.getOrderNumBySubType(ORDER_TYPE);
             accountHead.put("id", useId);
-            accountHead.put("type", ORDER_TYPE);//收入单
+            accountHead.put("type", ORDER_TYPE);//记账收入
             accountHead.put("billNo", orderNum);
             accountHead.put("totalPrice", allPrice);
             accountHead.put("organId", params.get("organId"));
@@ -127,7 +127,7 @@ public class IncomeServiceImpl implements IncomeService {
     }
 
     /**
-     * 查询收入单用于数据回显
+     * 查询记账收入用于数据回显
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -149,7 +149,7 @@ public class IncomeServiceImpl implements IncomeService {
     }
 
     /**
-     * 编辑收入单信息
+     * 编辑记账收入信息
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -164,7 +164,7 @@ public class IncomeServiceImpl implements IncomeService {
         	String useId = params.get("id").toString();
             //处理数据
             List<Map<String, Object>> jArray = JSONUtil.toList(initemStr, null);
-            //收入单中间转换对象，财务子表存储对象
+            //记账收入中间转换对象，财务子表存储对象
             Map<String, Object> bean;
             List<Map<String, Object>> entitys = new ArrayList<>();//财务子表实体集合信息
             BigDecimal allPrice = new BigDecimal("0");//主单总价
@@ -207,7 +207,7 @@ public class IncomeServiceImpl implements IncomeService {
     }
 
     /**
-     * 删除收入单信息
+     * 删除记账收入信息
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -222,7 +222,7 @@ public class IncomeServiceImpl implements IncomeService {
     }
 
     /**
-     * 查看收入单详情
+     * 查看记账收入详情
      * @param inputObject
      * @param outputObject
      * @throws Exception
@@ -258,7 +258,7 @@ public class IncomeServiceImpl implements IncomeService {
         String[] key = new String[]{"billNo", "supplierName", "totalPrice", "hansPersonName", "billTime"};
         String[] column = new String[]{"单据编号", "往来单位", "合计金额", "经手人", "单据日期"};
         String[] dataType = new String[]{"", "data", "data", "data", "data"};
-        //收入单信息导出
-        ExcelUtil.createWorkBook("收入单", "收入单详细", beans, key, column, dataType, inputObject.getResponse());
+        //记账收入信息导出
+        ExcelUtil.createWorkBook("记账收入", "记账收入详细", beans, key, column, dataType, inputObject.getResponse());
 	}
 }

skyeye-ifs/src/main/resources/reqmapping/mapping/ifs.xml

@@ -4,15 +4,15 @@
         - allUse  是否需要登录才能使用   1是   0否  2需要登陆才能访问，但无需授权    默认为否
      -->
 
-    <!-- 收入单管理开始 -->
-    <url id="income001" path="/post/IncomeController/queryIncomeByList" val="查询收入单列表信息" allUse="1" groupName="收入单模块">
+    <!-- 记账收入管理开始 -->
+    <url id="income001" path="/post/IncomeController/queryIncomeByList" val="查询记账收入列表信息" allUse="1" groupName="记账收入模块">
         <property id="billNo" name="billNo" ref="" var="单据编号" />
         <property id="startTime" name="startTime" ref="" var="开始日期" />
         <property id="endTime" name="endTime" ref="" var="结束日期" />
         <property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
         <property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
     </url>
-    <url id="income002" path="/post/IncomeController/insertIncome" val="添加收入单" allUse="1" method="POST" groupName="收入单模块">
+    <url id="income002" path="/post/IncomeController/insertIncome" val="添加记账收入" allUse="1" method="POST" groupName="记账收入模块">
         <property id="organId" name="organId" ref="required" var="单位Id"></property>
         <property id="operTime" name="operTime" ref="required" var="单据日期"></property>
         <property id="accountId" name="accountId" ref="required" var="账户Id"></property>
@@ -21,11 +21,11 @@
         <property id="changeAmount" name="changeAmount" ref="required,double" var="实收金额"></property>
         <property id="initemStr" name="initemStr" ref="required" var="收入项目列表" />
     </url>
-    <url id="income003" path="/post/IncomeController/queryIncomeToEditById" val="查询收入单用于数据回显" allUse="2" method="GET" groupName="收入单模块">
-        <property id="rowId" name="id" ref="required" var="收入单Id"></property>
+    <url id="income003" path="/post/IncomeController/queryIncomeToEditById" val="查询记账收入用于数据回显" allUse="2" method="GET" groupName="记账收入模块">
+        <property id="rowId" name="id" ref="required" var="记账收入Id"></property>
     </url>
-    <url id="income004" path="/post/IncomeController/editIncomeById" val="编辑收入单信息" allUse="1" method="PUT" groupName="收入单模块">
-        <property id="rowId" name="id" ref="required" var="收入单Id"></property>
+    <url id="income004" path="/post/IncomeController/editIncomeById" val="编辑记账收入信息" allUse="1" method="PUT" groupName="记账收入模块">
+        <property id="rowId" name="id" ref="required" var="记账收入Id"></property>
         <property id="organId" name="organId" ref="required" var="单位Id"></property>
         <property id="operTime" name="operTime" ref="required" var="单据日期"></property>
         <property id="accountId" name="accountId" ref="required" var="账户Id"></property>
@@ -34,28 +34,28 @@
         <property id="changeAmount" name="changeAmount" ref="required,double" var="实收金额"></property>
         <property id="initemStr" name="initemStr" ref="required" var="收入项目列表" />
     </url>
-    <url id="income005" path="/post/IncomeController/deleteIncomeById" val="删除收入单信息" allUse="1" method="DELETE" groupName="收入单模块">
-        <property id="rowId" name="id" ref="required" var="收入单Id"></property>
+    <url id="income005" path="/post/IncomeController/deleteIncomeById" val="删除记账收入信息" allUse="1" method="DELETE" groupName="记账收入模块">
+        <property id="rowId" name="id" ref="required" var="记账收入Id"></property>
     </url>
-    <url id="income006" path="/post/IncomeController/queryIncomeByDetail" val="查询收入单详情" allUse="2" groupName="收入单模块">
-        <property id="rowId" name="id" ref="required" var="收入单Id"></property>
+    <url id="income006" path="/post/IncomeController/queryIncomeByDetail" val="查询记账收入详情" allUse="2" groupName="记账收入模块">
+        <property id="rowId" name="id" ref="required" var="记账收入Id"></property>
     </url>
-    <url id="income007" path="/post/IncomeController/queryMationToExcel" val="导出Excel" allUse="1" groupName="收入单模块">
+    <url id="income007" path="/post/IncomeController/queryMationToExcel" val="导出Excel" allUse="1" groupName="记账收入模块">
         <property id="billNo" name="billNo" ref="" var="单据编号" />
         <property id="startTime" name="startTime" ref="" var="开始日期" />
         <property id="endTime" name="endTime" ref="" var="结束日期" />
     </url>
-    <!-- 收入单管理结束 -->
+    <!-- 记账收入管理结束 -->
 
-    <!-- 支出单管理开始 -->
-    <url id="expenditure001" path="/post/ExpenditureController/queryExpenditureByList" val="查询支出单列表信息" allUse="1" groupName="支出单模块">
+    <!-- 记账支出管理开始 -->
+    <url id="expenditure001" path="/post/ExpenditureController/queryExpenditureByList" val="查询记账支出列表信息" allUse="1" groupName="记账支出模块">
         <property id="billNo" name="billNo" ref="" var="单据编号" />
         <property id="startTime" name="startTime" ref="" var="开始日期" />
         <property id="endTime" name="endTime" ref="" var="结束日期" />
         <property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
         <property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
     </url>
-    <url id="expenditure002" path="/post/ExpenditureController/insertExpenditure" val="添加支出单" allUse="1" method="POST" groupName="支出单模块">
+    <url id="expenditure002" path="/post/ExpenditureController/insertExpenditure" val="添加记账支出" allUse="1" method="POST" groupName="记账支出模块">
         <property id="organId" name="organId" ref="required" var="单位Id"></property>
         <property id="operTime" name="operTime" ref="required" var="单据日期"></property>
         <property id="accountId" name="accountId" ref="required" var="账户Id"></property>
@@ -64,11 +64,11 @@
         <property id="changeAmount" name="changeAmount" ref="required,double" var="实收金额"></property>
         <property id="initemStr" name="initemStr" ref="required,json" var="收入项目列表" />
     </url>
-    <url id="expenditure003" path="/post/ExpenditureController/queryExpenditureToEditById" val="查询支出单用于数据回显" allUse="2" method="GET" groupName="支出单模块">
-        <property id="rowId" name="id" ref="required" var="支出单Id"></property>
+    <url id="expenditure003" path="/post/ExpenditureController/queryExpenditureToEditById" val="查询记账支出用于数据回显" allUse="2" method="GET" groupName="记账支出模块">
+        <property id="rowId" name="id" ref="required" var="记账支出Id"></property>
     </url>
-    <url id="expenditure004" path="/post/ExpenditureController/editExpenditureById" val="编辑支出单信息" allUse="1" method="PUT" groupName="支出单模块">
-        <property id="rowId" name="id" ref="required" var="支出单Id"></property>
+    <url id="expenditure004" path="/post/ExpenditureController/editExpenditureById" val="编辑记账支出信息" allUse="1" method="PUT" groupName="记账支出模块">
+        <property id="rowId" name="id" ref="required" var="记账支出Id"></property>
         <property id="organId" name="organId" ref="required" var="单位Id"></property>
         <property id="operTime" name="operTime" ref="required" var="单据日期"></property>
         <property id="accountId" name="accountId" ref="required" var="账户Id"></property>
@@ -77,18 +77,18 @@
         <property id="changeAmount" name="changeAmount" ref="required,double" var="实收金额"></property>
         <property id="initemStr" name="initemStr" ref="required,json" var="收入项目列表" />
     </url>
-    <url id="expenditure005" path="/post/ExpenditureController/deleteExpenditureById" val="删除支出单信息" allUse="1" method="DELETE" groupName="支出单模块">
-        <property id="rowId" name="id" ref="required" var="支出单Id"></property>
+    <url id="expenditure005" path="/post/ExpenditureController/deleteExpenditureById" val="删除记账支出信息" allUse="1" method="DELETE" groupName="记账支出模块">
+        <property id="rowId" name="id" ref="required" var="记账支出Id"></property>
     </url>
-    <url id="expenditure006" path="/post/ExpenditureController/queryExpenditureByDetail" val="查询支出单详情" allUse="2" groupName="支出单模块">
-        <property id="rowId" name="id" ref="required" var="支出单Id"></property>
+    <url id="expenditure006" path="/post/ExpenditureController/queryExpenditureByDetail" val="查询记账支出详情" allUse="2" groupName="记账支出模块">
+        <property id="rowId" name="id" ref="required" var="记账支出Id"></property>
     </url>
-    <url id="expenditure007" path="/post/ExpenditureController/queryMationToExcel" val="导出Excel" allUse="1" groupName="支出单模块">
+    <url id="expenditure007" path="/post/ExpenditureController/queryMationToExcel" val="导出Excel" allUse="1" groupName="记账支出模块">
         <property id="billNo" name="billNo" ref="" var="单据编号" />
         <property id="startTime" name="startTime" ref="" var="开始日期" />
         <property id="endTime" name="endTime" ref="" var="结束日期" />
     </url>
-    <!-- 支出单管理结束 -->
+    <!-- 记账支出管理结束 -->
 
     <!-- 账套管理开始 -->
     <url id="ifssetofbooks001" path="/post/IfsSetOfBooksController/queryIfsSetOfBooksList" val="查询账套列表信息" allUse="2" method="POST" groupName="账套管理">