diff --git a/build.gradle b/build.gradle index c9d4f1d..de5d57b 100644 --- a/build.gradle +++ b/build.gradle @@ -16,8 +16,11 @@ plugins { //https://docs.gradle.org/current/userguide/eclipse_plugin.html //id 'eclipse' //id "org.sonarqube" version "3.5.0.2730" + id 'org.hidetake.ssh' version '2.10.1' } + + apply from: 'config.gradle' def bos = ext.path.bos @@ -111,7 +114,9 @@ allprojects { //所有子工程共用的配置 subprojects { - + + + dependencies { } @@ -142,7 +147,193 @@ subprojects { } test.ignoreFailures true - - + + //打包成 zip + //task buildZip(type: Zip, dependsOn: buildJar) { + // group 'build' + // description '将生成的 JAR 和相关文件打包成 zip' + + // archiveBaseName.set(project.name) + // archiveVersion.set(version) + // archiveExtension.set('zip') + + // // zip 的输出目录 + // destinationDirectory.set(file("${buildDir}/zip")) + + // // 将 build/libs 下的 jar 包加入 zip（默认 buildJar 输出的目录） + // from(outputdir) { + // include '*.jar' + // } + + // // 如果你还有其他资源需要打包，可以继续 from + // // from('src/main/resources') { + // // include '**/*' + // // } + + // // 排除不需要的文件 + // exclude '*sources.jar', '*javadoc.jar', '*cosmic-debug*.jar','zcgj-zcdev-base-common.jar','zcgj-zcdev-base-helper.jar' + //} + + // 打包 zcdev-pr.zip + task zipPr(type: Zip) { + group 'build' + description '将生成的 JAR 和相关文件打包成 zip' + + archiveBaseName.set(project.name) + archiveVersion.set(version) + archiveExtension.set('zip') + archiveFileName = 'zcdev-pr.zip' + // zip 的输出目录 + destinationDirectory.set(file("${buildDir}/zip")) + + // 将 build/libs 下的 jar 包加入 zip（默认 buildJar 输出的目录） + from(outputdir) { + include 'zcgj-zcdev-zcdev-pr.jar' + } + + // 如果你还有其他资源需要打包，可以继续 from + // from('src/main/resources') { + // include '**/*' + // } + + // 排除不需要的文件 + exclude '*sources.jar', '*javadoc.jar', '*cosmic-debug*.jar','zcgj-zcdev-base-common.jar','zcgj-zcdev-base-helper.jar' + + } + + // 打包 zcdev-fs.zip + task zipFs(type: Zip) { + group 'build' + description '将生成的 JAR 和相关文件打包成 zip' + + archiveBaseName.set(project.name) + archiveVersion.set(version) + archiveExtension.set('zip') + archiveFileName = 'zcdev-fs.zip' + // zip 的输出目录 + destinationDirectory.set(file("${buildDir}/zip")) + + // 将 build/libs 下的 jar 包加入 zip（默认 buildJar 输出的目录） + from(outputdir) { + include 'zcgj-zcdev-zcdev-fs.jar' + } + + // 如果你还有其他资源需要打包，可以继续 from + // from('src/main/resources') { + // include '**/*' + // } + + // 排除不需要的文件 + exclude '*sources.jar', '*javadoc.jar', '*cosmic-debug*.jar','zcgj-zcdev-base-common.jar','zcgj-zcdev-base-helper.jar' + + } + + // 一次执行全部 zip（可选） + task zipAll(dependsOn: ['buildJar','zipPr', 'zipFs']) { + group 'build' + description '同时生成 zcdev-pr.zip 和 zcdev-fs.zip' + } + + // ======================= + // SSH 服务器配置 + // ======================= + remotes { + myServer { + host = '172.31.195.232' + user = 'jcroot' + password = 'Nxjc#311.com' + port = 22 + knownHosts = allowAnyHosts // <—— 关键 + } + myServerPrd { + host = '10.244.17.33' + user = 'jcroot' + password = 'Nxjc#311.com' + port = 22 + knownHosts = allowAnyHosts // <—— 关键 + } + } + // ======================= + // 上传任务 + // ======================= + def remoteTargetDir = "/kingdee/cosmic/nginx-appstatic/store/appstatic/appstore/cosmic/cus" + def remoteTargetDirPrd = "/mnt/nfs/nginxshare/appstatic/appstore/cosmic/cus" + + // 上传 zcdev-pr.zip + task testuploadPr(dependsOn: zipPr) { + group 'deploy' + description '打包 PR ZIP 并上传到远程服务器' + + doLast { + ssh.run { + session(remotes.myServer) { + sftp { + put from: "${buildDir}/zip/zcdev-pr.zip", into: remoteTargetDir + } + } + } + } + } + + // 上传 zcdev-fs.zip + task testuploadFs(dependsOn: zipFs) { + group 'deploy' + description '打包 FS ZIP 并上传到远程服务器' + + doLast { + ssh.run { + session(remotes.myServer) { + sftp { + put from: "${buildDir}/zip/zcdev-fs.zip", into: remoteTargetDir + } + } + } + } + } + + // 一键上传全部 + task a_testuploadAll(dependsOn: ['buildJar','zipPr', 'zipFs','testuploadPr', 'testuploadFs']) { + group 'deploy' + description '一次构建并上传 PR + FS zip' + } + + //正式环境 + // 上传 zcdev-pr.zip + task PrduploadPr(dependsOn: zipPr) { + group 'deploy' + description '打包 PR ZIP 并上传到远程服务器' + + doLast { + ssh.run { + session(remotes.myServerPrd) { + sftp { + put from: "${buildDir}/zip/zcdev-pr.zip", into: remoteTargetDirPrd + } + } + } + } + } + + // 上传 zcdev-fs.zip + task PrduploadFs(dependsOn: zipFs) { + group 'deploy' + description '打包 FS ZIP 并上传到远程服务器' + + doLast { + ssh.run { + session(remotes.myServerPrd) { + sftp { + put from: "${buildDir}/zip/zcdev-fs.zip", into: remoteTargetDirPrd + } + } + } + } + } + + // 一键上传全部 + task PrduploadAll(dependsOn: ['buildJar','zipPr', 'zipFs','PrduploadPr', 'PrduploadFs']) { + group 'deploy' + description '一次构建并上传 PR + FS zip' + } } diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimcostcbsbillEditUIExt.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimcostcbsbillEditUIExt.java index e2d6198..a6e1360 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimcostcbsbillEditUIExt.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/form/AimcostcbsbillEditUIExt.java @@ -353,6 +353,23 @@ public class AimcostcbsbillEditUIExt extends AbstractEccoBillPlugin implements B entryColl.add(newValue); } } + DynamicObjectCollection newInfundprojectEntry = this.getModel().getDataEntity(true).getDynamicObjectCollection("zcgj_infundproject_entry"); + //上期项目收入预算 + DynamicObjectCollection infundprojectEntry = project.getDynamicObjectCollection("zcgj_infundproject_entry"); + if(!infundprojectEntry.isEmpty()) { + for (DynamicObject dynamicObject : infundprojectEntry) { + DynamicObject dynamicObject1 = newInfundprojectEntry.addNew(); + dynamicObject1.set("zcgj_in_fundproject",dynamicObject.getDynamicObject("zcgj_in_fundproject")); + dynamicObject1.set("zcgj_yearcount",dynamicObject.getBigDecimal("zcgj_yearcount")); + dynamicObject1.set("zcgj_in_price",dynamicObject.getBigDecimal("zcgj_in_price")); + dynamicObject1.set("zcgj_yearamount",dynamicObject.getBigDecimal("zcgj_yearamount")); + dynamicObject1.set("zcgj_yearrecamount",dynamicObject.getBigDecimal("zcgj_yearrecamount")); + dynamicObject1.set("zcgj_in_remarks",dynamicObject.getBigDecimal("zcgj_in_remarks")); + dynamicObject1.set("zcgj_in_seq",dynamicObject.getBigDecimal("zcgj_in_seq")); + + } + this.getView().updateView("zcgj_infundproject_entry"); + } newInfo.set("treeentryentity", entryColl); this.adjustAddNewCbs(project, entryColl, idMap); diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaintenanceackbillCBSCkOp.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaintenanceackbillCBSCkOp.java index d3ed3bf..f82c6df 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaintenanceackbillCBSCkOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/MaintenanceackbillCBSCkOp.java @@ -37,7 +37,7 @@ public class MaintenanceackbillCBSCkOp extends AbstractOperationServicePlugIn { DynamicObject dataEntity = extendedDataEntity.getDataEntity(); DynamicObjectCollection entryentity = dataEntity.getDynamicObjectCollection("entryentity");//设备维修信息 String zcgjMaintype = dataEntity.getString("zcgj_maintype"); - if("20".equals(zcgjMaintype)) { + //if("20".equals(zcgjMaintype)) { if(entryentity == null || entryentity.isEmpty()){ this.addFatalErrorMessage(extendedDataEntity, "设备维修信息分录不能为空！"); }else{ @@ -57,7 +57,7 @@ public class MaintenanceackbillCBSCkOp extends AbstractOperationServicePlugIn { } } - } + //} } } }