diff --git a/config/nginx.conf0914 b/config/nginx.conf0914 new file mode 100644 index 00000000..90bf817a --- /dev/null +++ b/config/nginx.conf0914 @@ -0,0 +1,96 @@ + +user nginx; +worker_processes auto; + +error_log /var/log/nginx/error.log notice; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + + + + + +http { +include mime.types; +default_type application/octet-stream; +server_tokens off; + +log_format main '$remote_addr - $remote_user [$time_local] "$request" ' +'$status $body_bytes_sent "$http_referer" ' +'"$http_user_agent" "$http_x_forwarded_for"'; + +#access_log logs/access.log main; +sendfile on; +#tcp_nopush on; + +#keepalive_timeout 0; +keepalive_timeout 65; +client_max_body_size 100M; +client_body_buffer_size 100M; +fastcgi_buffer_size 128k; +fastcgi_buffers 8 128k; +fastcgi_busy_buffers_size 128k; +fastcgi_temp_file_write_size 128k; +#gzip on; + +server { +listen 80; +server_name localhost; +charset utf-8; + +location / { + # 网站根目录，此处使用容器内的路径 + root /usr/local/www/dist; + # 默认首页 + index index.html; + # 尝试从磁盘找到请求的文件，如果不存在则跳转到 index.html + try_files $uri $uri/ /index.html; + } + +location /APP { + # 网站根目录，此处使用容器内的路径 + alias /usr/local/www/APP; + # 尝试从磁盘找到请求的文件，如果不存在则跳转到 index.html + #index cqjj.apk; + # try_files $uri $uri/ /index.html; + } + +location /bigScrap { + # 网站根目录，此处使用容器内的路径 + alias /usr/local/www/bigScrap; + # 默认首页 + index index01.html; + # 尝试从磁盘找到请求的文件，如果不存在则跳转到 index.html + try_files $uri $uri/ /bigScrap/index01.html; + } + +location /dev-api/ { + #rewrite ^.+api/?(.*)$ /$1 break; #这样写有问题,在网上看有人这样写，发现有问题 + rewrite ^/dev-api/(.*)$ /$1 break; #必须的写这个，使用nginx的rewrite对uri进行重写 下面这行也要改为api + proxy_pass http://192.168.1.2:28080/; #跨域转发路由地址 + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + +location /screen/ { + #rewrite ^.+api/?(.*)$ /$1 break; #这样写有问题,在网上看有人这样写，发现有问题 + rewrite ^/screen/(.*)$ /$1 break; #必须的写这个，使用nginx的rewrite对uri进行重写 下面这行也要改为api + proxy_pass http://192.168.1.2:28080/; #跨域转发路由地址 + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + +} + + +} + diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index d3c2b4a2..97a5297b 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -603,11 +603,11 @@ GROUP BY tt.task_id order by case when #{record.orderStatus} = 0 then tt.update_time - when #{record.orderStatus} = 1 then tt.update_time + when #{record.orderStatus} = 1 or #{record.orderStatus} is null then tt.update_time when #{record.orderStatus} = 2 then tt.task_status when #{record.orderStatus} = 3 then tt.task_status end - + desc @@ -1051,7 +1051,7 @@ ELSE IFNULL(mt.num, 0) END as num, - (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode + (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,subquery0.ma_code as maCode FROM lease_apply_details lad LEFT JOIN ma_type mt ON lad.type_id = mt.type_id diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java index bf75bae8..2cda14d2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/AgreementInfo.java @@ -135,4 +135,6 @@ public class AgreementInfo extends BaseEntity { @ApiModelProperty(value = "导出选中列表") private List dataCondition; + private Integer isCommit; + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java index fa540eb0..dbdc9098 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/SltAgreementInfoMapper.java @@ -34,6 +34,7 @@ public interface SltAgreementInfoMapper { int insApply(SltAgreementApply apply); int insRelation(SltAgreementRelation relation); + int upRelation(SltAgreementRelation relation); int insDetails(SltAgreementInfo info); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java index 3f7ba614..2686fe89 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java @@ -88,27 +88,34 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { public int settlementReview(SltAgreementApply apply) { Long userid = SecurityUtils.getLoginUser().getUserid(); apply.setAuditor(String.valueOf(userid)); - int i = sltAgreementInfoMapper.updateRelation(apply); - int j = 0; - if (i > 0) { - List relations = sltAgreementInfoMapper.getRelations(apply); - List infos = new ArrayList<>(); - for (SltAgreementRelation bean : relations) { - AgreementInfo info = new AgreementInfo(); - info.setAgreementId(Long.valueOf(bean.getAgreementId())); - infos.add(info); - } - List loseList = getLoseList(infos); - for (SltAgreementInfo agreementInfo : loseList) { - if (agreementInfo.getMaId() != null && agreementInfo.getMaId().isEmpty()) { - agreementInfo.setStatus("103"); - sltAgreementInfoMapper.updateMaStatus(agreementInfo); - } - } + int j; + if ("2".equals(apply.getStatus())) { + // 驳回 + int i = sltAgreementInfoMapper.updateRelation(apply); j = sltAgreementInfoMapper.updateApply(apply); } else { - throw new ServiceException("结算审核失败"); - //throw new ServiceException(ExceptionDict.SETTLEMENT_REVIEW_ERROR_MSG,ExceptionDict.SETTLEMENT_REVIEW_ERROR); + // 通过 + int i = sltAgreementInfoMapper.updateRelation(apply); + if (i > 0) { + List relations = sltAgreementInfoMapper.getRelations(apply); + List infos = new ArrayList<>(); + for (SltAgreementRelation bean : relations) { + AgreementInfo info = new AgreementInfo(); + info.setAgreementId(Long.valueOf(bean.getAgreementId())); + infos.add(info); + } + List loseList = getLoseList(infos); + for (SltAgreementInfo agreementInfo : loseList) { + if (agreementInfo.getMaId() != null && agreementInfo.getMaId().isEmpty()) { + agreementInfo.setStatus("103"); + sltAgreementInfoMapper.updateMaStatus(agreementInfo); + } + } + j = sltAgreementInfoMapper.updateApply(apply); + } else { + throw new ServiceException("结算审核失败"); + //throw new ServiceException(ExceptionDict.SETTLEMENT_REVIEW_ERROR_MSG,ExceptionDict.SETTLEMENT_REVIEW_ERROR); + } } return j; } @@ -181,6 +188,7 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService { list.add(info); relation.setApplyId(String.valueOf(apply.getId())); sltAgreementInfoMapper.updateInfoStatus(relation.getAgreementId()); + sltAgreementInfoMapper.upRelation(relation); int j = sltAgreementInfoMapper.insRelation(relation); if (j < 0) { throw new ServiceException("新增协议结算记录失败"); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml index ef30d645..f19f535c 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml @@ -91,11 +91,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where agreement_id = #{agreementId} and type_id = #{typeId} + + update slt_agreement_relation + set is_commit = 1 + where agreement_id = #{agreementId} + diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue index a4b7f935..e05c49e1 100644 --- a/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue +++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue @@ -140,6 +140,7 @@ 未结算 已结算 已审核 + 已驳回 结算申请 @@ -220,6 +221,7 @@ export default { { id: '1', name: '未结算' }, { id: '2', name: '已结算' }, { id: '3', name: '已审核' }, + { id: '4', name: '已驳回' }, ], //集合 // 表格数据 agreementList: [], @@ -235,6 +237,7 @@ export default { pageSize: 10, keyWord: undefined, sltStatus: '', + isCommit:'', unitId: '', projectId: '', }, diff --git a/sgzb-ui/src/views/cost/csotSettlement/costList.vue b/sgzb-ui/src/views/cost/csotSettlement/costList.vue index 56bec74c..e5e18b76 100644 --- a/sgzb-ui/src/views/cost/csotSettlement/costList.vue +++ b/sgzb-ui/src/views/cost/csotSettlement/costList.vue @@ -152,7 +152,7 @@ > @@ -218,6 +218,7 @@ export default { pageSize: 10, keyWord: undefined, sltStatus: '', + isCommit: '', unitId: '', projectId: '', },