intellioa
/
base-project
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

用章管理、用章登记、项目登记相关业务需求调整 modify by Kalman.CHENG ☆ At 2022-11-10

Browse Source
develop
chengminglong 3 years ago
parent 57aae2723b
commit b9cc03bf15
8 changed files with 745 additions and 519 deletions
Show Stats Download Patch File Download Diff File

15
长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/entity/Chapter.java
Unescape View File

@ -273,6 +273,13 @@ public class Chapter implements Serializable {
*/
@Column(name = "APPLY_CAPITAL_FLAG")
private Integer applyCapitalFlag;
/**
* 是否为资产报废（需要提交到财务审计审核）
*/
@Column(name = "ASSET_TRANSFER_FLAG")
private Integer assetTransferFlag;
/**
* 财审科初审人
*/
@ -815,6 +822,14 @@ public class Chapter implements Serializable {
this.applyCapitalFlag = applyCapitalFlag;
}
public Integer getAssetTransferFlag() {
return assetTransferFlag;
}
public void setAssetTransferFlag(Integer assetTransferFlag) {
this.assetTransferFlag = assetTransferFlag;
}
public String getFinanceCheckUserFirst() {
return this.financeCheckUserFirst;
}

39
长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/service/ChapterService.java
Unescape View File

@ -271,6 +271,11 @@ public class ChapterService extends BaseService {
applyCapitalFlag = StringUtils.isNotBlank(applyCapitalFlag) ? applyCapitalFlag : "0";//默认为否
chapter.setApplyCapitalFlag(Integer.parseInt(applyCapitalFlag));
//增加是否为资产报废（调拨）用章（0否1是）,如果是的话需要走财审流程
String assetTransferFlag = paramMap.get("assetTransferFlag");
assetTransferFlag = StringUtils.isNotBlank(assetTransferFlag) ? assetTransferFlag : "0";
chapter.setAssetTransferFlag(Integer.parseInt(assetTransferFlag));
String orgDeptTreeId = paramMap.get("orgDeptId");
if(StringUtils.isNotBlank(orgDeptTreeId)){
String orgDeptId = OrgUtil.getOrgIdByOrgTreeId(orgDeptTreeId);
@ -630,7 +635,7 @@ public class ChapterService extends BaseService {
String checkFlow = "0"; // 1-业务局长(结束) 2-业务局长（开始财审） 3-财务局长（结束）
if (chapter.getState() == 2 && user.getId().equalsIgnoreCase(chapter.getApprovalUser())){
// 业务局长
if (!orgDeptTreeId.equalsIgnoreCase(JYJCWSJKTREEID) && chapter.getApplyCapitalFlag() == 1) {
if (!orgDeptTreeId.equalsIgnoreCase(JYJCWSJKTREEID) && (chapter.getApplyCapitalFlag() == 1 || chapter.getAssetTransferFlag() == 1)) {
// 业务局长（开始财审）
checkFlow = "2";
}else{
@ -881,6 +886,38 @@ public class ChapterService extends BaseService {
// dc.addOrder(Order.asc("state")).addOrder(Order.desc("applyTime"));
dc.addOrder(Order.desc("applyTime"));
String yzdjxzbgsdjrId = sysConfigService.getSysConfigValueByKey("YZDJXZBGSDJRID"); //行政办公室 fengchangming
String yzdjdzbgsfzrwmtId = sysConfigService.getSysConfigValueByKey("YZDJDZBGSFZRWMTID"); //党政办公室 wumingtao
String yzdjdzbgsfzrlyfId = sysConfigService.getSysConfigValueByKey("YZDJDZBGSFZRLYFID"); //党政办公室 liyufeng
if (!user.getId().equals(yzdjxzbgsdjrId) && !user.getId().equals(yzdjdzbgsfzrwmtId) && !user.getId().equals(yzdjdzbgsfzrlyfId)) {
dc.add(Restrictions.sqlRestriction(" 1 = 0 "));
} 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) ";
dc.add(Restrictions.sqlRestriction(sql));
}
// wumingtao：
// 4d9c7942-cf29-4621-a652-d17bb707d311 中共长春市宽城区教育局党组
// e1a424b4-4cf2-4c9d-a575-9958d00c1009 中共宽城区委教育工作委员会
if (user.getId().equals(yzdjdzbgsfzrwmtId)) {
String sql = " id in (select CHAPTER_ID from T_BG_CACHET_CHAPTER where CACHET_ID in " +
"('4d9c7942-cf29-4621-a652-d17bb707d311','e1a424b4-4cf2-4c9d-a575-9958d00c1009') and DELETE_FLAG = 0) ";
dc.add(Restrictions.sqlRestriction(sql));
}
// liyufeng：
// 88cfb082-7aab-4f1f-95f5-020625697831 中国教育工会长春市宽城区委员会
if (user.getId().equals(yzdjdzbgsfzrlyfId)) {
String sql = " id in (select CHAPTER_ID from T_BG_CACHET_CHAPTER where CACHET_ID = '88cfb082-7aab-4f1f-95f5-020625697831' " +
"and DELETE_FLAG = 0) ";
dc.add(Restrictions.sqlRestriction(sql));
}
}
return chapterDao.find(page, dc);
}

45
长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/addChapterApply.jsp
Unescape View File

@ -9,7 +9,7 @@
function chapterChangeCallBack() {
var chapterIdsValue = $("#chapterIds").val();
//包含党组用章
if (chapterIdsValue.indexOf("4d9c7942-cf29-4621-a652-d17bb707d311") != -1) {
if (chapterIdsValue == "4d9c7942-cf29-4621-a652-d17bb707d311") {
$("#orgDeptIdId").val("33220B14-6DFA-4946-B1CA-AEE956BA478E");
$("#orgDeptIdName").val("党政干部办公室");
$("#orgDeptIdName").attr("disabled","disabled");
@ -17,7 +17,10 @@
//不包含党组用章的情况
else {
$("#orgDeptIdName").removeAttr("disabled");
$("#orgDeptIdId").val("");
$("#orgDeptIdName").val("");
}
chooseTheDept();
}
</script>
<body>
@ -50,6 +53,7 @@
<input type="hidden" name="chapterIds" id="chapterIds">
<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="jyjfzghkTreeid" id="jyjfzghkTreeid" value="${JYJFZGHKTREEID}">
<input type="hidden" name="jyjrskTreeid" id="jyjrskTreeid" value="${JYJRSKTREEID}">
<input type="hidden" name="jyjzbkTreeid" id="jyjzbkTreeid" value="${JYJZBKTREEID}">
@ -78,7 +82,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="chooseUlli('chapterIds','cachet_${cachet.id}','${cachet.id}',chapterChangeCallBack);">${cachet.cachetName}</a>
<a href="javascript:void(0);" onclick="chooseAllUlSingleli('chapterIds','personCachetUl,cachetUl,partyCachetUl','cachet_${cachet.id}','${cachet.id}',chapterChangeCallBack);">${cachet.cachetName}</a>
</li>
</c:forEach>
</ul>
@ -100,7 +104,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="chooseUlli('chapterIds','cachet_${cachet.id}','${cachet.id}',chapterChangeCallBack);">${cachet.cachetName}</a>
<a href="javascript:void(0);" onclick="chooseAllUlSingleli('chapterIds','personCachetUl,cachetUl,partyCachetUl','cachet_${cachet.id}','${cachet.id}',chapterChangeCallBack);">${cachet.cachetName}</a>
</li>
</c:forEach>
</ul>
@ -122,7 +126,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="chooseUlli('chapterIds','cachet_${cachet.id}','${cachet.id}',chapterChangeCallBack);">${cachet.cachetName}</a>
<a href="javascript:void(0);" onclick="chooseAllUlSingleli('chapterIds','personCachetUl,cachetUl,partyCachetUl','cachet_${cachet.id}','${cachet.id}',chapterChangeCallBack);">${cachet.cachetName}</a>
</li>
</c:forEach>
</ul>
@ -187,6 +191,27 @@
</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">
<label class="col-xs-12 col-sm-2 visible-md visible-lg visible-sm hidden-xs no-padding-right" style="text-align: right">
@ -418,6 +443,18 @@
}
}
function chooseAssetTransfer(assetTransferFlag){
if(assetTransferFlag == "0"){
$("#assetTransferFlag").val("0");
$("#assetTransferFlag0").addClass("active");
$("#assetTransferFlag1").removeClass("active");
}else if (assetTransferFlag == "1"){
$("#assetTransferFlag").val("1");
$("#assetTransferFlag0").removeClass("active");
$("#assetTransferFlag1").addClass("active");
}
}
function setProjectTaskProperties(){
var projectTaskIdName = $("#projectTaskIdName").val();
if (StringIsNotBlank(projectTaskIdName)){

15
长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/chapterCheck.jsp
Unescape View File

@ -158,6 +158,21 @@
</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">

15
长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/showChapter.jsp
Unescape View File

@ -85,6 +85,21 @@
</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">

15
长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/WEB-INF/views/modules/oa/chapter/showChapterApply.jsp
Unescape View File

@ -85,6 +85,21 @@
</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">

27
长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/webapp/static/assets/js/customjs/form-custom.js
Unescape View File

@ -265,6 +265,33 @@ function chooseUlli(hiddenId ,chooseId, chooseValue, callback) {
callback(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，在确认提交表单时，进行数据库删除）
*/

65
长春市宽城区项目办公系统/base-parent-cckc/business_project_cckc_v31/src/main/webapp/WEB-INF/views/modules/project/toSealProject.jsp
Unescape View File

@ -87,7 +87,72 @@
readonly><c:if test="${task.taskType ne 0}">${formValue.itemValue13}</c:if><c:if test="${task.taskType eq 0}">${formValue.itemValue3}</c:if></textarea>
</td>
</tr>
<c:if test="${task.taskType ne 0}">
<tr>
<td colspan="6">
<table class="tqFromTable" boder="0" cellpadding="0" cellspacing="0">
<tr>
<td class="table-title" width="20%">资金来源</td>
<td class="table-title" width="13%">市级以上投资</td>
<td class="table-title" width="13%">区级投资</td>
<td class="table-title" width="13%">生均</td>
<td class="table-title" width="13%">收费</td>
<td class="table-title" width="13%">其他</td>
<td class="table-title" width="13%">小计</td>
</tr>
<tr>
<td class="table-content">
计划投资(万元)
</td>
<td class="table-content">
${formValue.itemValue15}
</td>
<td class="table-content">
${formValue.itemValue16}
</td>
<td class="table-content">
${formValue.itemValue17}
</td>
<td class="table-content">
${formValue.itemValue18}
</td>
<td class="table-content">
${formValue.itemValue19}
</td>
<td class="table-content">
${formValue.itemValue20}
</td>
</tr>
<c:if test="${task.dataType eq 1}">
<tr>
<td class="table-content">
申请支付(万元)
</td>
<td class="table-content">
${formValue.itemValue5}
</td>
<td class="table-content">
${formValue.itemValue6}
</td>
<td class="table-content">
${formValue.itemValue7}
</td>
<td class="table-content">
${formValue.itemValue8}
</td>
<td class="table-content">
${formValue.itemValue9}
</td>
<td class="table-content">
${formValue.itemValue10}
</td>
</tr>
</c:if>
</table>
</td>
</tr>
</c:if>
<tr>
<td class="table-title">
党委章（枚）

Write Preview
Loading…
Cancel
Save