weizhiqiang1995/erp-pro
1
1
Fork 0
mirror of https://github.com/weizhiqiang1995/erp-pro.git synced 2025-01-17 04:40:09 +08:00
Code Issues Projects Releases Packages Wiki Activity

修改账户流水样式与流水查询SQL语句，添加事务注解

Browse source
This commit is contained in:
3038696639@qq.com 2019-10-16 14:13:09 +08:00
parent 93d3546dc6
commit 9e99b78c22
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
erp-modular/src/main/java/com/skyeye/service/impl/AccountServiceImpl.java
View file

@ -97,6 +97,7 @@ public class AccountServiceImpl implements AccountService {
* @throws Exception
*/
@Override
@Transactional(value="transactionManager")
public void deleteAccountById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> params = inputObject.getParams();
params.put("userId", inputObject.getLogParams().get("id"));
@ -111,6 +112,7 @@ public class AccountServiceImpl implements AccountService {
* @throws Exception
*/
@Override
@Transactional(value="transactionManager")
public void editAccountById(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> params = inputObject.getParams();
params.put("userId", inputObject.getLogParams().get("id"));
@ -140,6 +142,7 @@ public class AccountServiceImpl implements AccountService {
* @throws Exception
*/
@Override
@Transactional(value="transactionManager")
public void editAccountByIdAndIsDefault(InputObject inputObject, OutputObject outputObject) throws Exception {
Map<String, Object> params = inputObject.getParams();
params.put("userId", inputObject.getLogParams().get("id"));

2
erp-modular/src/main/resources/dbmapper/erp/AccountMapper.xml
View file

@ -176,6 +176,7 @@
d.account_id = #{id}
AND d.tenant_id = #{userId}
AND d.delete_flag = 0
AND d.sub_type NOT IN(10,11)
</select>
<select id="queryAccountListToSelect" parameterType="java.util.Map" resultType="java.util.Map">
@ -199,5 +200,6 @@
WHERE
d.account_id = #{id}
AND d.tenant_id = #{userId}
AND d.sub_type NOT IN(10,11)
</select>
</mapper>

8
erp-modular/src/main/resources/template/js/account/accountitem.js
View file

@ -21,7 +21,7 @@ layui.config({
cols: [[
{ title: '序号', type: 'numbers'},
{ field: 'number', title: '票据号', align: 'center',width: 200},
{ field: 'type', title: '类型', align: 'center',width: 150, templet: function (d) {
{ field: 'type', title: '类型', align: 'center',width: 80, templet: function (d) {
if(d.type == '1'){
return "<span class='state-down'>出库</span>";
}else if(d.type == '2'){
@ -30,7 +30,7 @@ layui.config({
return "<span class='state-error'>参数错误</span>";
}
}},
{ field: 'subType', title: '出入库分类', align: 'left',width: 150, templet: function(d){
{ field: 'subType', title: '出入库分类', align: 'left',width: 100, templet: function(d){
if(d.subType == '1'){
return "<span class='state-up'>入库</span>";
}else if(d.subType == '2'){
@ -55,7 +55,7 @@ layui.config({
return "<span class='state-error'>参数错误</span>";
}
}},
{ field: 'status', title: '状态', align: 'left',width: 150, templet: function (d) {
{ field: 'status', title: '状态', align: 'left',width: 120, templet: function (d) {
if(d.status == '0'){
return "<span class='state-error'>未审核</span>";
}else if(d.status == '1'){
@ -69,7 +69,7 @@ layui.config({
}
}},
{ field: 'totalPrice', title: '合计金额', align: 'left',width: 100},
{ field: 'payType', title: '付款类型', align: 'center',width: 100, templet: function (d) {
{ field: 'payType', title: '付款类型', align: 'center',width: 80, templet: function (d) {
if(d.payType == '1'){
return "<span class='state-up'>现金</span>";
}else if(d.payType == '2'){