Skip to content

H
hg-smart
Commit 82e42e9e by yukang
Options

签证单管理

parent 93b2d3e8
Showing with 86 additions and 52 deletions
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW002.java
...@@ -260,4 +260,17 @@ public class ServiceHGCW002 extends ServiceBase { ...@@ -260,4 +260,17 @@ public class ServiceHGCW002 extends ServiceBase {
} }
public EiInfo projectComboBox(EiInfo inInfo){
Map<String, Object> map = new HashMap<>();
if (StringUtils.isNotEmpty(inInfo.getString("reviewStatus"))) {
map.put("reviewStatus", inInfo.getString("reviewStatus"));
}
if (StringUtils.isNotEmpty(inInfo.getString("contractType"))) {
map.put("contractType", inInfo.getString("contractType"));
}
List<HGCW002> HGCW002List = dao.query("HGCW002.queryProjectComboBox", map);
inInfo.addBlock("projcet_combo_box").setRows(HGCW002List);
return inInfo;
}
} }
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW004.java
...@@ -3,7 +3,10 @@ package com.baosight.hggp.hg.cw.service; ...@@ -3,7 +3,10 @@ package com.baosight.hggp.hg.cw.service;
import com.baosight.hggp.aspect.annotation.OperationLogAnnotation; import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
import com.baosight.hggp.common.DdynamicEnum; import com.baosight.hggp.common.DdynamicEnum;
import com.baosight.hggp.core.dao.DaoUtils; import com.baosight.hggp.core.dao.DaoUtils;
import com.baosight.hggp.hg.constant.HGConstant;
import com.baosight.hggp.hg.cw.domain.HGCW004; import com.baosight.hggp.hg.cw.domain.HGCW004;
import com.baosight.hggp.hg.cw.tools.HGCWTools;
import com.baosight.hggp.hg.cw.vo.UserVO;
import com.baosight.hggp.hg.sb.domain.HGSB003; import com.baosight.hggp.hg.sb.domain.HGSB003;
import com.baosight.hggp.util.CommonMethod; import com.baosight.hggp.util.CommonMethod;
import com.baosight.hggp.util.ErrorCodeUtils; import com.baosight.hggp.util.ErrorCodeUtils;
...@@ -14,6 +17,7 @@ import com.baosight.iplat4j.core.ei.EiInfo; ...@@ -14,6 +17,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException; import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.resource.I18nMessages; import com.baosight.iplat4j.core.resource.I18nMessages;
import com.baosight.iplat4j.core.service.impl.ServiceBase; import com.baosight.iplat4j.core.service.impl.ServiceBase;
import com.baosight.iplat4j.ed.util.SequenceGenerator;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
...@@ -75,6 +79,9 @@ public class ServiceHGCW004 extends ServiceBase { ...@@ -75,6 +79,9 @@ public class ServiceHGCW004 extends ServiceBase {
for (int i = 0; i < resultRows.size(); i++) { for (int i = 0; i < resultRows.size(); i++) {
HGCW004 HGCW004 = new HGCW004(); HGCW004 HGCW004 = new HGCW004();
HGCW004.fromMap(resultRows.get(i)); HGCW004.fromMap(resultRows.get(i));
UserVO userVO = HGCWTools.HgCw002.getUserCompany();
HGCW004.setCompanyCode(userVO.getUsercode());
HGCW004.setCompanyName(userVO.getUsername());
if (HGCW004.getId() == null || HGCW004.getId() == 0) { if (HGCW004.getId() == null || HGCW004.getId() == 0) {
this.add(HGCW004); this.add(HGCW004);
} else { } else {
......
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW002.xml
...@@ -460,7 +460,7 @@ ...@@ -460,7 +460,7 @@
<select id="queryComboBox" parameterClass="java.util.HashMap" <select id="queryComboBox" parameterClass="java.util.HashMap"
resultClass="java.util.HashMap"> resultClass="com.baosight.hggp.hg.cw.domain.HGCW002">
SELECT DISTINCT SELECT DISTINCT
CONTRACT_NUMBER as contractNumber, <!-- 合同号 --> CONTRACT_NUMBER as contractNumber, <!-- 合同号 -->
CONTRACT_NAME as contractName <!-- 合同名称 --> CONTRACT_NAME as contractName <!-- 合同名称 -->
...@@ -484,6 +484,34 @@ ...@@ -484,6 +484,34 @@
ORDER BY CONTRACT_NUMBER ORDER BY CONTRACT_NUMBER
</select> </select>
<select id="queryProjectComboBox" parameterClass="java.util.HashMap"
resultClass="java.util.HashMap">
SELECT DISTINCT
PROJ_CODE as "projCode", <!-- 项目编码 -->
PROJ_NAME as "projName", <!-- 项目名称 -->
CONTRACT_NUMBER as "contractNumber", <!-- 合同号 -->
CONTRACT_NAME as "contractName", <!-- 合同名称 -->
PARTY_A as "partyA", <!-- 甲方名称 -->
PARTY_B as "partyB" <!-- 乙方名称 -->
FROM ${hggpSchema}.HGCW002
WHERE 1=1
<isNotEmpty prepend=" AND " property="accountCode">
ACCOUNT_CODE = #accountCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyCode">
COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyCodes">
COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
</isNotEmpty>
<isNotEmpty prepend=" AND " property="reviewStatus">
REVIEW_STATUS = #reviewStatus#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="contractType">
CONTRACT_TYPE = #contractType#
</isNotEmpty>
ORDER BY CONTRACT_NUMBER
</select>
<update id="submit"> <update id="submit">
UPDATE ${hggpSchema}.HGCW002 UPDATE ${hggpSchema}.HGCW002
......
src/main/webapp/HG/CW/HGCW004.js
...@@ -30,28 +30,20 @@ $(function() { ...@@ -30,28 +30,20 @@ $(function() {
return template; return template;
} }
} },{
// { field: "projCode",
// field: "operator", attributes: {'class': 'i-input-readonly', required: true},
// title: "操作", title: "项目编号",
// template: function (item) { query: function (container, params) {
// let auditStatus = item.deviceStatus; var queryInfo = new EiInfo();
// let template = ''; // info.set("reviewStatus","3")
// if (item.companyCode && item.groupCode) { queryInfo.set("contractType","1")
// template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' return queryInfo;
// + 'onclick="showDetail(' + item.id + ',\'' + item.companyCode + '\',\'' + item.companyName + '\',\'' + item.groupCode + '\',\'' + item.groupName + '\',' + },
// '\'' + item.deviceType + '\',\'' + item.deviceName + '\')" >签证详情</a>'; init: function (e, options) {
// if (item.companyCode && item.groupCode) { console.log(e);
// template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' },
// + 'onclick="showDetail(' + item.id + ',\'' + item.companyCode + '\',\'' + item.companyName + '\',\'' + item.groupCode + '\',\'' + item.groupName + '\',' + },
// '\'' + item.deviceType + '\',\'' + item.deviceName + '\')" >附件详情</a>';
//
//
// }
// return template;
// }
// }
// }
], ],
onSave: function (e) { onSave: function (e) {
// 阻止默认请求，使用自定义保存 // 阻止默认请求，使用自定义保存
...@@ -71,6 +63,7 @@ $(function() { ...@@ -71,6 +63,7 @@ $(function() {
} }
window.document.addEventListener("keyup",function (event) { window.document.addEventListener("keyup",function (event) {
if(event.keyCode === 13){ if(event.keyCode === 13){
var grid = $("#ef_grid_result").data("kendoGrid"); var grid = $("#ef_grid_result").data("kendoGrid");
...@@ -86,6 +79,8 @@ $(window).load(function () { ...@@ -86,6 +79,8 @@ $(window).load(function () {
query(); query();
}); });
/** /**
* 查询 * 查询
*/ */
......
src/main/webapp/HG/CW/HGCW004.jsp
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
</EF:EFSelect> </EF:EFSelect>
<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" /> <EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3" />
<EF:EFInput cname="主合同号" ename="contractNumber" blockId="inqu_status" row="0" colWidth="3" /> <EF:EFInput cname="主合同号" ename="contractNumber" blockId="inqu_status" row="0" colWidth="3" />
<EF:EFInput cname="甲方名称" ename="partyA" blockId="inqu_status" row="0" colWidth="3" />
<EF:EFInput cname="乙方名称" ename="partyB" blockId="inqu_status" row="0" colWidth="3" />
<EF:EFDateSpan startCname="签订日期(从)" endCname="至" blockId="inqu_status" <EF:EFDateSpan startCname="签订日期(从)" endCname="至" blockId="inqu_status"
startName="signingDateFrom" endName="signingDateTo" row="0" role="date" startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
format="yyyyMMdd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true"> format="yyyyMMdd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
</EF:EFDateSpan> </EF:EFDateSpan>
<EF:EFInput cname="甲方名称" ename="partyA" blockId="inqu_status" row="0" colWidth="3" />
<EF:EFInput cname="乙方名称" ename="partyB" blockId="inqu_status" row="0" colWidth="3" />
<EF:EFInput cname="主合同名称" ename="contractName" blockId="inqu_status" row="0" colWidth="3" /> <EF:EFInput cname="主合同名称" ename="contractName" blockId="inqu_status" row="0" colWidth="3" />
<EF:EFSelect cname="审批状态" ename="inqu_status-0-reviewStatus" colWidth="3" filter="contains"> <EF:EFSelect cname="审批状态" ename="inqu_status-0-reviewStatus" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
...@@ -34,38 +34,29 @@ ...@@ -34,38 +34,29 @@
<EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false"> <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false">
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/> <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"/>
<EF:EFComboColumn ename="companyName" cname="所属公司" <EF:EFColumn ename="companyName" cname="所属公司" width="120" enable="false" readonly="true" align="center"/>
columnTemplate="#=textField#" itemTemplate="#=textField#" <EF:EFPopupColumn ename="projCode" cname="项目编号" width="200"
textField="textField" valueField="valueField" serviceName="HGCW002" methodName="projectComboBox"
maxLength="16" readonly="true" width="120" required="true" resultId="projcet_combo_box" popupType="ServiceGrid"
align="center" filter="contains" sort="true"> valueField="projCode" textField="projCode"
<EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/> columnEnames="projCode,projName,contractNumber,contractName,partyA,partyB"
</EF:EFComboColumn> columnCnames="项目编码,项目名称,合同号,合同名称,甲方名称,乙方名称"
<EF:EFComboColumn ename="projCode" cname="项目编号" backFillColumnIds="projCode,projName,contractNumber,contractName,partyA,partyB"
columnTemplate="#=textField#" itemTemplate="#=textField#" backFillFieldIds="projCode,projName,contractNumber,contractName,partyA,partyB"
textField="textField" valueField="valueField" popupTitle="所属公司" popupWidth="800">
maxLength="16" readonly="true" width="120" required="true" </EF:EFPopupColumn>
align="center" filter="contains" sort="true"> <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFOptions blockId="proj_record_block_id" textField="textField" valueField="valueField"/> <EF:EFColumn ename="contractNumber" cname="主合同号" width="120" enable="false" readonly="true" align="center"/>
</EF:EFComboColumn> <EF:EFColumn ename="contractName" cname="主合同名称" width="120" enable="false" readonly="true" align="center"/>
<EF:EFComboColumn ename="projName" cname="项目名称" <EF:EFColumn ename="partyA" cname="甲方名称" width="120" enable="false" readonly="true" align="center"/>
columnTemplate="#=textField#" itemTemplate="#=textField#" <EF:EFColumn ename="partyB" cname="乙方名称" width="120" enable="false" readonly="true" align="center"/>
textField="textField" valueField="valueField"
maxLength="16" readonly="true" width="120" required="true"
align="center" filter="contains" sort="true">
<EF:EFOptions blockId="proj_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFComboColumn>
<EF:EFColumn ename="contractNumber" cname="主合同号" width="120" enable="true" readonly="true" align="center" required="true"/>
<EF:EFColumn ename="contractName" cname="主合同名称" width="120" enable="true" readonly="true" align="center" required="true"/>
<EF:EFColumn ename="partyA" cname="甲方名称" width="120" enable="true" readonly="true" align="center" required="true"/>
<EF:EFColumn ename="partyB" cname="乙方名称" width="120" enable="true" readonly="true" align="center" required="true"/>
<EF:EFColumn ename="projactDetail" cname="项目部位" width="120" enable="true" readonly="true" align="center" required="true"/> <EF:EFColumn ename="projactDetail" cname="项目部位" width="120" enable="true" readonly="true" align="center" required="true"/>
<EF:EFColumn ename="contractContent" cname="签证事由及内容" width="120" enable="true" readonly="true" align="center" required="true"/> <EF:EFColumn ename="contractContent" cname="签证事由及内容" width="120" enable="true" readonly="true" align="center" required="true"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" width="120" enable="true" readonly="true" align="center" required="true"/> <EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" width="120" enable="true" readonly="true" align="center" required="true"/>
<EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="true" readonly="true" align="center" editType="date" <EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="true" readonly="true" align="center" editType="date"
dateFormat="yyyyMMdd" parseFormats="['yyyyMMdd']" required="true"/> dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
<EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center" <EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center" required="true"
columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" > columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
<EF:EFCodeOption codeName="hggp.cw.reviewStatus"/> <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>
</EF:EFComboColumn> </EF:EFComboColumn>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment