diff --git a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/entity/Chapter.java b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/entity/Chapter.java
index 81627ca8..400f85fc 100644
--- a/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/entity/Chapter.java
+++ b/长春市宽城区项目办公系统/base-parent-cckc/business_bg_cckc_v31/src/main/java/com/dsideal/modules/oa/entity/Chapter.java
@@ -20,7 +20,7 @@ import org.hibernate.search.annotations.Store;
/**
* 公章使用登记
- *
+ *
* @author chaisw
* @date 2014-8-26
*/
@@ -35,12 +35,12 @@ public class Chapter implements Serializable {
/**
* 主键标识
*/
- @Id
- @GenericGenerator(name="idGenerator", strategy="org.hibernate.id.UUIDGenerator")
- @GeneratedValue(generator="idGenerator")
- @Column(name = "ID")
+ @Id
+ @GenericGenerator(name="idGenerator", strategy="org.hibernate.id.UUIDGenerator")
+ @GeneratedValue(generator="idGenerator")
+ @Column(name = "ID")
private String id;
-
+
/**
* 编号
*/
@@ -53,23 +53,23 @@ public class Chapter implements Serializable {
private String chapterContent;
/**
- * 印章类型（0：公章 1：名章）
- */
- @Column(name = "CHAPTER_TYPE")
- private int chapterType;
+ * 印章类型（0：公章 1：名章）
+ */
+ @Column(name = "CHAPTER_TYPE")
+ private int chapterType;
- /**
- * 印章所属（0：教育局 1：学校）
- */
- @Column(name = "ORG_TYPE")
- private int orgType;
+ /**
+ * 印章所属（0：教育局 1：学校）
+ */
+ @Column(name = "ORG_TYPE")
+ private int orgType;
/**
* 用章枚数
*/
@Column(name = "CHAPTER_NUM")
private int chapterNum;
-
+
/**
* 申请人（经手人）
*/
@@ -78,46 +78,46 @@ public class Chapter implements Serializable {
@Transient
private String applyUserName;
- /**
- * 印章所属机构Id
- */
- @Column(name = "ORG_DEPT_ID")
- private String orgDeptId;
- /**
- * 印章所属机构名称
- */
- @Transient
- private String orgDeptName;
+ /**
+ * 印章所属机构Id
+ */
+ @Column(name = "ORG_DEPT_ID")
+ private String orgDeptId;
+ /**
+ * 印章所属机构名称
+ */
+ @Transient
+ private String orgDeptName;
/**
* 申请人部门
*/
@Column(name = "APPLY_DEPT")
private String applyDept;
-
+
@Transient
private String applyDeptName;
-
+
/**
* 申请时间
*/
@Column(name = "APPLY_TIME")
private Date applyTime;
-
+
/**
* 审核人
*/
@Column(name = "CHECK_USER")
private String checkUser;
-
+
@Transient
private String checkUserName;
-
+
/**
* 审核日期
*/
@Column(name = "CHECK_TIME")
private Date checkTime;
-
+
/**
* 审核意见
*/
@@ -165,28 +165,28 @@ public class Chapter implements Serializable {
*/
@Column(name = "APPROVAL_USER")
private String approvalUser;
-
+
@Transient
private String approvalUserName;
-
+
/**
* 审批日期
*/
@Column(name = "APPROVAL_TIME")
private Date approvalTime;
-
+
/**
* 审批意见
*/
@Column(name = "APPROVAL_OPINION")
private String approvalOpinion;
-
+
/**
* 备注
*/
@Column(name = "REMARKS")
private String remarks;
-
+
/**
* 删除标识（0：未删除 1:删除）
*/
@@ -201,34 +201,34 @@ public class Chapter implements Serializable {
/**
* 状态状态（
- 0 关闭;
- （申请）1 提交;
- （初审）8 、18 维修初审、财务初审通过;9 、19 维修初审、财务初审不通过
- （科长审核）2 、12、22(财审科长) 审核通过;3、13、23 审核不通过 -- 20220615（姜宏退休，在初审、审核之间再添加审核环节-22，23）
- （财审科复审）20（带有财务审计）复审通过; 21 复审不通过 -- 20190624(马岩兼任财审科长在初审、审核之后再添加复审环节)
- （局领导审批）4 审批通过;（代表全部完成)
- （局领导审批）14（带有财务审计）审批通过;
- （局领导审批）5、15 审批不通过
-
- 6 登记借出;
- 7 登记返还
-
-
- 1、提交到不涉及初审科室、不涉及财审（非请款报告）：1 -> 2/3 -> 4/5 -> 6 -> 7
- 2、提交到涉及初审科室、不涉及财审（非请款报告）：1 -> 8/9 -> 2/3 -> 4/5 -> 6 -> 7
- 3、提交到不涉及初审科室、涉及财审（请款报告）：1 -> 2/3 -> 14/15 -> 18/19 ->（22/23->） 12/13 -> 20/21 -> 4/5 -> 6 -> 7
- 4、提交到涉及初审科室、涉及财审（请款报告）：1 -> 8/9 -> 2/3 -> 14/15 -> 18/19 ->（22/23->） 12/13 -> 20/21 -> 4/5 -> 6 -> 7
- 5、（其实整合在3里）提交到财审科：1 -> 18/19 ->（22/23->） 12/13 -> 20/21 -> 4/5 -> 6 -> 7
+ 0 关闭;
+ （申请）1 提交;
+ （初审）8 、18 维修初审、财务初审通过;9 、19 维修初审、财务初审不通过
+ （科长审核）2 、12、22(财审科长) 审核通过;3、13、23 审核不通过 -- 20220615（姜宏退休，在初审、审核之间再添加审核环节-22，23）
+ （财审科复审）20（带有财务审计）复审通过; 21 复审不通过 -- 20190624(马岩兼任财审科长在初审、审核之后再添加复审环节)
+ （局领导审批）4 审批通过;（代表全部完成)
+ （局领导审批）14（带有财务审计）审批通过;
+ （局领导审批）5、15 审批不通过
+
+ 6 登记借出;
+ 7 登记返还
+
+
+ 1、提交到不涉及初审科室、不涉及财审（非请款报告）：1 -> 2/3 -> 4/5 -> 6 -> 7
+ 2、提交到涉及初审科室、不涉及财审（非请款报告）：1 -> 8/9 -> 2/3 -> 4/5 -> 6 -> 7
+ 3、提交到不涉及初审科室、涉及财审（请款报告）：1 -> 2/3 -> 14/15 -> 18/19 ->（22/23->） 12/13 -> 20/21 -> 4/5 -> 6 -> 7
+ 4、提交到涉及初审科室、涉及财审（请款报告）：1 -> 8/9 -> 2/3 -> 14/15 -> 18/19 ->（22/23->） 12/13 -> 20/21 -> 4/5 -> 6 -> 7
+ 5、（其实整合在3里）提交到财审科：1 -> 18/19 ->（22/23->） 12/13 -> 20/21 -> 4/5 -> 6 -> 7
）
*/
@Column(name = "STATE")
private Integer state;
- /**
- * 所属机构id
- */
- @Column(name = "ORG_ID")
- private String orgId;
+ /**
+ * 所属机构id
+ */
+ @Column(name = "ORG_ID")
+ private String orgId;
@Transient
private String orgName;
@@ -254,11 +254,11 @@ public class Chapter implements Serializable {
@Column(name = "RETURN_TIME")
private Date returnTime;
- /**
- * 状态（汉译）
- */
- @Transient
- private String stateName;
+ /**
+ * 状态（汉译）
+ */
+ @Transient
+ private String stateName;
/**
*附件的file_code
@@ -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;
+
/**
* 财审科初审人
*/
@@ -455,171 +462,171 @@ public class Chapter implements Serializable {
public Chapter() {
- this.deleteFlag= BaseEntity.DEL_FLAG_NORMAL;
+ this.deleteFlag= BaseEntity.DEL_FLAG_NORMAL;
}
public Chapter(String id, String chapterContent,int orgType,int chapterType, String orgId, int chapterNum,String orgDeptId, String applyUser, Date applyTime, String checkUser, Date checkTime, String checkOpinion, String approvalUser, Date approvalTime, String approvalOpinion, String remarks, Integer deleteFlag, Integer state, String registerUser, Date borrowTime, Date returnTime) {
- super();
- this.id = id;
- this.chapterContent = chapterContent;
- this.chapterType = chapterType;
- this.chapterNum = chapterNum;
- this.orgType = orgType;
- this.applyUser = applyUser;
- this.applyTime = applyTime;
- this.orgDeptId = orgDeptId;
- this.checkUser = checkUser;
- this.checkTime = checkTime;
- this.checkOpinion = checkOpinion;
- this.approvalUser = approvalUser;
- this.approvalTime = approvalTime;
- this.approvalOpinion = approvalOpinion;
- this.remarks = remarks;
- this.deleteFlag = deleteFlag;
- this.state = state;
- this.orgId = orgId;
- this.registerUser = registerUser;
- this.borrowTime = borrowTime;
- this.returnTime = returnTime;
+ super();
+ this.id = id;
+ this.chapterContent = chapterContent;
+ this.chapterType = chapterType;
+ this.chapterNum = chapterNum;
+ this.orgType = orgType;
+ this.applyUser = applyUser;
+ this.applyTime = applyTime;
+ this.orgDeptId = orgDeptId;
+ this.checkUser = checkUser;
+ this.checkTime = checkTime;
+ this.checkOpinion = checkOpinion;
+ this.approvalUser = approvalUser;
+ this.approvalTime = approvalTime;
+ this.approvalOpinion = approvalOpinion;
+ this.remarks = remarks;
+ this.deleteFlag = deleteFlag;
+ this.state = state;
+ this.orgId = orgId;
+ this.registerUser = registerUser;
+ this.borrowTime = borrowTime;
+ this.returnTime = returnTime;
}
public String getId() {
- return id;
+ return id;
}
public void setId(String id) {
- this.id = id;
+ this.id = id;
}
public String getChapterContent() {
- return chapterContent;
+ return chapterContent;
}
public void setChapterContent(String chapterContent) {
- this.chapterContent = chapterContent;
+ this.chapterContent = chapterContent;
}
public int getChapterType() {
- return chapterType;
+ return chapterType;
}
public void setChapterType(int chapterType) {
- this.chapterType = chapterType;
+ this.chapterType = chapterType;
}
public int getChapterNum() {
- return chapterNum;
+ return chapterNum;
}
public void setChapterNum(int chapterNum) {
- this.chapterNum = chapterNum;
+ this.chapterNum = chapterNum;
}
public String getApplyUser() {
- return applyUser;
+ return applyUser;
}
public void setApplyUser(String applyUser) {
- this.applyUser = applyUser;
+ this.applyUser = applyUser;
}
public String getApplyUserName() {
- return applyUserName;
+ return applyUserName;
}
public void setApplyUserName(String applyUserName) {
- this.applyUserName = applyUserName;
+ this.applyUserName = applyUserName;
}
public Date getApplyTime() {
- return applyTime;
+ return applyTime;
}
public void setApplyTime(Date applyTime) {
- this.applyTime = applyTime;
+ this.applyTime = applyTime;
}
public String getCheckUser() {
- return checkUser;
+ return checkUser;
}
public void setCheckUser(String checkUser) {
- this.checkUser = checkUser;
+ this.checkUser = checkUser;
}
public String getCheckUserName() {
- return checkUserName;
+ return checkUserName;
}
public void setCheckUserName(String checkUserName) {
- this.checkUserName = checkUserName;
+ this.checkUserName = checkUserName;
}
public Date getCheckTime() {
- return checkTime;
+ return checkTime;
}
public void setCheckTime(Date checkTime) {
- this.checkTime = checkTime;
+ this.checkTime = checkTime;
}
public String getCheckOpinion() {
- return checkOpinion;
+ return checkOpinion;
}
public void setCheckOpinion(String checkOpinion) {
- this.checkOpinion = checkOpinion;
+ this.checkOpinion = checkOpinion;
}
public String getApprovalUser() {
- return approvalUser;
+ return approvalUser;
}
public void setApprovalUser(String approvalUser) {
- this.approvalUser = approvalUser;
+ this.approvalUser = approvalUser;
}
public String getApprovalUserName() {
- return approvalUserName;
+ return approvalUserName;
}
public void setApprovalUserName(String approvalUserName) {
- this.approvalUserName = approvalUserName;
+ this.approvalUserName = approvalUserName;
}
public Date getApprovalTime() {
- return approvalTime;
+ return approvalTime;
}
public void setApprovalTime(Date approvalTime) {
- this.approvalTime = approvalTime;
+ this.approvalTime = approvalTime;
}
public String getApprovalOpinion() {
- return approvalOpinion;
+ return approvalOpinion;
}
public void setApprovalOpinion(String approvalOpinion) {
- this.approvalOpinion = approvalOpinion;
+ this.approvalOpinion = approvalOpinion;
}
public String getRemarks() {
- return remarks;
+ return remarks;
}
public void setRemarks(String remarks) {
- this.remarks = remarks;
+ this.remarks = remarks;
}
- @NotNull
- @Field(index= org.hibernate.search.annotations.Index.YES, analyze= Analyze.NO, store= Store.YES)
- public Integer getDeleteFlag() {
- return deleteFlag;
- }
+ @NotNull
+ @Field(index= org.hibernate.search.annotations.Index.YES, analyze= Analyze.NO, store= Store.YES)
+ public Integer getDeleteFlag() {
+ return deleteFlag;
+ }
- public void setDeleteFlag(Integer deleteFlag) {
- this.deleteFlag = deleteFlag;
- }
+ public void setDeleteFlag(Integer deleteFlag) {
+ this.deleteFlag = deleteFlag;
+ }
public Date getCreateTime() {
return this.createTime;
@@ -630,109 +637,109 @@ public class Chapter implements Serializable {
}
public Integer getState() {
- return state;
+ return state;
}
public void setState(Integer state) {
- this.state = state;
+ this.state = state;
}
public String getRegisterUser() {
- return registerUser;
+ return registerUser;
}
public void setRegisterUser(String registerUser) {
- this.registerUser = registerUser;
+ this.registerUser = registerUser;
}
public String getRegisterUserName() {
- return registerUserName;
+ return registerUserName;
}
public void setRegisterUserName(String registerUserName) {
- this.registerUserName = registerUserName;
+ this.registerUserName = registerUserName;
}
public Date getBorrowTime() {
- return borrowTime;
+ return borrowTime;
}
public void setBorrowTime(Date borrowTime) {
- this.borrowTime = borrowTime;
+ this.borrowTime = borrowTime;
}
public Date getReturnTime() {
- return returnTime;
+ return returnTime;
}
public void setReturnTime(Date returnTime) {
- this.returnTime = returnTime;
+ this.returnTime = returnTime;
}
public String getApplyDept() {
- return applyDept;
+ return applyDept;
}
public void setApplyDept(String applyDept) {
- this.applyDept = applyDept;
+ this.applyDept = applyDept;
}
public String getApplyDeptName() {
- return applyDeptName;
+ return applyDeptName;
}
public void setApplyDeptName(String applyDeptName) {
- this.applyDeptName = applyDeptName;
+ this.applyDeptName = applyDeptName;
}
public String getChapterNo() {
- return chapterNo;
+ return chapterNo;
}
public void setChapterNo(String chapterNo) {
- this.chapterNo = chapterNo;
+ this.chapterNo = chapterNo;
}
public String getStateName() {
- return stateName;
- }
+ return stateName;
+ }
- public void setStateName(String stateName) {
- this.stateName = stateName;
- }
+ public void setStateName(String stateName) {
+ this.stateName = stateName;
+ }
- public String getOrgId() {
- return orgId;
- }
+ public String getOrgId() {
+ return orgId;
+ }
- public void setOrgId(String orgId) {
- this.orgId = orgId;
- }
+ public void setOrgId(String orgId) {
+ this.orgId = orgId;
+ }
- public int getOrgType() {
- return orgType;
- }
+ public int getOrgType() {
+ return orgType;
+ }
- public void setOrgType(int orgType) {
- this.orgType = orgType;
- }
+ public void setOrgType(int orgType) {
+ this.orgType = orgType;
+ }
- public String getOrgDeptId() {
- return orgDeptId;
- }
+ public String getOrgDeptId() {
+ return orgDeptId;
+ }
- public void setOrgDeptId(String orgDeptId) {
- this.orgDeptId = orgDeptId;
- }
+ public void setOrgDeptId(String orgDeptId) {
+ this.orgDeptId = orgDeptId;
+ }
- public String getOrgDeptName() {
- return orgDeptName;
- }
+ public String getOrgDeptName() {
+ return orgDeptName;
+ }
- public void setOrgDeptName(String orgDeptName) {
- this.orgDeptName = orgDeptName;
- }
+ public void setOrgDeptName(String orgDeptName) {
+ this.orgDeptName = orgDeptName;
+ }
public String getFileCode() {
return fileCode;
@@ -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;
}
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 544ee944..7390a009 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
@@ -168,11 +168,11 @@ public class ChapterService extends BaseService {
Integer[] statusArray = {1,8};
// dc.add( Restrictions.in("state",statusArray));
dc.add(Restrictions.or(
- Restrictions.and(Restrictions.eq("checkUser",user.getId()),Restrictions.in("state",statusArray)),
- Restrictions.and(Restrictions.eq("financeCheckUserFirstAfter",user.getId()),Restrictions.eq("state",18)),
+ Restrictions.and(Restrictions.eq("checkUser",user.getId()),Restrictions.in("state",statusArray)),
+ Restrictions.and(Restrictions.eq("financeCheckUserFirstAfter",user.getId()),Restrictions.eq("state",18)),
Restrictions.and(Restrictions.eq("financeCheckUser",user.getId()),Restrictions.eq("state",22)),
Restrictions.and(Restrictions.eq("financeCheckUser",user.getId()),Restrictions.eq("state",18)), //兼容旧数据
- Restrictions.and(Restrictions.eq("financeCheckUserThree",user.getId()),Restrictions.eq("state",12))
+ Restrictions.and(Restrictions.eq("financeCheckUserThree",user.getId()),Restrictions.eq("state",12))
));
}
@@ -219,8 +219,8 @@ public class ChapterService extends BaseService {
// Integer[] statusArray = {1,14};
// dc.add( Restrictions.in("state",statusArray));
dc.add(Restrictions.or(
- Restrictions.and(Restrictions.eq("wxlCheckUser",user.getId()),Restrictions.eq("state",1)),
- Restrictions.and(Restrictions.eq("financeCheckUserFirst",user.getId()),Restrictions.eq("state",14))
+ Restrictions.and(Restrictions.eq("wxlCheckUser",user.getId()),Restrictions.eq("state",1)),
+ Restrictions.and(Restrictions.eq("financeCheckUserFirst",user.getId()),Restrictions.eq("state",14))
));
}
@@ -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{
@@ -781,8 +786,8 @@ public class ChapterService extends BaseService {
Integer[] statusArray = {12,20};
// dc.add( Restrictions.in("state",statusArray));
dc.add(Restrictions.or(
- Restrictions.and(Restrictions.eq("approvalUser",user.getId()),Restrictions.eq("state",2)),
- Restrictions.and(Restrictions.eq("financeLeaderUser",user.getId()),Restrictions.in("state",statusArray))
+ Restrictions.and(Restrictions.eq("approvalUser",user.getId()),Restrictions.eq("state",2)),
+ Restrictions.and(Restrictions.eq("financeLeaderUser",user.getId()),Restrictions.in("state",statusArray))
));
}
@@ -867,7 +872,7 @@ public class ChapterService extends BaseService {
sendOrgIdList.addAll(sendOrgIdSearchList);
dc.add(Restrictions.in("orgId", sendOrgIdList));
}
-
+
//局内科室
String sendDeptId=paramMap.get("sendDeptId");
if(StringUtils.isNotBlank(sendDeptId)){
@@ -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);
}
@@ -1007,7 +1044,7 @@ public class ChapterService extends BaseService {
Chapter oldChapter = chapterDao.find(oldId);
oldChapter.setState(0);
oldChapter.setDeleteFlag(1);
- chapterDao.save(oldChapter);
+ chapterDao.save(oldChapter);
}
String nextNo = this.getNextChapterNo(chapter.getOrgId());
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 b01ddcdf..31c72a65 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.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();
}
@@ -50,6 +53,7 @@
+
@@ -78,7 +82,7 @@
@@ -100,7 +104,7 @@
@@ -122,7 +126,7 @@
@@ -187,6 +191,27 @@
+
+
+
+
+
+
+
+
+