Skip to content

H
hp-smart
Commit 99289bf5 by YG8429
Options

车辆申请优化、车辆保险优化、询价管理优化、会议室管理优化

parent ec63c647
Showing with 236 additions and 84 deletions
src/main/java/com/baosight/hpjx/hp/cg/service/ServiceHPCG004.java
......@@ -19,6 +19,7 @@ import com.baosight.iplat4j.core.resource.I18nMessages;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import com.baosight.iplat4j.ed.util.SequenceGenerator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
......@@ -35,7 +36,9 @@ public class ServiceHPCG004 extends ServiceEPBase {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(
DdynamicEnum.SUPPLIER_RECORD_BLOCK_ID), null, false);
DdynamicEnum.SUPPLIER_RECORD_BLOCK_ID,
DdynamicEnum.USER_BLOCK_ID), null, false);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPCG004().eiMetadata);
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败");
}
......@@ -87,6 +90,7 @@ public class ServiceHPCG004 extends ServiceEPBase {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
// 写入数据
List<HPCG004> list = new ArrayList<>();
for (Map resultRow : resultRows) {
HPCG004 hpcg004 = new HPCG004();
hpcg004.fromMap(resultRow);
......@@ -96,7 +100,9 @@ public class ServiceHPCG004 extends ServiceEPBase {
} else {
this.modify(hpcg004);
}
list.add(hpcg004);
}
inInfo.getBlock(EiConstant.resultBlock).setRows(list);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
} catch (Exception e) {
......
src/main/java/com/baosight/hpjx/hp/cg/service/ServiceHPCG004A.java
......@@ -19,6 +19,7 @@ import com.baosight.iplat4j.core.resource.I18nMessages;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import com.baosight.iplat4j.ed.util.SequenceGenerator;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -79,6 +80,7 @@ public class ServiceHPCG004A extends ServiceEPBase {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
// 写入数据
List<HPCG004A> list = new ArrayList<>();
for (Map resultRow : resultRows) {
HPCG004A hpcg004a = new HPCG004A();
hpcg004a.fromMap(resultRow);
......@@ -89,7 +91,9 @@ public class ServiceHPCG004A extends ServiceEPBase {
} else {
this.modify(hpcg004a);
}
list.add(hpcg004a);
}
inInfo.getBlock(EiConstant.resultBlock).setRows(list);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
} catch (Exception e) {
......
src/main/java/com/baosight/hpjx/hp/cg/sql/HPCG004.xml
......@@ -187,6 +187,9 @@
PRO_APPLY_STATUS <!-- 申请状态 -->
)
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #inquiryDate#, #inquiryNumber#, #supplierName#, #inquiryType#, #inquiryPerson#, #deleteFlag#, #proApplyStatus#)
<selectKey resultClass="java.lang.Long" keyProperty="id">
SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPCG004
</selectKey>
</insert>
<delete id="delete">
......
src/main/java/com/baosight/hpjx/hp/cg/sql/HPCG004A.xml
......@@ -286,6 +286,9 @@
T_HPJG004_ID
)
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #productCode#, #productName#, #specification#, #unit#, #quantity#, #unitPrice#, #taxRate#, #invoiceType#, #discount#, #discountedPrice#, #taxInclusivePrice#, #taxInclusiveDiscountedPrice#, #nonTaxAmount#, #taxAmount#, #taxInclusiveAmount#, #deliveryDate#, #minPurchaseQuantity#, #deleteFlag#, #tHpjg004Id#)
<selectKey resultClass="java.lang.Long" keyProperty="id">
SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPCG004A
</selectKey>
</insert>
<delete id="delete">
......
src/main/java/com/baosight/hpjx/hp/xt/domain/HPXT002.java
......@@ -36,6 +36,7 @@ public class HPXT002 extends DaoEPBase {
public static final String FIELD_LICENSE_PLATE_CODE = "licensePlateCode"; /* 车牌号*/
public static final String FIELD_DELETE_FLAG = "deleteFlag"; /* 是否删除0.否1.是*/
public static final String FIELD_APPLY_STATUS = "applyStatus"; /* 申请状态*/
public static final String FIELD_INSURANCE_COMPANY = "insuranceCompany"; /* 保险公司*/
public static final String COL_ID = "ID"; /* 主键id*/
public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 企业编码 预留*/
......@@ -52,6 +53,7 @@ public class HPXT002 extends DaoEPBase {
public static final String COL_LICENSE_PLATE_CODE = "LICENSE_PLATE_CODE"; /* 车牌号*/
public static final String COL_DELETE_FLAG = "DELETE_FLAG"; /* 是否删除0.否1.是*/
public static final String COL_APPLY_STATUS = "APPLY_STATUS"; /* 申请状态*/
public static final String COL_INSURANCE_COMPANY = "INSURANCE_COMPANY";
public static final String QUERY = "HPXT002.query";
public static final String COUNT = "HPXT002.count";
......@@ -59,6 +61,8 @@ public class HPXT002 extends DaoEPBase {
public static final String UPDATE = "HPXT002.update";
public static final String DELETE = "HPXT002.delete";
public static final String DELETE_FLAG = "HPXT002.deleteFlag";
public static final String UPDATE_PRO_APPLY_STATUS = "HPXT002.updateProApplyStatus";
private Long id = new Long(0); /* 主键id*/
private String companyCode = " "; /* 企业编码 预留*/
......@@ -75,6 +79,7 @@ public class HPXT002 extends DaoEPBase {
private String licensePlateCode = " "; /* 车牌号*/
private Integer deleteFlag = 0; /* 是否删除0.否1.是*/
private Integer applyStatus = 0; /* 申请状态*/
private String insuranceCompany = " "; /* 保险公司*/
/**
* initialize the metadata.
......@@ -143,6 +148,10 @@ public class HPXT002 extends DaoEPBase {
eiColumn.setDescName("申请状态");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_INSURANCE_COMPANY);
eiColumn.setDescName("保险公司");
eiMetadata.addMeta(eiColumn);
}
......@@ -393,6 +402,15 @@ public class HPXT002 extends DaoEPBase {
public void setApplyStatus(Integer applyStatus) {
this.applyStatus = applyStatus;
}
public String getInsuranceCompany() {
return insuranceCompany;
}
public void setInsuranceCompany(String insuranceCompany) {
this.insuranceCompany = insuranceCompany;
}
/**
* get the value from Map.
*
......@@ -416,6 +434,7 @@ public class HPXT002 extends DaoEPBase {
setLicensePlateCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_LICENSE_PLATE_CODE)), licensePlateCode));
setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
setApplyStatus(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_APPLY_STATUS)), applyStatus));
setInsuranceCompany(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_INSURANCE_COMPANY)), insuranceCompany));
}
/**
......@@ -440,6 +459,7 @@ public class HPXT002 extends DaoEPBase {
map.put(FIELD_LICENSE_PLATE_CODE, StringUtils.toString(licensePlateCode, eiMetadata.getMeta(FIELD_LICENSE_PLATE_CODE)));
map.put(FIELD_DELETE_FLAG, StringUtils.toString(deleteFlag, eiMetadata.getMeta(FIELD_DELETE_FLAG)));
map.put(FIELD_APPLY_STATUS, StringUtils.toString(applyStatus, eiMetadata.getMeta(FIELD_APPLY_STATUS)));
map.put(FIELD_INSURANCE_COMPANY, StringUtils.toString(insuranceCompany, eiMetadata.getMeta(FIELD_INSURANCE_COMPANY)));
return map;
}
......
src/main/java/com/baosight/hpjx/hp/xt/service/ServiceHPXT001.java
......@@ -2,8 +2,10 @@ package com.baosight.hpjx.hp.xt.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.bg.domain.HPBG002;
import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.hp.xt.domain.HPXT001;
import com.baosight.hpjx.util.*;
......@@ -20,10 +22,7 @@ import org.apache.commons.collections.CollectionUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
......@@ -35,7 +34,14 @@ public class ServiceHPXT001 extends ServiceEPBase {
@Override
public EiInfo initLoad(EiInfo inInfo) {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(
DdynamicEnum.USER_BLOCK_ID
), null, false);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPXT001().eiMetadata);
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败");
}
return inInfo;
}
......@@ -83,6 +89,7 @@ public class ServiceHPXT001 extends ServiceEPBase {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
// 写入数据
List<HPXT001> list = new ArrayList<>();
for (Map resultRow : resultRows) {
HPXT001 hpxt001 = new HPXT001();
hpxt001.fromMap(resultRow);
......@@ -91,7 +98,9 @@ public class ServiceHPXT001 extends ServiceEPBase {
} else {
this.modify(hpxt001);
}
list.add(hpxt001);
}
inInfo.getBlock(EiConstant.resultBlock).setRows(list);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
} catch (Exception e) {
......
src/main/java/com/baosight/hpjx/hp/xt/service/ServiceHPXT002.java
package com.baosight.hpjx.hp.xt.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.xt.domain.HPXT001;
import com.baosight.hpjx.hp.xt.domain.HPXT002;
import com.baosight.hpjx.util.CommonMethod;
import com.baosight.hpjx.util.ErrorCodeUtils;
import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.StringUtil;
......@@ -15,6 +18,8 @@ import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.resource.I18nMessages;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
......@@ -27,7 +32,14 @@ public class ServiceHPXT002 extends ServiceEPBase {
@Override
public EiInfo initLoad(EiInfo inInfo) {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(
DdynamicEnum.USER_BLOCK_ID
), null, false);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPXT002().eiMetadata);
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败");
}
return inInfo;
}
......@@ -75,6 +87,7 @@ public class ServiceHPXT002 extends ServiceEPBase {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
// 写入数据
List<HPXT002> list = new ArrayList<>();
for (Map resultRow : resultRows) {
HPXT002 hpxt002 = new HPXT002();
hpxt002.fromMap(resultRow);
......@@ -83,7 +96,9 @@ public class ServiceHPXT002 extends ServiceEPBase {
} else {
this.modify(hpxt002);
}
list.add(hpxt002);
}
inInfo.getBlock(EiConstant.resultBlock).setRows(list);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
} catch (Exception e) {
......@@ -119,4 +134,29 @@ public class ServiceHPXT002 extends ServiceEPBase {
DaoUtils.update(HPXT002.UPDATE, hpxt002);
}
@OperationLogAnnotation(operModul = "车辆保险",operType = "提交",operDesc = "提交审批操作")
public EiInfo approve(EiInfo inInfo){
int i = 0;
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (Map resultRow : resultRows) {
HPXT002 hpxt002 = new HPXT002();
hpxt002.fromMap(resultRow);
hpxt002.setApplyStatus(CommonConstant.YesNo.YES_1);
DaoUtils.update(HPXT002.UPDATE_PRO_APPLY_STATUS,hpxt002);
}
inInfo.setStatus(EiConstant.STATUS_SUCCESS);
inInfo.setMsgByKey("ep.1000", new String[]{String.valueOf(i), I18nMessages.getText("label.approve", "提交")});
} catch (PlatException e) {
e.printStackTrace();
inInfo.setStatus(EiConstant.STATUS_FAILURE);
ErrorCodeUtils.handleDeleteException(inInfo,i,e);
logError("提交失败", e.getMessage());
return inInfo;
}
return inInfo;
}
}
src/main/java/com/baosight/hpjx/hp/xt/service/ServiceHPXT002A.java
......@@ -3,6 +3,7 @@ package com.baosight.hpjx.hp.xt.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.xt.domain.HPXT002;
import com.baosight.hpjx.hp.xt.domain.HPXT002A;
import com.baosight.hpjx.util.ErrorCodeUtils;
import com.baosight.hpjx.util.LogUtils;
......@@ -15,6 +16,7 @@ import com.baosight.iplat4j.core.exception.PlatException;
import com.baosight.iplat4j.core.resource.I18nMessages;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -75,6 +77,7 @@ public class ServiceHPXT002A extends ServiceEPBase {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
// 写入数据
List<HPXT002A> list = new ArrayList<>();
for (Map resultRow : resultRows) {
HPXT002A hpxt002A = new HPXT002A();
hpxt002A.fromMap(resultRow);
......@@ -85,7 +88,9 @@ public class ServiceHPXT002A extends ServiceEPBase {
} else {
this.modify(hpxt002A);
}
list.add(hpxt002A);
}
inInfo.getBlock(EiConstant.resultBlock).setRows(list);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
} catch (Exception e) {
......
src/main/java/com/baosight/hpjx/hp/xt/service/ServiceHPXT003.java
......@@ -17,6 +17,7 @@ import com.baosight.iplat4j.core.resource.I18nMessages;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import com.baosight.iplat4j.ed.util.SequenceGenerator;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -77,6 +78,7 @@ public class ServiceHPXT003 extends ServiceEPBase {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
// 写入数据
List<HPXT003> list = new ArrayList<>();
for (Map resultRow : resultRows) {
HPXT003 hpxt003 = new HPXT003();
hpxt003.fromMap(resultRow);
......@@ -85,7 +87,9 @@ public class ServiceHPXT003 extends ServiceEPBase {
} else {
this.modify(hpxt003);
}
list.add(hpxt003);
}
inInfo.getBlock(EiConstant.resultBlock).setRows(list);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
} catch (Exception e) {
......
src/main/java/com/baosight/hpjx/hp/xt/service/ServiceHPXT004.java
package com.baosight.hpjx.hp.xt.service;
import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
import com.baosight.hpjx.common.DdynamicEnum;
import com.baosight.hpjx.core.constant.CommonConstant;
import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.hp.xt.domain.HPXT001;
import com.baosight.hpjx.hp.xt.domain.HPXT004;
import com.baosight.hpjx.util.ErrorCodeUtils;
import com.baosight.hpjx.util.LogUtils;
import com.baosight.hpjx.util.StringUtil;
import com.baosight.hpjx.util.*;
import com.baosight.hpjx.util.contants.ACConstants;
import com.baosight.iplat4j.core.ei.EiBlock;
import com.baosight.iplat4j.core.ei.EiConstant;
......@@ -18,8 +16,9 @@ import com.baosight.iplat4j.core.resource.I18nMessages;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import com.baosight.iplat4j.ed.util.SequenceGenerator;
import java.util.List;
import java.util.Map;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
/**
*
......@@ -30,7 +29,14 @@ public class ServiceHPXT004 extends ServiceEPBase {
@Override
public EiInfo initLoad(EiInfo inInfo) {
try {
CommonMethod.initBlock(inInfo, Arrays.asList(
DdynamicEnum.USER_BLOCK_ID
), null, false);
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPXT004().eiMetadata);
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败");
}
return inInfo;
}
......@@ -78,6 +84,7 @@ public class ServiceHPXT004 extends ServiceEPBase {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
// 写入数据
List<HPXT004> list = new ArrayList<>();
for (Map resultRow : resultRows) {
HPXT004 hpxt004 = new HPXT004();
hpxt004.fromMap(resultRow);
......@@ -86,7 +93,9 @@ public class ServiceHPXT004 extends ServiceEPBase {
} else {
this.modify(hpxt004);
}
list.add(hpxt004);
}
inInfo.getBlock(EiConstant.resultBlock).setRows(list);
inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据保存成功!");
} catch (Exception e) {
......@@ -102,6 +111,7 @@ public class ServiceHPXT004 extends ServiceEPBase {
this.setBaseInfo(hpxt004);
//生成会议室管理申请
hpxt004.setApplyNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.CONFERENCE_APPLY_NO));
DaoUtils.insert(HPXT004.INSERT, hpxt004);
}
......@@ -113,8 +123,8 @@ public class ServiceHPXT004 extends ServiceEPBase {
private void setBaseInfo(HPXT004 hpxt004) {
// 去除日期字符串中的-
hpxt004.setApplyDate(StringUtil.removeHorizontalLine(hpxt004.getApplyDate()));
hpxt004.setStartTime(StringUtil.removeHorizontalLine(hpxt004.getStartTime()));
hpxt004.setEndTime(StringUtil.removeHorizontalLine(hpxt004.getEndTime()));
hpxt004.setStartTime(DateUtils.formatShort(hpxt004.getStartTime()));
hpxt004.setEndTime(DateUtils.formatShort(hpxt004.getEndTime()));
}
/**
......
src/main/java/com/baosight/hpjx/hp/xt/sql/HPXT001.xml
......@@ -136,7 +136,7 @@
$orderBy$
</isNotEmpty>
<isEmpty property="orderBy">
ID asc
CREATED_TIME desc
</isEmpty>
</dynamic>
......@@ -241,6 +241,9 @@
STATUS <!-- 返还状态 0-未返还 1-已返还 -->
)
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #applyDate#, #applyNo#, #applyPersonnel#, #licensePlateCode#, #driver#, #startTime#, #endTime#, #destination#, #mileage#, #reason#, #deleteFlag#, #proApplyStatus#, #status#)
<selectKey resultClass="java.lang.Long" keyProperty="id">
SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPXT001
</selectKey>
</insert>
<delete id="delete">
......
src/main/java/com/baosight/hpjx/hp/xt/sql/HPXT002.xml
......@@ -90,6 +90,7 @@
UPDATED_TIME as "updatedTime", <!-- 更新时间 -->
APPLY_DATE as "applyDate", <!-- 申请日期 -->
APPLY_NO as "applyNo", <!-- 保险单号 -->
INSURANCE_COMPANY as "insuranceCompany", <!-- 保险公司 -->
APPLY_PERSONNEL as "applyPersonnel", <!-- 申请人 -->
LICENSE_PLATE_CODE as "licensePlateCode", <!-- 车牌号 -->
DELETE_FLAG as "deleteFlag", <!-- 是否删除0.否1.是 -->
......@@ -101,7 +102,7 @@
$orderBy$
</isNotEmpty>
<isEmpty property="orderBy">
ID asc
CREATED_TIME DESC
</isEmpty>
</dynamic>
......@@ -175,9 +176,13 @@
APPLY_PERSONNEL, <!-- 申请人 -->
LICENSE_PLATE_CODE, <!-- 车牌号 -->
DELETE_FLAG, <!-- 是否删除0.否1.是 -->
APPLY_STATUS <!-- 申请状态 -->
APPLY_STATUS, <!-- 申请状态 -->
INSURANCE_COMPANY
)
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #applyDate#, #applyNo#, #applyPersonnel#, #licensePlateCode#, #deleteFlag#, #applyStatus#)
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #applyDate#, #applyNo#, #applyPersonnel#, #licensePlateCode#, #deleteFlag#, #applyStatus#, #insuranceCompany#)
<selectKey resultClass="java.lang.Long" keyProperty="id">
SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPXT002
</selectKey>
</insert>
<delete id="delete">
......@@ -196,6 +201,18 @@
ID = #id#
</update>
<!--修改提交状态-->
<update id="updateProApplyStatus">
UPDATE ${hpjxSchema}.T_HPXT002
SET
UPDATED_BY = #updatedBy#, <!-- 更新人 -->
UPDATED_NAME = #updatedName#, <!-- 更新人名称 -->
UPDATED_TIME = #updatedTime#, <!-- 更新时间 -->
APPLY_STATUS = #applyStatus# <!-- 提交状态 0-未提交 1-已提交 -->
WHERE
ID = #id#
</update>
<update id="update">
UPDATE ${hpjxSchema}.T_HPXT002
SET
......@@ -212,7 +229,8 @@
APPLY_PERSONNEL = #applyPersonnel#, <!-- 申请人 -->
LICENSE_PLATE_CODE = #licensePlateCode#, <!-- 车牌号 -->
DELETE_FLAG = #deleteFlag#, <!-- 是否删除0.否1.是 -->
APPLY_STATUS = #applyStatus# <!-- 申请状态 -->
APPLY_STATUS = #applyStatus#, <!-- 申请状态 -->
INSURANCE_COMPANY = #insuranceCompany#
WHERE
ID = #id#
</update>
......
src/main/java/com/baosight/hpjx/hp/xt/sql/HPXT002A.xml
......@@ -104,7 +104,7 @@
$orderBy$
</isNotEmpty>
<isEmpty property="orderBy">
ID asc
CREATED_TIME desc
</isEmpty>
</dynamic>
......@@ -186,6 +186,9 @@
T_HPXT002_ID
)
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #licensePlateCode#, #insuranceType#, #insuranceCompany#, #insuranceStartDate#, #insuranceEndDate#, #insuranceAmount#, #deleteFlag#, #tHpxt002Id# )
<selectKey resultClass="java.lang.Long" keyProperty="id">
SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPXT002A
</selectKey>
</insert>
<delete id="delete">
......
src/main/java/com/baosight/hpjx/hp/xt/sql/HPXT003.xml
......@@ -105,7 +105,7 @@
$orderBy$
</isNotEmpty>
<isEmpty property="orderBy">
ID asc
CREATED_TIME desc
</isEmpty>
</dynamic>
......@@ -190,6 +190,9 @@
DELETE_FLAG <!-- 删除标记 -->
)
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #maintenanceDate#, #maintenanceNumber#, #maintenanceType#, #licensePlate#, #handler#, #maintenanceCost#, #maintenanceReason#, #deleteFlag#)
<selectKey resultClass="java.lang.Long" keyProperty="id">
SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPXT003
</selectKey>
</insert>
<delete id="delete">
......
src/main/java/com/baosight/hpjx/hp/xt/sql/HPXT004.xml
......@@ -131,7 +131,7 @@
$orderBy$
</isNotEmpty>
<isEmpty property="orderBy">
ID asc
CREATED_TIME desc
</isEmpty>
</dynamic>
......@@ -232,6 +232,9 @@
STATUS <!-- 返还状态 0-未返还 1-已返还 -->
)
VALUES (#id#, #companyCode#, #depCode#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #applyDate#, #applyNo#, #applyPersonnel#, #meetingRoom#, #meetingSubject#, #meetingNature#, #importanceLevel#, #startTime#, #endTime#, #deleteFlag#, #proApplyStatus#, #status#)
<selectKey resultClass="java.lang.Long" keyProperty="id">
SELECT MAX(ID) as "id" FROM ${hpjxSchema}.T_HPXT004
</selectKey>
</insert>
<delete id="delete">
......
src/main/webapp/HP/CG/HPCG004.jsp
......@@ -43,7 +43,12 @@
textField="textField" valueField="valueField"
maxLength="16" readonly="false" width="160" required="true"
align="center" filter="contains" sort="true" />
<EF:EFColumn ename="inquiryPerson" cname="询价人员" width="140" align="center" required="true"/>
<EF:EFComboColumn ename="inquiryPerson" cname="询价人员" columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField" defaultValue="${loginName}"
maxLength="16" width="140" readonly="false" required="true"
align="center" filter="contains" sort="true">
<EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="inquiryType" cname="询价单类型" width="80" align="center" readonly="true">
<EF:EFCodeOption codeName="hpjx.hpcg.inquiryType"/>
</EF:EFComboColumn>
......
src/main/webapp/HP/XT/HPXT001.js
......@@ -24,7 +24,7 @@ $(function () {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="showUploadFile(' + item.id + ')" >附件清单</a>';
}
if (item.status==0 && item.id){
if (item.proApplyStatus == 1 && item.status == 0 && item.id) {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
'onclick="approveFunc(' + item.id + ')" >返还</a>';
}
......
src/main/webapp/HP/XT/HPXT001.jsp
......@@ -55,7 +55,12 @@
<EF:EFColumn ename="applyDate" cname="申请日期" width="110" align="center" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true" readonly="true"/>
<EF:EFColumn ename="applyNo" cname="申请单号" enable="false" width="130" align="center"/>
<EF:EFColumn ename="applyPersonnel" cname="申请人" enable="true" width="130" align="center" required="true"/>
<EF:EFComboColumn ename="applyPersonnel" cname="申请人" columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField" defaultValue="${loginName}"
maxLength="16" width="100" readonly="false" required="true"
align="center" filter="contains" sort="true">
<EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
</EF:EFComboColumn>
<EF:EFColumn ename="licensePlateCode" cname="车牌号" enable="true" width="130" align="center" required="true"/>
<EF:EFColumn ename="driver" cname="司机" enable="true" width="130" align="center" required="true"/>
<EF:EFColumn ename="startTime" cname="开始时间" width="110" align="center" editType="date"
......
src/main/webapp/HP/XT/HPXT002.js
......@@ -62,9 +62,9 @@ $(function () {
}
}
// $("#APPROVE").on("click",function () {
// approveFuncs();
// })
$("#APPROVE").on("click",function () {
approveFuncs();
})
downKeyUp();
})
......@@ -99,18 +99,18 @@ let save = function (btnNode) {
flag = false;
return false;
}
let licensePlateCode= item.get("licensePlateCode");
if(isBlank(licensePlateCode)){
message("选中的第"+(index+1)+"行\"车牌号\"，不能为空!");
flag = false;
return false;
}
let applyNo= item.get("applyNo");
if(isBlank(applyNo)){
message("选中的第"+(index+1)+"行\"保险单号\"，不能为空!");
flag = false;
return false;
}
// let licensePlateCode= item.get("licensePlateCode");
// if(isBlank(licensePlateCode)){
// message("选中的第"+(index+1)+"行\"车牌号\"，不能为空!");
// flag = false;
// return false;
// }
// let applyNo= item.get("applyNo");
// if(isBlank(applyNo)){
// message("选中的第"+(index+1)+"行\"保险单号\"，不能为空!");
// flag = false;
// return false;
// }
});
if(flag) {
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
......@@ -128,29 +128,29 @@ let save = function (btnNode) {
/**
* 提交
*/
// function approveFuncs() {
// let rows = resultGrid.getCheckedRows();
// if (rows.length < 1) {
// message("请选择数据");
// return;
// }
// let flag = true;
// $.each(rows, function(index, item) {
// let proApplyStatus= item.get("proApplyStatus");
// if(proApplyStatus=="1"){
// message("选中的第"+(index+1)+"行\"数据已提交\"，不能再次选中提交!");
// flag = false;
// return false;
// }
// });
// if(flag) {
// JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"提交\"操作? ", {
// ok: function () {
// JSUtils.submitGridsData("result", "HPXT001", "approve", true);
// }
// });
// }
// }
function approveFuncs() {
let rows = resultGrid.getCheckedRows();
if (rows.length < 1) {
message("请选择数据");
return;
}
let flag = true;
$.each(rows, function(index, item) {
let applyStatus= item.get("applyStatus");
if(applyStatus=="1"){
message("选中的第"+(index+1)+"行\"数据已提交\"，不能再次选中提交!");
flag = false;
return false;
}
});
if(flag) {
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"提交\"操作? ", {
ok: function () {
JSUtils.submitGridsData("result", "HPXT002", "approve", true);
}
});
}
}
/**
* 删除明细
......
src/main/webapp/HP/XT/HPXT002.jsp
......@@ -55,10 +55,14 @@
<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="120" align="center"/>
<EF:EFColumn ename="applyDate" cname="申请日期" width="110" align="center" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true" readonly="true"/>
<EF:EFColumn ename="applyNo" cname="保险单号" enable="true" width="130" align="center"/>
<EF:EFColumn ename="applyPersonnel" cname="申请人" enable="true" width="130" align="center" required="true"/>
<EF:EFColumn ename="licensePlateCode" cname="车牌号" enable="true" width="130" align="center" required="true"/>
<EF:EFComboColumn ename="proApplyStatus" cname="申请状态" width="80" align="center" enable="false" defaultValue="0">
<EF:EFComboColumn ename="applyPersonnel" cname="申请人" columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField" defaultValue="${loginName}"
maxLength="16" width="100" readonly="false" required="true"
align="center" filter="contains" sort="true">
<EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
</EF:EFComboColumn>
<EF:EFColumn ename="insuranceCompany" cname="保险公司" enable="true" width="130" align="center" required="true"/>
<EF:EFComboColumn ename="applyStatus" cname="申请状态" width="80" align="center" enable="false" defaultValue="0">
<EF:EFCodeOption codeName="hpjx.hpcg.proApplyStatus"/>
</EF:EFComboColumn>
</EF:EFGrid>
......
src/main/webapp/HP/XT/HPXT002A.jsp
......@@ -55,7 +55,6 @@
<%-- <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="80" align="center"/>--%>
<EF:EFColumn ename="licensePlateCode" cname="车牌号" enable="true" width="130" align="center" required="true"/>
<EF:EFColumn ename="insuranceType" cname="车险险种" enable="true" width="130" align="center" required="true"/>
<EF:EFColumn ename="insuranceCompany" cname="保险公司" enable="true" width="130" align="center" required="true"/>
<EF:EFColumn ename="insuranceAmount" cname="保险金额(元)" width="80" align="right" format="{0:N3}"
data-regex="/^-?[0-9]{1,12}([.][0-9]{1,3})?$/"
data-errorprompt="请输入数字，该值最大可设置12位整数和3位小数！" required="true"/>
......
src/main/webapp/HP/XT/HPXT004.js
......@@ -24,10 +24,10 @@ $(function () {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="showUploadFile(' + item.id + ')" >附件清单</a>';
}
if (item.id && item.status==0){
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
'onclick="approveFunc(' + item.id + ')" >返还</a>';
}
// if (item.id && item.status==0){
// template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
// 'onclick="approveFunc(' + item.id + ')" >返还</a>';
// }
return template;
}
}, {
......
src/main/webapp/HP/XT/HPXT004.jsp
......@@ -30,7 +30,12 @@
<EF:EFColumn ename="applyDate" cname="申请日期" width="110" align="center" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true" readonly="true"/>
<EF:EFColumn ename="applyNo" cname="申请单号" enable="false" width="130" align="center"/>
<EF:EFColumn ename="applyPersonnel" cname="申请人" enable="true" width="130" align="center" required="true"/>
<EF:EFComboColumn ename="applyPersonnel" cname="申请人" columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField" defaultValue="${loginName}"
maxLength="16" width="100" readonly="false" required="true"
align="center" filter="contains" sort="true">
<EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
</EF:EFComboColumn>
<EF:EFColumn ename="meetingRoom" cname="会议室" enable="true" width="130" align="center" required="true"/>
<EF:EFColumn ename="meetingSubject" cname="会议主题" enable="true" width="130" align="center" required="true"/>
<EF:EFComboColumn ename="meetingNature" cname="会议性质" width="130" align="center" enable="true" required="true">
......@@ -39,18 +44,18 @@
<EF:EFComboColumn ename="importanceLevel" cname="重要程度" width="130" align="center" enable="true" required="true">
<EF:EFCodeOption codeName="hpjx.hpxt.importanceLevel"/>
</EF:EFComboColumn>
<EF:EFColumn ename="startTime" cname="开始时间" width="110" align="center" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
<EF:EFColumn ename="endTime" cname="结束时间" width="110" align="center" editType="date"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
<EF:EFColumn ename="startTime" cname="开始时间" parseFormats="['yyyyMMddHHmmss']" align="center" editType="datetime"
dateFormat="yyyy-MM-dd HH:mm:ss" width="140" required="true"/>
<EF:EFColumn ename="endTime" cname="结束时间" parseFormats="['yyyyMMddHHmmss']" align="center" editType="datetime"
dateFormat="yyyy-MM-dd HH:mm:ss" width="140" required="true"/>
<EF:EFComboColumn ename="proApplyStatus" cname="提交状态" width="80" align="center" enable="false" defaultValue="0">
<EF:EFCodeOption codeName="hpjx.hpcg.proApplyStatus"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="status" cname="返还状态" width="80" align="center"
textField="textField" valueField="valueField" readonly="true" >
<EF:EFOption label="未返还" value="0"/>
<EF:EFOption label="已返还" value="1"/>
</EF:EFComboColumn>
<%-- <EF:EFComboColumn ename="status" cname="返还状态" width="80" align="center"--%>
<%-- textField="textField" valueField="valueField" readonly="true" >--%>
<%-- <EF:EFOption label="未返还" value="0"/>--%>
<%-- <EF:EFOption label="已返还" value="1"/>--%>
<%-- </EF:EFComboColumn>--%>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
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