Skip to content

H
hp-smart
Commit 451dee5c by 宋祥
Options

1.报工管理用工人数，支持小数位

parent 6ebe8cde
Showing with 261 additions and 157 deletions
src/main/java/com/baosight/hpjx/hp/fw/domain/HPFW001.java
......@@ -15,12 +15,12 @@ import com.baosight.iplat4j.core.util.StringUtils;
* Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
*
* @version 1.0
* @history 2024-09-24 17:44:20 create
* @history 2024-09-25 17:31:45 create
*/
public class HPFW001 extends DaoEPBase {
private static final long serialVersionUID = 1L;
public static final String FIELD_ID = "id"; /* ID*/
public static final String FIELD_COMPANY_CODE = "companyCode"; /* 公司编码*/
public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/
......@@ -36,11 +36,13 @@ public class HPFW001 extends DaoEPBase {
public static final String FIELD_AFTER_SALE_NO = "afterSaleNo"; /* 售后单号*/
public static final String FIELD_AFTER_SALE_TYPE = "afterSaleType"; /* 售后方式*/
public static final String FIELD_URGENCY = "urgency"; /* 紧急程度*/
public static final String FIELD_AFTER_SALE_CONTENT = "afterSaleContent"; /* 售后内容*/
public static final String FIELD_CUSTOM_ID = "customId"; /* 客户ID*/
public static final String FIELD_CUSTOM_NAME = "customName"; /* 客户名称*/
public static final String FIELD_DEAL_USER_ID = "dealUserId"; /* 处理人ID*/
public static final String FIELD_DEAL_USER_NAME = "dealUserName"; /* 处理人名称*/
public static final String FIELD_DEAL_CONTENT = "dealContent"; /* 处理内容*/
public static final String COL_ID = "ID"; /* ID*/
public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 公司编码*/
public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码*/
......@@ -56,17 +58,19 @@ public class HPFW001 extends DaoEPBase {
public static final String COL_AFTER_SALE_NO = "AFTER_SALE_NO"; /* 售后单号*/
public static final String COL_AFTER_SALE_TYPE = "AFTER_SALE_TYPE"; /* 售后方式*/
public static final String COL_URGENCY = "URGENCY"; /* 紧急程度*/
public static final String COL_AFTER_SALE_CONTENT = "AFTER_SALE_CONTENT"; /* 售后内容*/
public static final String COL_CUSTOM_ID = "CUSTOM_ID"; /* 客户ID*/
public static final String COL_CUSTOM_NAME = "CUSTOM_NAME"; /* 客户名称*/
public static final String COL_DEAL_USER_ID = "DEAL_USER_ID"; /* 处理人ID*/
public static final String COL_DEAL_USER_NAME = "DEAL_USER_NAME"; /* 处理人名称*/
public static final String COL_DEAL_CONTENT = "DEAL_CONTENT"; /* 处理内容*/
public static final String QUERY = "HPFW001.query";
public static final String COUNT = "HPFW001.count";
public static final String INSERT = "HPFW001.insert";
public static final String UPDATE = "HPFW001.update";
public static final String DELETE = "HPFW001.delete";
private Long id = new Long(0); /* ID*/
private String companyCode = " "; /* 公司编码*/
private String depCode = " "; /* 部门编码*/
......@@ -82,104 +86,114 @@ public class HPFW001 extends DaoEPBase {
private String afterSaleNo = " "; /* 售后单号*/
private Integer afterSaleType = new Integer(0); /* 售后方式*/
private Integer urgency = new Integer(0); /* 紧急程度*/
private String afterSaleContent = " "; /* 售后内容*/
private String customId = " "; /* 客户ID*/
private String customName = " "; /* 客户名称*/
private String dealUserId = " "; /* 处理人ID*/
private String dealUserName = " "; /* 处理人名称*/
private String dealContent = " "; /* 处理内容*/
/**
* initialize the metadata.
*/
public void initMetaData() {
EiColumn eiColumn;
eiColumn = new EiColumn(FIELD_ID);
eiColumn.setPrimaryKey(true);
eiColumn.setDescName("ID");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_CODE);
eiColumn.setDescName("公司编码");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEP_CODE);
eiColumn.setDescName("部门编码");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_BY);
eiColumn.setDescName("创建人");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_NAME);
eiColumn.setDescName("创建人名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_TIME);
eiColumn.setDescName("创建时间");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_BY);
eiColumn.setDescName("修改人");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_NAME);
eiColumn.setDescName("修改人名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_TIME);
eiColumn.setDescName("修改时间");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELETE_FLAG);
eiColumn.setDescName("是否删除 0-否1-是");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("维修状态 0-未处理 1-已维修");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_AFTER_SALE_DATE);
eiColumn.setDescName("售后日期");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_AFTER_SALE_NO);
eiColumn.setDescName("售后单号");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_AFTER_SALE_TYPE);
eiColumn.setDescName("售后方式");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_URGENCY);
eiColumn.setDescName("紧急程度");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_AFTER_SALE_CONTENT);
eiColumn.setDescName("售后内容");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CUSTOM_ID);
eiColumn.setDescName("客户ID");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CUSTOM_NAME);
eiColumn.setDescName("客户名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEAL_USER_ID);
eiColumn.setDescName("处理人ID");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEAL_USER_NAME);
eiColumn.setDescName("处理人名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEAL_CONTENT);
eiColumn.setDescName("处理内容");
eiMetadata.addMeta(eiColumn);
}
/**
* the constructor.
*/
public HPFW001() {
initMetaData();
}
/**
* get the id - ID.
* @return the id
......@@ -187,7 +201,7 @@ public class HPFW001 extends DaoEPBase {
public Long getId() {
return this.id;
}
/**
* set the id - ID.
*
......@@ -203,7 +217,7 @@ public class HPFW001 extends DaoEPBase {
public String getCompanyCode() {
return this.companyCode;
}
/**
* set the companyCode - 公司编码.
*
......@@ -219,7 +233,7 @@ public class HPFW001 extends DaoEPBase {
public String getDepCode() {
return this.depCode;
}
/**
* set the depCode - 部门编码.
*
......@@ -235,7 +249,7 @@ public class HPFW001 extends DaoEPBase {
public String getCreatedBy() {
return this.createdBy;
}
/**
* set the createdBy - 创建人.
*
......@@ -251,7 +265,7 @@ public class HPFW001 extends DaoEPBase {
public String getCreatedName() {
return this.createdName;
}
/**
* set the createdName - 创建人名称.
*
......@@ -267,7 +281,7 @@ public class HPFW001 extends DaoEPBase {
public String getCreatedTime() {
return this.createdTime;
}
/**
* set the createdTime - 创建时间.
*
......@@ -283,7 +297,7 @@ public class HPFW001 extends DaoEPBase {
public String getUpdatedBy() {
return this.updatedBy;
}
/**
* set the updatedBy - 修改人.
*
......@@ -299,7 +313,7 @@ public class HPFW001 extends DaoEPBase {
public String getUpdatedName() {
return this.updatedName;
}
/**
* set the updatedName - 修改人名称.
*
......@@ -315,7 +329,7 @@ public class HPFW001 extends DaoEPBase {
public String getUpdatedTime() {
return this.updatedTime;
}
/**
* set the updatedTime - 修改时间.
*
......@@ -331,7 +345,7 @@ public class HPFW001 extends DaoEPBase {
public Integer getDeleteFlag() {
return this.deleteFlag;
}
/**
* set the deleteFlag - 是否删除 0-否1-是.
*
......@@ -347,7 +361,7 @@ public class HPFW001 extends DaoEPBase {
public Integer getStatus() {
return this.status;
}
/**
* set the status - 维修状态 0-未处理 1-已维修.
*
......@@ -363,7 +377,7 @@ public class HPFW001 extends DaoEPBase {
public String getAfterSaleDate() {
return this.afterSaleDate;
}
/**
* set the afterSaleDate - 售后日期.
*
......@@ -379,7 +393,7 @@ public class HPFW001 extends DaoEPBase {
public String getAfterSaleNo() {
return this.afterSaleNo;
}
/**
* set the afterSaleNo - 售后单号.
*
......@@ -395,7 +409,7 @@ public class HPFW001 extends DaoEPBase {
public Integer getAfterSaleType() {
return this.afterSaleType;
}
/**
* set the afterSaleType - 售后方式.
*
......@@ -411,7 +425,7 @@ public class HPFW001 extends DaoEPBase {
public Integer getUrgency() {
return this.urgency;
}
/**
* set the urgency - 紧急程度.
*
......@@ -421,13 +435,29 @@ public class HPFW001 extends DaoEPBase {
this.urgency = urgency;
}
/**
* get the afterSaleContent - 售后内容.
* @return the afterSaleContent
*/
public String getAfterSaleContent() {
return this.afterSaleContent;
}
/**
* set the afterSaleContent - 售后内容.
*
* @param afterSaleContent - 售后内容
*/
public void setAfterSaleContent(String afterSaleContent) {
this.afterSaleContent = afterSaleContent;
}
/**
* get the customId - 客户ID.
* @return the customId
*/
public String getCustomId() {
return this.customId;
}
/**
* set the customId - 客户ID.
*
......@@ -443,7 +473,7 @@ public class HPFW001 extends DaoEPBase {
public String getCustomName() {
return this.customName;
}
/**
* set the customName - 客户名称.
*
......@@ -459,7 +489,7 @@ public class HPFW001 extends DaoEPBase {
public String getDealUserId() {
return this.dealUserId;
}
/**
* set the dealUserId - 处理人ID.
*
......@@ -475,7 +505,7 @@ public class HPFW001 extends DaoEPBase {
public String getDealUserName() {
return this.dealUserName;
}
/**
* set the dealUserName - 处理人名称.
*
......@@ -485,13 +515,29 @@ public class HPFW001 extends DaoEPBase {
this.dealUserName = dealUserName;
}
/**
* get the dealContent - 处理内容.
* @return the dealContent
*/
public String getDealContent() {
return this.dealContent;
}
/**
* set the dealContent - 处理内容.
*
* @param dealContent - 处理内容
*/
public void setDealContent(String dealContent) {
this.dealContent = dealContent;
}
/**
* get the value from Map.
*
* @param map - source data map
*/
@Override
public void fromMap(Map map) {
setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
......@@ -507,18 +553,20 @@ public class HPFW001 extends DaoEPBase {
setAfterSaleNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_AFTER_SALE_NO)), afterSaleNo));
setAfterSaleType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_AFTER_SALE_TYPE)), afterSaleType));
setUrgency(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_URGENCY)), urgency));
setAfterSaleContent(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_AFTER_SALE_CONTENT)), afterSaleContent));
setCustomId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CUSTOM_ID)), customId));
setCustomName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CUSTOM_NAME)), customName));
setDealUserId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEAL_USER_ID)), dealUserId));
setDealUserName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEAL_USER_NAME)), dealUserName));
setDealContent(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEAL_CONTENT)), dealContent));
}
/**
* set the value to Map.
*/
@Override
public Map toMap() {
Map map = new HashMap();
map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
......@@ -535,11 +583,13 @@ public class HPFW001 extends DaoEPBase {
map.put(FIELD_AFTER_SALE_NO, StringUtils.toString(afterSaleNo, eiMetadata.getMeta(FIELD_AFTER_SALE_NO)));
map.put(FIELD_AFTER_SALE_TYPE, StringUtils.toString(afterSaleType, eiMetadata.getMeta(FIELD_AFTER_SALE_TYPE)));
map.put(FIELD_URGENCY, StringUtils.toString(urgency, eiMetadata.getMeta(FIELD_URGENCY)));
map.put(FIELD_AFTER_SALE_CONTENT, StringUtils.toString(afterSaleContent, eiMetadata.getMeta(FIELD_AFTER_SALE_CONTENT)));
map.put(FIELD_CUSTOM_ID, StringUtils.toString(customId, eiMetadata.getMeta(FIELD_CUSTOM_ID)));
map.put(FIELD_CUSTOM_NAME, StringUtils.toString(customName, eiMetadata.getMeta(FIELD_CUSTOM_NAME)));
map.put(FIELD_DEAL_USER_ID, StringUtils.toString(dealUserId, eiMetadata.getMeta(FIELD_DEAL_USER_ID)));
map.put(FIELD_DEAL_USER_NAME, StringUtils.toString(dealUserName, eiMetadata.getMeta(FIELD_DEAL_USER_NAME)));
map.put(FIELD_DEAL_CONTENT, StringUtils.toString(dealContent, eiMetadata.getMeta(FIELD_DEAL_CONTENT)));
return map;
}
}
src/main/java/com/baosight/hpjx/hp/fw/domain/HPFW002.java
package com.baosight.hpjx.hp.fw.domain;
import com.baosight.iplat4j.core.data.DaoEPBase;
import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.util.NumberUtils;
import com.baosight.iplat4j.core.util.StringUtils;
import com.baosight.iplat4j.core.ei.EiColumn;
import com.baosight.iplat4j.core.data.DaoEPBase;
import java.util.HashMap;
import java.util.Map;
import com.baosight.iplat4j.core.util.StringUtils;
/**
* Project: <br>
......@@ -16,12 +15,12 @@ import java.util.Map;
* Copyrigth:Baosight Software LTD.co Copyright (c) 2019. <br>
*
* @version 1.0
* @history 2024-09-25 15:04:32 create
* @history 2024-09-25 17:31:47 create
*/
public class HPFW002 extends DaoEPBase {
private static final long serialVersionUID = 1L;
public static final String FIELD_ID = "id"; /* ID*/
public static final String FIELD_COMPANY_CODE = "companyCode"; /* 公司编码*/
public static final String FIELD_DEP_CODE = "depCode"; /* 部门编码*/
......@@ -37,11 +36,13 @@ public class HPFW002 extends DaoEPBase {
public static final String FIELD_CARE_NO = "careNo"; /* 关怀单号*/
public static final String FIELD_CARE_WAY = "careWay"; /* 关怀方式*/
public static final String FIELD_CARE_TYPE = "careType"; /* 关怀类型*/
public static final String FIELD_CARE_CONTENT = "careContent"; /* 关怀内容*/
public static final String FIELD_CUSTOM_ID = "customId"; /* 客户ID*/
public static final String FIELD_CUSTOM_NAME = "customName"; /* 客户名称*/
public static final String FIELD_DEAL_USER_ID = "dealUserId"; /* 执行人ID*/
public static final String FIELD_DEAL_USER_NAME = "dealUserName"; /* 执行人名称*/
public static final String FIELD_DEAL_CONTENT = "dealContent"; /* 处理内容*/
public static final String COL_ID = "ID"; /* ID*/
public static final String COL_COMPANY_CODE = "COMPANY_CODE"; /* 公司编码*/
public static final String COL_DEP_CODE = "DEP_CODE"; /* 部门编码*/
......@@ -57,17 +58,19 @@ public class HPFW002 extends DaoEPBase {
public static final String COL_CARE_NO = "CARE_NO"; /* 关怀单号*/
public static final String COL_CARE_WAY = "CARE_WAY"; /* 关怀方式*/
public static final String COL_CARE_TYPE = "CARE_TYPE"; /* 关怀类型*/
public static final String COL_CARE_CONTENT = "CARE_CONTENT"; /* 关怀内容*/
public static final String COL_CUSTOM_ID = "CUSTOM_ID"; /* 客户ID*/
public static final String COL_CUSTOM_NAME = "CUSTOM_NAME"; /* 客户名称*/
public static final String COL_DEAL_USER_ID = "DEAL_USER_ID"; /* 执行人ID*/
public static final String COL_DEAL_USER_NAME = "DEAL_USER_NAME"; /* 执行人名称*/
public static final String COL_DEAL_CONTENT = "DEAL_CONTENT"; /* 处理内容*/
public static final String QUERY = "HPFW002.query";
public static final String COUNT = "HPFW002.count";
public static final String INSERT = "HPFW002.insert";
public static final String UPDATE = "HPFW002.update";
public static final String DELETE = "HPFW002.delete";
private Long id = new Long(0); /* ID*/
private String companyCode = " "; /* 公司编码*/
private String depCode = " "; /* 部门编码*/
......@@ -83,104 +86,114 @@ public class HPFW002 extends DaoEPBase {
private String careNo = " "; /* 关怀单号*/
private Integer careWay = new Integer(0); /* 关怀方式*/
private Integer careType = new Integer(0); /* 关怀类型*/
private String careContent = " "; /* 关怀内容*/
private String customId = " "; /* 客户ID*/
private String customName = " "; /* 客户名称*/
private String dealUserId = " "; /* 执行人ID*/
private String dealUserName = " "; /* 执行人名称*/
private String dealContent = " "; /* 处理内容*/
/**
* initialize the metadata.
*/
public void initMetaData() {
EiColumn eiColumn;
eiColumn = new EiColumn(FIELD_ID);
eiColumn.setPrimaryKey(true);
eiColumn.setDescName("ID");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_COMPANY_CODE);
eiColumn.setDescName("公司编码");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEP_CODE);
eiColumn.setDescName("部门编码");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_BY);
eiColumn.setDescName("创建人");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_NAME);
eiColumn.setDescName("创建人名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CREATED_TIME);
eiColumn.setDescName("创建时间");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_BY);
eiColumn.setDescName("修改人");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_NAME);
eiColumn.setDescName("修改人名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_UPDATED_TIME);
eiColumn.setDescName("修改时间");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DELETE_FLAG);
eiColumn.setDescName("是否删除 0-否1-是");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_STATUS);
eiColumn.setDescName("状态 0-未处理 1-已维修");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CARE_DATE);
eiColumn.setDescName("关怀日期");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CARE_NO);
eiColumn.setDescName("关怀单号");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CARE_WAY);
eiColumn.setDescName("关怀方式");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CARE_TYPE);
eiColumn.setDescName("关怀类型");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CARE_CONTENT);
eiColumn.setDescName("关怀内容");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CUSTOM_ID);
eiColumn.setDescName("客户ID");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_CUSTOM_NAME);
eiColumn.setDescName("客户名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEAL_USER_ID);
eiColumn.setDescName("执行人ID");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEAL_USER_NAME);
eiColumn.setDescName("执行人名称");
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_DEAL_CONTENT);
eiColumn.setDescName("处理内容");
eiMetadata.addMeta(eiColumn);
}
/**
* the constructor.
*/
public HPFW002() {
initMetaData();
}
/**
* get the id - ID.
* @return the id
......@@ -188,7 +201,7 @@ public class HPFW002 extends DaoEPBase {
public Long getId() {
return this.id;
}
/**
* set the id - ID.
*
......@@ -204,7 +217,7 @@ public class HPFW002 extends DaoEPBase {
public String getCompanyCode() {
return this.companyCode;
}
/**
* set the companyCode - 公司编码.
*
......@@ -220,7 +233,7 @@ public class HPFW002 extends DaoEPBase {
public String getDepCode() {
return this.depCode;
}
/**
* set the depCode - 部门编码.
*
......@@ -236,7 +249,7 @@ public class HPFW002 extends DaoEPBase {
public String getCreatedBy() {
return this.createdBy;
}
/**
* set the createdBy - 创建人.
*
......@@ -252,7 +265,7 @@ public class HPFW002 extends DaoEPBase {
public String getCreatedName() {
return this.createdName;
}
/**
* set the createdName - 创建人名称.
*
......@@ -268,7 +281,7 @@ public class HPFW002 extends DaoEPBase {
public String getCreatedTime() {
return this.createdTime;
}
/**
* set the createdTime - 创建时间.
*
......@@ -284,7 +297,7 @@ public class HPFW002 extends DaoEPBase {
public String getUpdatedBy() {
return this.updatedBy;
}
/**
* set the updatedBy - 修改人.
*
......@@ -300,7 +313,7 @@ public class HPFW002 extends DaoEPBase {
public String getUpdatedName() {
return this.updatedName;
}
/**
* set the updatedName - 修改人名称.
*
......@@ -316,7 +329,7 @@ public class HPFW002 extends DaoEPBase {
public String getUpdatedTime() {
return this.updatedTime;
}
/**
* set the updatedTime - 修改时间.
*
......@@ -332,7 +345,7 @@ public class HPFW002 extends DaoEPBase {
public Integer getDeleteFlag() {
return this.deleteFlag;
}
/**
* set the deleteFlag - 是否删除 0-否1-是.
*
......@@ -348,7 +361,7 @@ public class HPFW002 extends DaoEPBase {
public Integer getStatus() {
return this.status;
}
/**
* set the status - 状态 0-未处理 1-已维修.
*
......@@ -364,7 +377,7 @@ public class HPFW002 extends DaoEPBase {
public String getCareDate() {
return this.careDate;
}
/**
* set the careDate - 关怀日期.
*
......@@ -380,7 +393,7 @@ public class HPFW002 extends DaoEPBase {
public String getCareNo() {
return this.careNo;
}
/**
* set the careNo - 关怀单号.
*
......@@ -396,7 +409,7 @@ public class HPFW002 extends DaoEPBase {
public Integer getCareWay() {
return this.careWay;
}
/**
* set the careWay - 关怀方式.
*
......@@ -412,7 +425,7 @@ public class HPFW002 extends DaoEPBase {
public Integer getCareType() {
return this.careType;
}
/**
* set the careType - 关怀类型.
*
......@@ -422,13 +435,29 @@ public class HPFW002 extends DaoEPBase {
this.careType = careType;
}
/**
* get the careContent - 关怀内容.
* @return the careContent
*/
public String getCareContent() {
return this.careContent;
}
/**
* set the careContent - 关怀内容.
*
* @param careContent - 关怀内容
*/
public void setCareContent(String careContent) {
this.careContent = careContent;
}
/**
* get the customId - 客户ID.
* @return the customId
*/
public String getCustomId() {
return this.customId;
}
/**
* set the customId - 客户ID.
*
......@@ -444,7 +473,7 @@ public class HPFW002 extends DaoEPBase {
public String getCustomName() {
return this.customName;
}
/**
* set the customName - 客户名称.
*
......@@ -460,7 +489,7 @@ public class HPFW002 extends DaoEPBase {
public String getDealUserId() {
return this.dealUserId;
}
/**
* set the dealUserId - 执行人ID.
*
......@@ -476,7 +505,7 @@ public class HPFW002 extends DaoEPBase {
public String getDealUserName() {
return this.dealUserName;
}
/**
* set the dealUserName - 执行人名称.
*
......@@ -486,13 +515,29 @@ public class HPFW002 extends DaoEPBase {
this.dealUserName = dealUserName;
}
/**
* get the dealContent - 处理内容.
* @return the dealContent
*/
public String getDealContent() {
return this.dealContent;
}
/**
* set the dealContent - 处理内容.
*
* @param dealContent - 处理内容
*/
public void setDealContent(String dealContent) {
this.dealContent = dealContent;
}
/**
* get the value from Map.
*
* @param map - source data map
*/
@Override
public void fromMap(Map map) {
setId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_ID)), id));
setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_COMPANY_CODE)), companyCode));
setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEP_CODE)), depCode));
......@@ -508,18 +553,20 @@ public class HPFW002 extends DaoEPBase {
setCareNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CARE_NO)), careNo));
setCareWay(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_CARE_WAY)), careWay));
setCareType(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_CARE_TYPE)), careType));
setCareContent(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CARE_CONTENT)), careContent));
setCustomId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CUSTOM_ID)), customId));
setCustomName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CUSTOM_NAME)), customName));
setDealUserId(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEAL_USER_ID)), dealUserId));
setDealUserName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEAL_USER_NAME)), dealUserName));
setDealContent(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_DEAL_CONTENT)), dealContent));
}
/**
* set the value to Map.
*/
@Override
public Map toMap() {
Map map = new HashMap();
map.put(FIELD_ID, StringUtils.toString(id, eiMetadata.getMeta(FIELD_ID)));
map.put(FIELD_COMPANY_CODE, StringUtils.toString(companyCode, eiMetadata.getMeta(FIELD_COMPANY_CODE)));
......@@ -536,11 +583,13 @@ public class HPFW002 extends DaoEPBase {
map.put(FIELD_CARE_NO, StringUtils.toString(careNo, eiMetadata.getMeta(FIELD_CARE_NO)));
map.put(FIELD_CARE_WAY, StringUtils.toString(careWay, eiMetadata.getMeta(FIELD_CARE_WAY)));
map.put(FIELD_CARE_TYPE, StringUtils.toString(careType, eiMetadata.getMeta(FIELD_CARE_TYPE)));
map.put(FIELD_CARE_CONTENT, StringUtils.toString(careContent, eiMetadata.getMeta(FIELD_CARE_CONTENT)));
map.put(FIELD_CUSTOM_ID, StringUtils.toString(customId, eiMetadata.getMeta(FIELD_CUSTOM_ID)));
map.put(FIELD_CUSTOM_NAME, StringUtils.toString(customName, eiMetadata.getMeta(FIELD_CUSTOM_NAME)));
map.put(FIELD_DEAL_USER_ID, StringUtils.toString(dealUserId, eiMetadata.getMeta(FIELD_DEAL_USER_ID)));
map.put(FIELD_DEAL_USER_NAME, StringUtils.toString(dealUserName, eiMetadata.getMeta(FIELD_DEAL_USER_NAME)));
map.put(FIELD_DEAL_CONTENT, StringUtils.toString(dealContent, eiMetadata.getMeta(FIELD_DEAL_CONTENT)));
return map;
}
}
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC010.java
......@@ -73,7 +73,7 @@ public class HPSC010 extends DaoEPBase {
private String registerDate = " "; /* 登记日期*/
private String factoryCode = " "; /* 工厂代码*/
private BigDecimal weight = new BigDecimal("0"); /* 产量*/
private Long userCount = new Long(0); /* 用工人数*/
private BigDecimal userCount = new BigDecimal(0); /* 用工人数*/
/**
* initialize the metadata.
......@@ -138,6 +138,9 @@ public class HPSC010 extends DaoEPBase {
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_USER_COUNT);
eiColumn.setType("N");
eiColumn.setScaleLength(1);
eiColumn.setFieldLength(18);
eiColumn.setDescName("用工人数");
eiMetadata.addMeta(eiColumn);
......@@ -363,7 +366,7 @@ public class HPSC010 extends DaoEPBase {
* get the userCount - 用工人数.
* @return the userCount
*/
public Long getUserCount() {
public BigDecimal getUserCount() {
return this.userCount;
}
......@@ -372,7 +375,7 @@ public class HPSC010 extends DaoEPBase {
*
* @param userCount - 用工人数
*/
public void setUserCount(Long userCount) {
public void setUserCount(BigDecimal userCount) {
this.userCount = userCount;
}
/**
......@@ -396,7 +399,7 @@ public class HPSC010 extends DaoEPBase {
setRegisterDate(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_REGISTER_DATE)), registerDate));
setFactoryCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_FACTORY_CODE)), factoryCode));
setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT)), weight));
setUserCount(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_USER_COUNT)), userCount));
setUserCount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_USER_COUNT)), userCount));
}
/**
......
src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC010A.java
......@@ -92,7 +92,7 @@ public class HPSC010A extends DaoEPBase {
private BigDecimal weight = new BigDecimal("0"); /* 产量*/
private BigDecimal weightJh = new BigDecimal("0"); /* 加焊产量*/
private Integer groupUserCount = 0; /* 组用工人数*/
private BigDecimal groupUserCount = new BigDecimal(0); /* 组用工人数*/
private Integer rowNo = 0;
private Long parentId = new Long(0); /* 父级ID*/
private Integer deleteFlag; /* 是否删除0:否1.是*/
......@@ -165,6 +165,9 @@ public class HPSC010A extends DaoEPBase {
eiMetadata.addMeta(eiColumn);
eiColumn = new EiColumn(FIELD_GROUP_USER_COUNT);
eiColumn.setType("N");
eiColumn.setScaleLength(1);
eiColumn.setFieldLength(20);
eiColumn.setDescName("组人数");
eiMetadata.addMeta(eiColumn);
......@@ -408,7 +411,7 @@ public class HPSC010A extends DaoEPBase {
* get the groupUserCount - 组人数.
* @return the groupUserCount
*/
public Integer getGroupUserCount() {
public BigDecimal getGroupUserCount() {
return this.groupUserCount;
}
......@@ -417,7 +420,7 @@ public class HPSC010A extends DaoEPBase {
*
* @param groupUserCount - 组人数
*/
public void setGroupUserCount(Integer groupUserCount) {
public void setGroupUserCount(BigDecimal groupUserCount) {
this.groupUserCount = groupUserCount;
}
......@@ -578,7 +581,7 @@ public class HPSC010A extends DaoEPBase {
setPrdtName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PRDT_NAME)), prdtName));
setWeight(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT)), weight));
setWeightJh(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_WEIGHT_JH)), weightJh));
setGroupUserCount(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_GROUP_USER_COUNT)), groupUserCount));
setGroupUserCount(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_GROUP_USER_COUNT)), groupUserCount));
setParentId(NumberUtils.toLong(StringUtils.toString(map.get(FIELD_PARENT_ID)), parentId));
setDeleteFlag(NumberUtils.toInteger(StringUtils.toString(map.get(FIELD_DELETE_FLAG)), deleteFlag));
setCreatedBy(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_CREATED_BY)), createdBy));
......
src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC010.java
......@@ -81,6 +81,7 @@ public class ServiceHPSC010 extends ServiceEPBase {
public EiInfo update(EiInfo inInfo) {
int i = 0;
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
HPSC010 hpsc010 = new HPSC010();
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
List<Map> list = eiBlock.getRows();
......@@ -99,7 +100,7 @@ public class ServiceHPSC010 extends ServiceEPBase {
hpsc010.setWeight(BigDecimal.valueOf(weight/2));
hpsc010.setId(Long.valueOf(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC010.FIELD_ID)));
hpsc010.setRegisterDate(StringUtil.removeHorizontalLine(registerDate));
hpsc010.setUserCount(Long.valueOf(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC010.FIELD_USER_COUNT)));
hpsc010.setUserCount(MapUtils.getBigDecimal(queryMap, HPSC010.FIELD_USER_COUNT));
DaoUtils.update(HPSC010.UPDATE, hpsc010);
inInfo.setStatus(EiConstant.STATUS_SUCCESS);
......@@ -119,17 +120,18 @@ public class ServiceHPSC010 extends ServiceEPBase {
public EiInfo insert(EiInfo inInfo) {
int i = 0;
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
HPSC010 hpxs010 = new HPSC010();
EiBlock eiBlock = inInfo.getBlock(EiConstant.resultBlock);
List<Map> list = eiBlock.getRows();
list.addAll(inInfo.getBlock(CommonConstant.Field.DETAIL).getRows());
double weight = 0;
String registerDate = inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC010.FIELD_REGISTER_DATE);
Map queryMap = new HashMap();
queryMap.put(HPSC010.FIELD_FACTORY_CODE,list.get(0).get(HPSC010.FIELD_FACTORY_CODE));
queryMap.put(HPSC010.FIELD_REGISTER_DATE,StringUtil.removeHorizontalLine(registerDate));
queryMap.put(HPSC010.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
queryFactoryCode(inInfo,queryMap);
Map paramMap = new HashMap();
paramMap.put(HPSC010.FIELD_FACTORY_CODE,list.get(0).get(HPSC010.FIELD_FACTORY_CODE));
paramMap.put(HPSC010.FIELD_REGISTER_DATE,StringUtil.removeHorizontalLine(registerDate));
paramMap.put(HPSC010.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
queryFactoryCode(inInfo,paramMap);
for (i = 0; i < list.size(); i++) {
Map<?, ?> map = list.get(i);
HPSC010A hpsc010A = new HPSC010A();
......@@ -138,10 +140,10 @@ public class ServiceHPSC010 extends ServiceEPBase {
}
hpxs010.fromMap(eiBlock.getRow(0));
hpxs010.setDeleteFlag(CommonConstant.YesNo.NO_0);
hpxs010.setWeight(BigDecimal.valueOf(weight/2));
hpxs010.setRegisterDate(StringUtil.removeHorizontalLine(registerDate));
hpxs010.setUserCount(Long.valueOf(inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HPSC010.FIELD_USER_COUNT)));
DaoUtils.insert(HPSC010.INSERT, hpxs010);
hpxs010.setWeight(BigDecimal.valueOf(weight / 2));
hpxs010.setRegisterDate(StringUtil.removeHorizontalLine(registerDate));
hpxs010.setUserCount(MapUtils.getBigDecimal(queryMap, HPSC010.FIELD_USER_COUNT));
DaoUtils.insert(HPSC010.INSERT, hpxs010);
inInfo.setStatus(EiConstant.STATUS_SUCCESS);
inInfo.setMsgByKey("ep.1000", new String[]{String.valueOf(i), I18nMessages.getText("label.insert", "新增")});
} catch (PlatException e) {
......@@ -165,4 +167,4 @@ public class ServiceHPSC010 extends ServiceEPBase {
AssertUtils.isNotEmpty(hpsc010List, String.format("日期[%s]工厂数据以存在，添加失败!",
queryMap.get(HPSC010.FIELD_REGISTER_DATE)));
}
}
\ No newline at end of file
}
src/main/webapp/HP/SC/HPSC010.jsp
......@@ -45,11 +45,11 @@
data-regex="/^-?[0-9]{1,16}([.][0-9]{1,3})?$/" maxLength="20" required="true"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"
/>
<EF:EFColumn ename="userCount" cname="用工人数" width="120" enable="false" format="{0:N3}" editType="text"
<EF:EFColumn ename="userCount" cname="用工人数" width="120" enable="false" format="{0:N1}" editType="text"
displayType="0.000" sort="true" align="right"
data-regex="/^-?[0-9]{1,16}([.][0-9]{1,3})?$/" maxLength="20" required="true"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"
/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
\ No newline at end of file
</EF:EFPage>
src/main/webapp/HP/SC/HPSC010A.jsp
......@@ -78,7 +78,7 @@
data-regex="/^-?[0-9]{1,16}([.][0-9]{1,3})?$/" maxLength="20" required="true"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"
/>
<EF:EFColumn ename="groupUserCount" cname="组用工数" maxLength="15" displayType="0" format="{0:N0}" enable="false" align="right"/>
<EF:EFColumn ename="groupUserCount" cname="组用工数" maxLength="15" displayType="0" format="{0:N1}" enable="false" align="right"/>
<%--<EF:EFColumn ename="remark" cname="备注" enable="true" width="200" align="center"/>--%>
</EF:EFGrid>
</EF:EFRegion>
......
src/main/webapp/HP/SC/HPSC096.js
......@@ -137,8 +137,8 @@ $(function (){
return false;
}
let groupUserCount = item.get("groupUserCount");
if (!isInteger(groupUserCount) || parseFloat(groupUserCount) < 0) {
message("选中的生产组第" + (index + 1) + "行\"组用工数\"，必须为正整数!");
if (!isNumber(groupUserCount) || parseFloat(groupUserCount) < 0) {
message("选中的生产组第" + (index + 1) + "行\"组用工数\"，必须为大于等于0的数字!");
flag = false;
return false;
}
......@@ -146,26 +146,26 @@ $(function (){
if(flag) {
JSUtils.confirm("确定对数据做\"保存\"操作? ", {
ok: function () {
var info = new EiInfo();
info.set("inqu_status-0-userCount",$("#inqu_status-0-userCount").val());
info.set("inqu_status-0-registerDate",registerDate);
info.set("inqu_status-0-id",$("#inqu_status-0-id").val());
info.addBlock(rowsBlock("result"));
var info = new EiInfo();
info.set("inqu_status-0-userCount", $("#inqu_status-0-userCount").val());
info.set("inqu_status-0-registerDate", registerDate);
info.set("inqu_status-0-id", $("#inqu_status-0-id").val());
info.addBlock(rowsBlock("result"));
info.addBlock(rowsBlock("detail"))
EiCommunicator.send("HPSC010", methodType, info, {
onSuccess: function (ei) {
if (ei.getStatus() >= 0) {
try {
EiCommunicator.send("HPSC096", methodType, info, {
onSuccess: function (ei) {
parent.JSColorbox.setValueCallback(ei);
parent.JSColorbox.close();
},
onFail: function (ei) {
// 发生异常
NotificationUtil("操作失败，原因[" + ei + "]", "error");
}
})
EiCommunicator.send("HPSC096", methodType, info, {
onSuccess: function (ei) {
parent.JSColorbox.setValueCallback(ei);
parent.JSColorbox.close();
},
onFail: function (ei) {
// 发生异常
NotificationUtil("操作失败，原因[" + ei + "]", "error");
}
})
} catch (e) {
// TODO: handle exception
}
......
src/main/webapp/HP/SC/HPSC096.jsp
......@@ -44,7 +44,7 @@
data-regex="/^-?[0-9]{1,16}([.][0-9]{1,3})?$/" maxLength="20"
data-errorprompt="请输入数字，该值最大可设置17位整数和3位小数！"
/>
<EF:EFColumn ename="groupUserCount" cname="组用工数" maxLength="15" displayType="0" format="{0:N0}" align="right"/>
<EF:EFColumn ename="groupUserCount" cname="组用工数" maxLength="15" displayType="0" format="{0:N1}" align="right"/>
<EF:EFComboColumn ename="groupType" cname="生产类型"
columnTemplate="#=textField#" itemTemplate="#=textField#"
textField="textField" valueField="valueField" hidden="true"
......@@ -111,4 +111,4 @@
<EF:EFButton ename="cancel" cname="取消" type="button" class="btn-align-right"/>
<EF:EFButton ename="confirm" cname="确认" type="button" class="btn-align-right"/>
</div>
</EF:EFPage>
\ No newline at end of file
</EF:EFPage>
src/main/webapp/HP/SC/HPSC105B.js
......@@ -2,8 +2,8 @@ $(function () {
$("#result-0-quantity_textField").on('change',function () {
var quantity = $("#result-0-quantity_textField").val();
if(!isPositiveInteger(quantity)){
message("报工数量必须是大于0的正整数")
if(!isPositiveNumber(quantity)){
message("报工数量必须是大于0的数字")
}
var taskWeight = $("#result-0-taskWeight_textField").val();
if(isPositiveNumber(taskWeight)) {
......@@ -28,8 +28,8 @@ $(function () {
$("#btn_save").on("click",function(){
let quantity = $("#result-0-quantity_textField").val().split("%")[0];
let unregisterQuantity = $("#result-0-unregisterQuantity").val();
if(!isPositiveInteger(quantity)){
message("报工数量必须是大于0的正整数");
if(!isPositiveNumber(quantity)){
message("报工数量必须是大于0的数字");
return ;
}
if (unregisterQuantity-quantity < 0){
......
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