From 30c36ac01dc0c87ede5e62c3d71aba46ab2740ab Mon Sep 17 00:00:00 2001
From: chengminglong <123204464@qq.com>
Date: Thu, 12 Jan 2023 16:17:42 +0800
Subject: [PATCH] =?UTF-8?q?2023-01-12=20=E3=80=90=E7=94=A8=E7=AB=A0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F=E8=B0=83=E6=95=B4=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/oa/service/ChapterService.java    |   7 +-
 .../modules/oa/chapter/addChapterApply.jsp    | 126 ++++++++++++++----
 .../views/modules/oa/chapter/chapterCheck.jsp |  16 +--
 .../views/modules/oa/chapter/showChapter.jsp  |  15 ---
 .../modules/oa/chapter/showChapterApply.jsp   |  16 +--
 .../static/assets/js/customjs/form-custom.js  |  25 ----
 6 files changed, 105 insertions(+), 100 deletions(-)

diff --git a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/service/ChapterService.java b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/service/ChapterService.java
index 7390a009..21528a5d 100644
--- a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/service/ChapterService.java
+++ b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/service/ChapterService.java
@@ -895,10 +895,9 @@ public class ChapterService  extends BaseService {
         } else {
             // fengchangming：
             // 9da4420d-508d-421a-9d5a-fe5ab90a0079	长春市宽城区教育局
-            // 702e2007-cd47-4c2b-a05c-a9e0574361cc	法人章
             if (user.getId().equals(yzdjxzbgsdjrId)) {
-                String sql = " id in (select CHAPTER_ID from T_BG_CACHET_CHAPTER where CACHET_ID in " +
-                        "('9da4420d-508d-421a-9d5a-fe5ab90a0079','702e2007-cd47-4c2b-a05c-a9e0574361cc') and DELETE_FLAG = 0) ";
+                String sql = " id in (select CHAPTER_ID from T_BG_CACHET_CHAPTER where CACHET_ID = '9da4420d-508d-421a-9d5a-fe5ab90a0079' " +
+                        "and DELETE_FLAG = 0) ";
                 dc.add(Restrictions.sqlRestriction(sql));
             }
             // wumingtao：
@@ -1518,7 +1517,7 @@ public class ChapterService  extends BaseService {
             scheduleFlowList.add(chapterFlow);
         }
 
-        if (jyjcwsjkId.equals(chapter.getOrgDeptId()) || (chapter.getApplyCapitalFlag() != null && chapter.getApplyCapitalFlag() == 1)){
+        if (jyjcwsjkId.equals(chapter.getOrgDeptId()) || ((chapter.getApplyCapitalFlag() != null && chapter.getApplyCapitalFlag() == 1) || (chapter.getAssetTransferFlag() != null && chapter.getAssetTransferFlag() == 1))){
             //财务初审
             if (StringUtils.isNotBlank(chapter.getFinanceCheckUserFirst())) {
                 ChapterFlow chapterFlow = new ChapterFlow(chapter.getFinanceCheckUserFirst());
diff --git a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/addChapterApply.jsp b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/addChapterApply.jsp
index 31c72a65..e5e78b22 100644
--- a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/addChapterApply.jsp
+++ b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/addChapterApply.jsp
@@ -9,7 +9,7 @@
     function chapterChangeCallBack() {
         var chapterIdsValue = $("#chapterIds").val();
         //包含党组用章
-        if (chapterIdsValue == "4d9c7942-cf29-4621-a652-d17bb707d311") {
+        if (chapterIdsValue.indexOf("4d9c7942-cf29-4621-a652-d17bb707d311") > -1) {
             $("#orgDeptIdId").val("33220B14-6DFA-4946-B1CA-AEE956BA478E");
             $("#orgDeptIdName").val("党政干部办公室");
             $("#orgDeptIdName").attr("disabled","disabled");
@@ -50,10 +50,13 @@
             <input type="hidden" id="orgType" name="orgType" value="0"/>
             <input type="hidden" id="chapterType" name="chapterType" value="${chapter.chapterType}"/>
             <input type="hidden" name="showType" id="showType" value="${showType}">
-            <input type="hidden" name="chapterIds" id="chapterIds">
+            <input type="hidden" name="chapterIds" id="chapterIds" />
+            <input type="hidden" name="personCachetChapterId" id="personCachetChapterId" />
+            <input type="hidden" name="cachetChapterId" id="cachetChapterId" />
+            <input type="hidden" name="partyCacheChapterId" id="partyCacheChapterId" />
             <input type="hidden" name="wxlFlag" id="wxlFlag" value="${not empty chapter.wxlFlag ? chapter.wxlFlag : 0}">
             <input type="hidden" name="applyCapitalFlag" id="applyCapitalFlag" value="${not empty chapter.applyCapitalFlag ? chapter.applyCapitalFlag : 0}">
-            <input type="hidden" name="assetTransferFlag" id="assetTransferFlag" value="${not empty chapter.assetTransferFlag ? chapter.assetTransferFlag : 0}">
+            <input type="hidden" name="assetTransferFlag" id="assetTransferFlag" value="0">
             <input type="hidden" name="jyjfzghkTreeid" id="jyjfzghkTreeid" value="${JYJFZGHKTREEID}">
             <input type="hidden" name="jyjrskTreeid" id="jyjrskTreeid" value="${JYJRSKTREEID}">
             <input type="hidden" name="jyjzbkTreeid" id="jyjzbkTreeid" value="${JYJZBKTREEID}">
@@ -82,7 +85,7 @@
                             <ul id="partyCachetUl" class="nav nav-pills" style="line-height: 0.7;margin-left: 0">
                                 <c:forEach var="cachet" items="${partyCachetList}" varStatus="status">
                                     <li  id="cachet_${cachet.id}" value="${cachet.id}" style="padding-top: 1px">
-                                        <a href="javascript:void(0);" onclick="chooseAllUlSingleli('chapterIds','personCachetUl,cachetUl,partyCachetUl','cachet_${cachet.id}','${cachet.id}',chapterChangeCallBack);">${cachet.cachetName}</a>
+                                        <a href="javascript:void(0);" onclick="chooseAllUlSingleli('chapterIds','partyCachetUl','cachet_${cachet.id}','${cachet.id}',chapterChangeCallBack);">${cachet.cachetName}</a>
                                     </li>
                                 </c:forEach>
                             </ul>
@@ -104,7 +107,7 @@
                             <ul id="cachetUl" class="nav nav-pills" style="line-height: 0.7;margin-left: 0">
                                 <c:forEach var="cachet" items="${cachetList}" varStatus="status">
                                     <li  id="cachet_${cachet.id}" value="${cachet.id}" style="padding-top: 1px">
-                                        <a href="javascript:void(0);" onclick="chooseAllUlSingleli('chapterIds','personCachetUl,cachetUl,partyCachetUl','cachet_${cachet.id}','${cachet.id}',chapterChangeCallBack);">${cachet.cachetName}</a>
+                                        <a href="javascript:void(0);" onclick="chooseAllUlSingleli('chapterIds','cachetUl','cachet_${cachet.id}','${cachet.id}',chapterChangeCallBack);">${cachet.cachetName}</a>
                                     </li>
                                 </c:forEach>
                             </ul>
@@ -126,7 +129,7 @@
                             <ul id="personCachetUl" class="nav nav-pills" style="line-height: 0.7;margin-left: 0">
                                 <c:forEach var="cachet" items="${personCachetList}" varStatus="status">
                                     <li  id="cachet_${cachet.id}" value="${cachet.id}" style="padding-top: 0px">
-                                        <a href="javascript:void(0);" onclick="chooseAllUlSingleli('chapterIds','personCachetUl,cachetUl,partyCachetUl','cachet_${cachet.id}','${cachet.id}',chapterChangeCallBack);">${cachet.cachetName}</a>
+                                        <a href="javascript:void(0);" onclick="chooseAllUlSingleli('chapterIds','personCachetUl','cachet_${cachet.id}','${cachet.id}',chapterChangeCallBack);">${cachet.cachetName}</a>
                                     </li>
                                 </c:forEach>
                             </ul>
@@ -191,26 +194,6 @@
                 </div>
             </div>
 
-            <div class="space-2"></div>
-            <div class="form-group" id="assetTransferBlock">
-                <label class="col-xs-12 col-sm-2 visible-md visible-lg visible-sm hidden-xs no-padding-right" style="text-align: right">
-                    <i class="fa fa-asterisk red" style="font-size: 60% "/>&nbsp;<span id="assetTransferBlockLabel" >资产报废（调拨）用章</span>：</label>
-                <label class="col-xs-12 col-sm-2 hidden-md hidden-lg hidden-sm visible-xs no-padding-right">
-                    <i class="fa fa-asterisk red" style="font-size: 60% "/>&nbsp;<span id="assetTransferBlockLabelmd" >资产报废（调拨）用章</span>：</label>
-
-                <div class="col-xs-12 col-sm-9">
-                    <div class="clearfix col-xs-12 col-sm-12" style="padding-left: 0px;padding-right: 0px;">
-                        <ul id="assetTransfer" class="nav nav-pills" style="line-height: 0.7;margin-left: 0">
-                            <li id="assetTransferFlag0"  value="0" style="padding-top: 2px" <c:if test="${chapter.assetTransferFlag eq 0 or empty chapter.assetTransferFlag}">class="active"</c:if> >
-                                <a href="javascript:void(0);" onclick="chooseAssetTransfer('0');">否</a>
-                            </li>
-                            <li  id="assetTransferFlag1" value="1" style="padding-top: 2px" <c:if test="${chapter.assetTransferFlag eq 1}">class="active"</c:if>>
-                                <a href="javascript:void(0);" onclick="chooseAssetTransfer('1');">是</a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
 
             <div class="space-2"></div>
             <div class="form-group" id="projectTypeBlock">
@@ -340,6 +323,81 @@
 
 <script type="text/javascript">
 
+
+    /**
+     *选择li 选择器
+     * 入参说明：hiddenId：隐藏域ID（需要进行保存的） parentUlId：父节点ID parentUlIds：父节点IDs chooseId：选择ID（需要进行显示选中样式） chooseValue：选择值（需要进行保存的）
+     */
+    function chooseAllUlSingleli(hiddenId, parentUlId, chooseId, chooseValue, callback) {
+
+        var liElement = $("#"+chooseId);
+        var classActive = $(liElement).attr("class");
+        var addValueFlag = false;//是否向隐藏域中拼接值
+
+        if(classActive != null && classActive == 'active'){
+            //点击取消
+            addValueFlag = false;
+        }else{
+            //点击选中
+            addValueFlag = true;
+        }
+
+        var liElements = $("#" + parentUlId + " li");
+        if(liElements.length > 0){
+            for(var j = 0;j < liElements.length;j++){
+                $(liElements[j]).removeClass();
+            }
+        }
+        if (addValueFlag) {
+            $(liElement).addClass("active");
+        }
+        //personCachetUl,cachetUl,partyCachetUl
+        if (parentUlId == "personCachetUl") {
+            if (addValueFlag) {
+                $("#personCachetChapterId").val(chooseValue);
+            } else {
+                $("#personCachetChapterId").val("");
+            }
+        }
+        if (parentUlId == "cachetUl") {
+            if (addValueFlag) {
+                $("#cachetChapterId").val(chooseValue);
+            } else {
+                $("#cachetChapterId").val("");
+            }
+        }
+        if (parentUlId == "partyCachetUl") {
+            if (addValueFlag) {
+                $("#partyCacheChapterId").val(chooseValue);
+            } else {
+                $("#partyCacheChapterId").val("");
+            }
+        }
+
+        var hiddenValue = "";
+        if ($("#personCachetChapterId").val() != "") {
+            hiddenValue += $("#personCachetChapterId").val() + ",";
+        }
+        if ($("#cachetChapterId").val() != "") {
+            hiddenValue += $("#cachetChapterId").val() + ",";
+        }
+        if ($("#partyCacheChapterId").val() != "") {
+            hiddenValue += $("#partyCacheChapterId").val() + ",";
+        }
+
+        if (hiddenValue != "") {
+            hiddenValue = hiddenValue.substring(0,hiddenValue.length - 1);
+        }
+
+        // alert(hiddenValue);
+        //隐藏域中值
+        $('#'+hiddenId).val(hiddenValue);
+
+        if(callback != null){
+            callback(callback);//回调函数
+        }
+    }
+
     jQuery(function () {
         $('[data-rel=popover]').popover({container:'body'});
 
@@ -407,15 +465,26 @@
             $("#wxlFlag").val("0");
         }
 
+
         //装备科
         if(StringIsNotBlank(jyjzbkTreeid) && StringIsNotBlank(orgDeptIdId) && jyjzbkTreeid == orgDeptIdId){
             $("#costBlock").show();
             $("#projectTypeBlock").show();
             $("#applyCapitalBlock").hide();
+            let projectTypeSecondLevel = $("#secondLevel").val();
+            if (projectTypeSecondLevel != null && projectTypeSecondLevel != "") {
+                if (projectTypeSecondLevel == "OT101" || projectTypeSecondLevel == "OT102") {
+                    $("#assetTransferFlag").val("1");
+                } else {
+                    $("#assetTransferFlag").val("0");
+                }
+            }
         }else {
             $("#costBlock").hide();
             $("#projectTypeBlock").hide();
             $("#applyCapitalBlock").show();
+            //切换到非装备科时，资产报废、调拨标识的值设置为0 Modify by Kalman.CHENG ☆ At 2022-12-07
+            $("#assetTransferFlag").val("0");
         }
     }
 
@@ -760,6 +829,11 @@
                 $("#dataType").val(0);
                 $("#applyCapitalFlag").val("0");
             }
+            if (projectTypeSecondLevel == "OT101" || projectTypeSecondLevel == "OT102") {
+                $("#assetTransferFlag").val("1");
+            } else {
+                $("#assetTransferFlag").val("0");
+            }
         }else{
             $("#dataType").val("");
             $("#applyCapitalFlag").val("0");
diff --git a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/chapterCheck.jsp b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/chapterCheck.jsp
index 6c02d2c8..bb483954 100644
--- a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/chapterCheck.jsp
+++ b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/chapterCheck.jsp
@@ -158,21 +158,7 @@
                             </div>
                         </div>
                     </c:if>
-                    <c:if test="${! empty chapter.assetTransferFlag}">
-                        <div class="form-group">
-                            <div class="col-xs-12 col-sm-11">
-                                <div class="attachment-title">
-                                    <span class="blue">资产报废（调拨）用章：</span>
-                                </div>
-                                <div class="pull">
-                                    <div class="col-xs-11">
-                                        <c:if test="${chapter.assetTransferFlag eq 0 or empty chapter.assetTransferFlag}"><span class="orange">否</span></c:if>
-                                        <c:if test="${chapter.assetTransferFlag eq 1}"><span class="green">是</span></c:if>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </c:if>
+
                     <c:if test="${! empty chapter.wxlFlag and (chapter.orgDeptId eq 'B7515DC9-0F5C-4F76-8EC7-BC4740A0E38F' or chapter.orgDeptId eq '717FBE52-9FC4-407B-A719-B79FE6A13AAB') }">
                         <div class="form-group">
                             <div class="col-xs-12 col-sm-11">
diff --git a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/showChapter.jsp b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/showChapter.jsp
index 2ffcd703..7ffb6543 100644
--- a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/showChapter.jsp
+++ b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/showChapter.jsp
@@ -85,21 +85,6 @@
                 </div>
             </div>
         </c:if>
-        <c:if test="${! empty chapter.assetTransferFlag}">
-            <div class="form-group">
-                <div class="col-xs-12 col-sm-11">
-                    <div class="attachment-title">
-                        <span class="blue">资产报废（调拨）用章：</span>
-                    </div>
-                    <div class="pull">
-                        <div class="col-xs-11">
-                            <c:if test="${chapter.assetTransferFlag eq 0 or empty chapter.assetTransferFlag}"><span class="orange">否</span></c:if>
-                            <c:if test="${chapter.assetTransferFlag eq 1}"><span class="green">是</span></c:if>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </c:if>
         <c:if test="${! empty chapter.wxlFlag and (chapter.orgDeptId eq 'B7515DC9-0F5C-4F76-8EC7-BC4740A0E38F' or chapter.orgDeptId eq '717FBE52-9FC4-407B-A719-B79FE6A13AAB') }">
             <div class="form-group">
                 <div class="col-xs-12 col-sm-11">
diff --git a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/showChapterApply.jsp b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/showChapterApply.jsp
index 1cb4c7a7..c57a30e9 100644
--- a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/showChapterApply.jsp
+++ b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/showChapterApply.jsp
@@ -85,21 +85,6 @@
                             </div>
                         </div>
                     </c:if>
-                    <c:if test="${! empty chapter.assetTransferFlag}">
-                        <div class="form-group">
-                            <div class="col-xs-12 col-sm-11">
-                                <div class="attachment-title">
-                                    <span class="blue">资产报废（调拨）用章：</span>
-                                </div>
-                                <div class="pull">
-                                    <div class="col-xs-11">
-                                        <c:if test="${chapter.assetTransferFlag eq 0 or empty chapter.assetTransferFlag}"><span class="orange">否</span></c:if>
-                                        <c:if test="${chapter.assetTransferFlag eq 1}"><span class="green">是</span></c:if>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </c:if>
                     <c:if test="${! empty chapter.wxlFlag and (chapter.orgDeptId eq 'B7515DC9-0F5C-4F76-8EC7-BC4740A0E38F' or chapter.orgDeptId eq '717FBE52-9FC4-407B-A719-B79FE6A13AAB') }">
                         <div class="form-group">
                             <div class="col-xs-12 col-sm-11">
@@ -230,6 +215,7 @@
                                             </c:forEach>
                                         </ul>
 
+
                                     </div>
                                 </div>
                             </div>
diff --git a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/static/assets/js/customjs/form-custom.js b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/static/assets/js/customjs/form-custom.js
index 69109f04..30410561 100644
--- a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/static/assets/js/customjs/form-custom.js
+++ b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/static/assets/js/customjs/form-custom.js
@@ -266,31 +266,6 @@ function chooseUlli(hiddenId ,chooseId, chooseValue, callback) {
     }
 }
 
-/**
- *选择li 选择器
- * 入参说明：hiddenId：隐藏域ID（需要进行保存的） parentUlId：父节点ID chooseId：选择ID（需要进行显示选中样式） chooseValue：选择值（需要进行保存的）
- */
-function chooseAllUlSingleli(hiddenId ,parentUlIds ,chooseId, chooseValue, callback) {
-
-    var parentId_str = parentUlIds.split(",");
-    for (var i = 0; i < parentId_str.length; i++) {
-        var liElements = $("#"+parentId_str[i]+" li");
-        if(liElements.length > 0){
-            for(var j = 0;j < liElements.length;j++){
-                $(liElements[j]).removeClass();
-            }
-        }
-    }
-
-    var liElement = $("#"+chooseId);
-    $(liElement).addClass("active");
-    //隐藏域中值
-    $('#'+hiddenId).val(chooseValue);
-
-    if(callback != null){
-        callback(callback);//回调函数
-    }
-}
 
 /**
  *删除附件（实为隐藏附件div，在确认提交表单时，进行数据库删除）