From 849e0634fab58695e6197b9b89e340b2791294ad Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 17 七月 2023 18:09:25 +0800
Subject: [PATCH] 合同和计划管理问题修改
---
igds-core/src/main/java/com/ld/igds/models/Building.java | 4
igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml | 12
igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml | 13
igds-inout/src/main/java/com/ld/igds/m/view/PlanManage04.view.xml | 15 -
igds-inout/src/main/java/com/ld/igds/m/view/PlanManage01.view.xml | 15 -
igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java | 277 ++++++++++---------
igds-inout/src/main/java/com/ld/igds/m/service/HInoutCustomerService.java | 172 ++++++------
igds-inout/src/main/java/com/ld/igds/m/view/PlanManage02.view.xml | 15 -
igds-inout/src/main/java/com/ld/igds/m/view/PlanManage03.view.xml | 15 -
igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java | 286 ++++++++++---------
10 files changed, 403 insertions(+), 421 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/Building.java b/igds-core/src/main/java/com/ld/igds/models/Building.java
index a46af0b..6f116e7 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Building.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Building.java
@@ -36,6 +36,10 @@
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
+ @Column(name = "gbm", length = 50)
+ @PropertyDef(label = "寤掗棿鍥藉埆鐮�")
+ private String gbm;
+
@Column(name = "DEPT_ID_", length = 40)
@PropertyDef(label = "鎵�灞炲簱鐐�")
private String deptId;
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutCustomerService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutCustomerService.java
index 080572b..82a32c9 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutCustomerService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutCustomerService.java
@@ -6,6 +6,7 @@
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
+
import javax.transaction.Transactional;
import java.util.HashMap;
import java.util.List;
@@ -17,107 +18,108 @@
@Component
public class HInoutCustomerService extends HibernateDao {
- public List<InoutCustomer> queryList(Map<String, Object> parameter) {
+ public List<InoutCustomer> queryList(Map<String, Object> parameter) {
- String hql = " from " + InoutCustomer.class.getName()
- + " where companyId =:companyId and deptId =:deptId";
+ String hql = " from " + InoutCustomer.class.getName()
+ + " where companyId =:companyId and deptId =:deptId";
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
- args.put("deptId", ContextUtil.subDeptId(null));
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
- if (null != parameter) {
- String str = (String) parameter.get("id");
- if (StringUtils.isNoneEmpty(str)) {
- hql += " and id like:id";
- args.put("id", "%" + str + "%");
- }
+ if (null != parameter) {
+ String str = (String) parameter.get("id");
+ if (StringUtils.isNoneEmpty(str)) {
+ hql += " and id like:id";
+ args.put("id", "%" + str + "%");
+ }
- str = (String) parameter.get("type");
- if (StringUtils.isNoneEmpty(str)) {
- hql += " and type =:type";
- args.put("type", str);
- }
+ str = (String) parameter.get("type");
+ if (StringUtils.isNoneEmpty(str)) {
+ hql += " and type =:type";
+ args.put("type", str);
+ }
- str = (String) parameter.get("name");
- if (StringUtils.isNoneEmpty(str)) {
- hql += " and name like:name";
- args.put("name", "%" + str + "%");
- }
+ str = (String) parameter.get("name");
+ if (StringUtils.isNoneEmpty(str)) {
+ hql += " and name like:name";
+ args.put("name", "%" + str + "%");
+ }
- str = (String) parameter.get("key");
- if (StringUtils.isNoneEmpty(str)) {
- hql += " and (name like:name or id like:id) ";
- args.put("name", "%" + str + "%");
- args.put("id", "%" + str + "%");
- }
- }
+ str = (String) parameter.get("key");
+ if (StringUtils.isNoneEmpty(str)) {
+ hql += " and (name like:name or id like:id) ";
+ args.put("name", "%" + str + "%");
+ args.put("id", "%" + str + "%");
+ }
+ }
- hql += " order by name ";
+ hql += " order by name ";
- return this.query(hql, args);
- }
+ return this.query(hql, args);
+ }
- @Transactional
- public String saveOrUpdateData(InoutCustomer data) {
+ @Transactional
+ public String saveOrUpdateData(InoutCustomer data) {
- Session session = this.getSessionFactory().openSession();
+ Session session = this.getSessionFactory().openSession();
- try {
- if (StringUtils.isEmpty(data.getDeptId())) {
- data.setDeptId(ContextUtil.subDeptId(null));
- }
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
+ try {
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setDeptId(ContextUtil.subDeptId(null));
+ }
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
- if (StringUtils.isEmpty(data.getId())) {
- String customerId = getCustomerId(data.getCompanyId());
- data.setId(customerId);
- session.save(data);
- } else {
- session.update(data);
- }
- } finally {
- session.flush();
- session.close();
- }
- return null;
- }
+ if (StringUtils.isEmpty(data.getId())) {
+ String customerId = getCustomerId(data.getCompanyId());
+ data.setId(customerId);
+ session.save(data);
+ } else {
+ session.saveOrUpdate(data);
+ }
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
- /**
- * 鑾峰彇瀹㈡埛缂栫爜
- * @param companyId
- * @return
- */
- private String getCustomerId(String companyId) {
+ /**
+ * 鑾峰彇瀹㈡埛缂栫爜
+ *
+ * @param companyId
+ * @return
+ */
+ private String getCustomerId(String companyId) {
- String hql = " from " + InoutCustomer.class.getName()
- + " where companyId =:companyId";
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", companyId);
+ String hql = " from " + InoutCustomer.class.getName()
+ + " where companyId =:companyId";
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", companyId);
- hql += " order by id + 0 ";
- List<InoutCustomer> list = this.query(hql, args);
+ hql += " order by id + 0 ";
+ List<InoutCustomer> list = this.query(hql, args);
- int endNum = 0;
+ int endNum = 0;
- if(list != null && list.size() > 0){
- InoutCustomer inoutCustomer = list.get(list.size() - 1);
- endNum = Integer.valueOf(inoutCustomer.getId());
- }
- return ("" + (endNum + 100000 + 1)).substring(1);
- }
+ if (list != null && list.size() > 0) {
+ InoutCustomer inoutCustomer = list.get(list.size() - 1);
+ endNum = Integer.valueOf(inoutCustomer.getId());
+ }
+ return ("" + (endNum + 100000 + 1)).substring(1);
+ }
- @Transactional
- public String delData(InoutCustomer data) {
- Session session = this.getSessionFactory().openSession();
- try {
- session.delete(data);
- } finally {
- session.flush();
- session.close();
- }
- return null;
- }
+ @Transactional
+ public String delData(InoutCustomer data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ session.delete(data);
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java
index d7af8ad..373da1e 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java
@@ -19,164 +19,173 @@
@Component
public class HPlanManageService extends HibernateDao {
- public void pagePlan(Page<InoutPlan> page, Map<String, Object> param)
- throws Exception {
- String hql = " from " + InoutPlan.class.getName()
- + " where companyId =:companyId and deptId =:deptId";
+ public void pagePlan(Page<InoutPlan> page, Map<String, Object> param)
+ throws Exception {
+ String hql = " from " + InoutPlan.class.getName()
+ + " where companyId =:companyId and deptId =:deptId";
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
- args.put("deptId", ContextUtil.subDeptId(null));
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
- if (null != param) {
- String str = (String) param.get("id");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and id like:id";
- args.put("id", "%" + str + "%");
- }
- Integer year = (Integer) param.get("year");
- if (null != year) {
- hql += " and year =:year";
- args.put("year", String.valueOf(year));
- }
- str = (String) param.get("type");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and type =:type";
- args.put("type", str);
- }
- str = (String) param.get("referenceNumber");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and referenceNumber like:referenceNumber";
- args.put("referenceNumber", "%" + str + "%");
- }
- str = (String) param.get("name");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and name like:name";
- args.put("name", "%" + str + "%");
- }
- str = (String) param.get("key");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and (name like :name or referenceNumber like:referenceNumber) ";
- args.put("name", "%" + str + "%");
- args.put("referenceNumber", "%" + str + "%");
- }
- }
+ if (null != param) {
+ String str = (String) param.get("id");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and id like:id";
+ args.put("id", "%" + str + "%");
+ }
+ Integer year = (Integer) param.get("year");
+ if (null != year) {
+ hql += " and year =:year";
+ args.put("year", String.valueOf(year));
+ }
+ str = (String) param.get("type");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and type =:type";
+ args.put("type", str);
+ }
+ str = (String) param.get("referenceNumber");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and referenceNumber like:referenceNumber";
+ args.put("referenceNumber", "%" + str + "%");
+ }
+ str = (String) param.get("name");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and name like:name";
+ args.put("name", "%" + str + "%");
+ }
+ str = (String) param.get("key");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and (name like :name or referenceNumber like:referenceNumber) ";
+ args.put("name", "%" + str + "%");
+ args.put("referenceNumber", "%" + str + "%");
+ }
+ }
- String count = "select count(*) " + hql;
+ String count = "select count(*) " + hql;
- hql += " order by createTime desc";
+ hql += " order by createTime desc";
- this.pagingQuery(page, hql, count, args);
- }
+ this.pagingQuery(page, hql, count, args);
+ }
+ public List<InoutPlan> listPlan() {
+ String hql = " from " + InoutPlan.class.getName()
+ + " where companyId =:companyId and deptId =:deptId";
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
- public List<InoutPlanDetail> listPlanDetail(String planId) {
-
- String hql = " from " + InoutPlanDetail.class.getName();
-
- if(null != planId){
- hql += " where planId=:planId ";
- Map<String, Object> args = new HashMap<String, Object>();
- args.put("planId", planId);
- return this.query(hql, args);
- }
+ return this.query(hql, args);
+ }
- return this.query(hql);
- }
+ public List<InoutPlanDetail> listPlanDetail(String planId) {
- @Transactional
- public String delPlan(InoutPlan data) {
- Session session = this.getSessionFactory().openSession();
- try {
- if (null != data.getId()) {
- this.delPlanDetailByPlanId(data.getId(), session);
- session.delete(data);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- return null;
- }
+ String hql = " from " + InoutPlanDetail.class.getName();
- public String delPlanDetail(InoutPlanDetail data) {
- Session session = this.getSessionFactory().openSession();
- try {
- if (null != data.getId()) {
- session.delete(data);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- return null;
- }
+ if (null != planId) {
+ hql += " where planId=:planId ";
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("planId", planId);
+ return this.query(hql, args);
+ }
- private void delPlanDetailByPlanId(String id, Session session) {
- String hql = " delete from " + InoutPlanDetail.class.getName()
- + " where planId=:planId";
+ return this.query(hql);
+ }
- session.createQuery(hql).setString("planId", id).executeUpdate();
- }
+ @Transactional
+ public String delPlan(InoutPlan data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null != data.getId()) {
+ this.delPlanDetailByPlanId(data.getId(), session);
+ session.delete(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
- public void savePlan(InoutPlan data) {
- if (null == data.getCompanyId()) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
+ public String delPlanDetail(InoutPlanDetail data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null != data.getId()) {
+ session.delete(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
+
+ private void delPlanDetailByPlanId(String id, Session session) {
+ String hql = " delete from " + InoutPlanDetail.class.getName()
+ + " where planId=:planId";
+
+ session.createQuery(hql).setString("planId", id).executeUpdate();
+ }
+
+ public void savePlan(InoutPlan data) {
+ if (null == data.getCompanyId()) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
if (null == data.getDeptId()) {
data.setDeptId(ContextUtil.subDeptId(null));
}
- Session session = this.getSessionFactory().openSession();
- try {
- if (null == data.getId()) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null == data.getId()) {
List<InoutPlan> list = getPlanId(data);
data.setId(InoutManageUtil.createPlanId(data.getType(), data.getYear(), list));
data.setCreateUser(ContextUtil.getLoginUserCName());
data.setCreateTime(new Date());
- session.save(data);
- } else {
- session.update(data);
- }
- savePlanDetail(data.getDetails(), data.getId(), session);
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- }
+ session.save(data);
+ } else {
+ session.update(data);
+ }
+ savePlanDetail(data.getDetails(), data.getId(), session);
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ }
- private void savePlanDetail(List<InoutPlanDetail> details, String planId,
- Session session) {
- if (null == details || details.isEmpty())
- return;
- for (InoutPlanDetail planDetail : details) {
- if (null == planDetail.getId()) {
- planDetail.setPlanId(planId);
- planDetail.setId(ContextUtil.getUUID());
- session.save(planDetail);
- } else {
- session.update(planDetail);
- }
- }
- }
+ private void savePlanDetail(List<InoutPlanDetail> details, String planId,
+ Session session) {
+ if (null == details || details.isEmpty())
+ return;
+ for (InoutPlanDetail planDetail : details) {
+ if (null == planDetail.getId()) {
+ planDetail.setPlanId(planId);
+ planDetail.setId(ContextUtil.getUUID());
+ session.save(planDetail);
+ } else {
+ session.update(planDetail);
+ }
+ }
+ }
- public List<InoutPlan> getPlanId(InoutPlan plan){
- String hql = " from " + InoutPlan.class.getName()
- + " where companyId =:companyId and deptId =:deptId and year =:year";
+ public List<InoutPlan> getPlanId(InoutPlan plan) {
+ String hql = " from " + InoutPlan.class.getName()
+ + " where companyId =:companyId and deptId =:deptId and year =:year";
- Map<String,Object> args = new HashMap<String,Object>();
- args.put("companyId", plan.getCompanyId());
- args.put("deptId", plan.getDeptId());
- args.put("year", plan.getYear());
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", plan.getCompanyId());
+ args.put("deptId", plan.getDeptId());
+ args.put("year", plan.getYear());
- hql += " order by createTime desc";
+ hql += " order by createTime desc";
- return this.query(hql, args);
- }
+ return this.query(hql, args);
+ }
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
index 65e756f..1b9053c 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
@@ -107,6 +107,11 @@
<PropertyDef name="customerBank">
<Property></Property>
<Property name="label">瀹㈡埛寮�鎴疯</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("KHKHH")}</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="customerBankAccount">
<Property></Property>
@@ -119,6 +124,11 @@
<PropertyDef name="bank">
<Property></Property>
<Property name="label">鏈柟寮�鎴疯</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("KHKHH")}</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="bankAccount">
<Property></Property>
@@ -378,7 +388,7 @@
if(price && contactAmount){

//璁＄畻鍊掑叆鏁伴噺
- var money = price*contactAmount;
+ var money = price*contactAmount/1000;
curData.set("money",money); 
}
};</ClientEvent>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
index 642c3ca..6a4c300 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml
@@ -22,6 +22,11 @@
<Property></Property>
<Property name="label">鎵�灞炶鍒�</Property>
<Property name="required">false</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("planManagePR#listPlan").getResult()}</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="planName">
<Property></Property>
@@ -715,8 +720,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">planName</Property>
- <Property name="property">planName</Property>
+ <Property name="name">planId</Property>
+ <Property name="property">planId</Property>
<Property name="trigger">ddPlan</Property>
<Editor/>
</AutoFormElement>
@@ -876,7 +881,7 @@
<DataSet id="dsPlan">
<Property name="dataProvider">planManagePR#pagePlan</Property>
<Property name="dataType">[dtPlan]</Property>
- <Property name="parameter"/>
+ <Property name="parameter"></Property>
<Property name="pageSize">5</Property>
</DataSet>
<Container layout="hbox regionPadding:5">
@@ -952,7 +957,7 @@
<DataSet id="dsContract">
<Property name="dataProvider">contractManagePR#pageContract</Property>
<Property name="dataType">[dtContract]</Property>
- <Property name="parameter"/>
+ <Property name="parameter"></Property>
<Property name="pageSize">5</Property>
</DataSet>
<Container layout="hbox regionPadding:5">
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage01.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage01.view.xml
index 54be5e0..115b4a6 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage01.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage01.view.xml
@@ -529,21 +529,6 @@
<Property name="align">center</Property>
<Property name="name">planNum</Property>
</DataColumn>
- <DataColumn>
- <Property name="property">price</Property>
- <Property name="align">center</Property>
- <Property name="name">price</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">total</Property>
- <Property name="align">center</Property>
- <Property name="name">total</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">createTime</Property>
- <Property name="align">center</Property>
- <Property name="name">createTime</Property>
- </DataColumn>
</DataGrid>
</Children>
<Tools/>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage02.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage02.view.xml
index b310801..b2c94d6 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage02.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage02.view.xml
@@ -529,21 +529,6 @@
<Property name="align">center</Property>
<Property name="name">planNum</Property>
</DataColumn>
- <DataColumn>
- <Property name="property">price</Property>
- <Property name="align">center</Property>
- <Property name="name">price</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">total</Property>
- <Property name="align">center</Property>
- <Property name="name">total</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">createTime</Property>
- <Property name="align">center</Property>
- <Property name="name">createTime</Property>
- </DataColumn>
</DataGrid>
</Children>
<Tools/>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage03.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage03.view.xml
index 85ba443..0089137 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage03.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage03.view.xml
@@ -529,21 +529,6 @@
<Property name="align">center</Property>
<Property name="name">planNum</Property>
</DataColumn>
- <DataColumn>
- <Property name="property">price</Property>
- <Property name="align">center</Property>
- <Property name="name">price</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">total</Property>
- <Property name="align">center</Property>
- <Property name="name">total</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">createTime</Property>
- <Property name="align">center</Property>
- <Property name="name">createTime</Property>
- </DataColumn>
</DataGrid>
</Children>
<Tools/>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage04.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage04.view.xml
index 51362bb..952f03a 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage04.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManage04.view.xml
@@ -529,21 +529,6 @@
<Property name="align">center</Property>
<Property name="name">planNum</Property>
</DataColumn>
- <DataColumn>
- <Property name="property">price</Property>
- <Property name="align">center</Property>
- <Property name="name">price</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">total</Property>
- <Property name="align">center</Property>
- <Property name="name">total</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">createTime</Property>
- <Property name="align">center</Property>
- <Property name="name">createTime</Property>
- </DataColumn>
</DataGrid>
</Children>
<Tools/>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
index c5659fc..002ecde 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
@@ -23,160 +23,172 @@
/**
* 缁煎悎涓氬姟-璁″垝绠＄悊
- *
- * @author: chen
*
+ * @author: chen
*/
@Component
public class PlanManagePR {
- @Autowired
- private HPlanManageService service;
- @Autowired
- private SysDeptService sysDeptService;
+ @Autowired
+ private HPlanManageService service;
+ @Autowired
+ private SysDeptService sysDeptService;
- /**
- * planManagePR#getPlanTitle 鑾峰彇璁″垝title
- *
- * @param
- * @return
- */
- @DataProvider
- public Map<String, Object> getPlanTitle(Map<String, Object> param) {
- Map<String, Object> result = new HashMap<String, Object>();
- //鑾峰彇鍙傛暟涓姤琛ㄧ被鍨�
- String type = (String)param.get("type");
+ /**
+ * planManagePR#getPlanTitle 鑾峰彇璁″垝title
+ *
+ * @param
+ * @return
+ */
+ @DataProvider
+ public Map<String, Object> getPlanTitle(Map<String, Object> param) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ //鑾峰彇鍙傛暟涓姤琛ㄧ被鍨�
+ String type = (String) param.get("type");
- //璁剧疆璁″垝title
- String title = "璁″垝";
- if(InoutManageUtil.PLAN_TYPE_1.equals(type)){
- title = "閲囪喘" + title;
- }
- if(InoutManageUtil.PLAN_TYPE_2.equals(type)){
- title = "閿�鍞�" + title;
- }
- if(InoutManageUtil.PLAN_TYPE_3.equals(type)){
- title = "杞崲" + title;
- }
- if(InoutManageUtil.PLAN_TYPE_4.equals(type)){
- title = "鍔犲伐" + title;
- }
+ //璁剧疆璁″垝title
+ String title = "璁″垝";
+ if (InoutManageUtil.PLAN_TYPE_1.equals(type)) {
+ title = "閲囪喘" + title;
+ }
+ if (InoutManageUtil.PLAN_TYPE_2.equals(type)) {
+ title = "閿�鍞�" + title;
+ }
+ if (InoutManageUtil.PLAN_TYPE_3.equals(type)) {
+ title = "杞崲" + title;
+ }
+ if (InoutManageUtil.PLAN_TYPE_4.equals(type)) {
+ title = "鍔犲伐" + title;
+ }
- //鑾峰彇鍙傛暟涓垎搴撶紪鐮�
- String deptId = (String)param.get("deptId");
- if (StringUtils.isEmpty(deptId)) {
- deptId = ContextUtil.subDeptId(null);
- }
- //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
- String deptName = "";
- List<DefaultDept> defaultDepts = sysDeptService.loadUserDepts(ContextUtil.getLoginUserName());
- for (DefaultDept defaultDept : defaultDepts) {
- if(defaultDept.getId().equals(deptId)){
- deptName = defaultDept.getName();
- }
- }
+ //鑾峰彇鍙傛暟涓垎搴撶紪鐮�
+ String deptId = (String) param.get("deptId");
+ if (StringUtils.isEmpty(deptId)) {
+ deptId = ContextUtil.subDeptId(null);
+ }
+ //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
+ String deptName = "";
+ List<DefaultDept> defaultDepts = sysDeptService.loadUserDepts(ContextUtil.getLoginUserName());
+ for (DefaultDept defaultDept : defaultDepts) {
+ if (defaultDept.getId().equals(deptId)) {
+ deptName = defaultDept.getName();
+ }
+ }
- if (StringUtils.isNotEmpty(deptName)) {
- title = deptName + " - " + title;
- }
- result.put("title", title);
- return result;
- }
+ if (StringUtils.isNotEmpty(deptName)) {
+ title = deptName + " - " + title;
+ }
+ result.put("title", title);
+ return result;
+ }
- /**
- * 璁″垝绫诲瀷
- * ${dorado.getDataProvider("planManagePR#triggerPlanType").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerPlanType() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
+ /**
+ * 璁″垝绫诲瀷
+ * ${dorado.getDataProvider("planManagePR#triggerPlanType").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerPlanType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
- list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_1, "閲囪喘璁″垝"));
- list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_2, "閿�鍞鍒�"));
- list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_3, "杞崲璁″垝"));
- list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_4, "鍔犲伐璁″垝"));
+ list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_1, "閲囪喘璁″垝"));
+ list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_2, "閿�鍞鍒�"));
+ list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_3, "杞崲璁″垝"));
+ list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_4, "鍔犲伐璁″垝"));
- return list;
- }
+ return list;
+ }
- /**
- * 杞崲璁″垝绫诲瀷
- * ${dorado.getDataProvider("planManagePR#triggerPlanTurn").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerPlanTurn() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
+ /**
+ * 杞崲璁″垝绫诲瀷
+ * ${dorado.getDataProvider("planManagePR#triggerPlanTurn").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerPlanTurn() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
- list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_TURN_IN, "杞叆"));
- list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_TURN_OUT, "杞嚭"));
+ list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_TURN_IN, "杞叆"));
+ list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_TURN_OUT, "杞嚭"));
- return list;
- }
+ return list;
+ }
- /**
- * 鑾峰彇璁″垝鍒楄〃
- * planManagePR#pagePlan
- *
- * @param page
- * @param param
- * @throws Exception
- */
- @DataProvider
- public void pagePlan(Page<InoutPlan> page, Map<String, Object> param) throws Exception {
- if (null == param) {
- param = new HashMap<String, Object>();
- }
- service.pagePlan(page, param);
- }
+ /**
+ * 鑾峰彇璁″垝鍒楄〃
+ * planManagePR#pagePlan
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pagePlan(Page<InoutPlan> page, Map<String, Object> param) throws Exception {
+ if (null == param) {
+ param = new HashMap<String, Object>();
+ }
+ service.pagePlan(page, param);
+ }
- /**
- * 鑾峰彇璁″垝璇︾粏鍒楄〃
- * planManagePR#listPlanDetail
- *
- * @param planId
- * @return
- */
- @DataProvider
- public List<InoutPlanDetail> listPlanDetail(String planId) {
- return service.listPlanDetail(planId);
- }
+ /**
+ * 鑾峰彇璁″垝璇︾粏鍒楄〃
+ * planManagePR#listPlan
+ *
+ * @param
+ * @return
+ */
+ @DataProvider
+ public List<InoutPlan> listPlan() {
+ return service.listPlan();
+ }
- /**
- * 淇濆瓨璁″垝
- * planManagePR#savePlan
- *
- * @param data
- */
- @DataResolver
- public void savePlan(InoutPlan data) {
- service.savePlan(data);
- }
- /**
- * 鍒犻櫎璁″垝
- * planManagePR#delPlan
- *
- * @param data
- * @return
- */
- @Expose
- public String delPlan(InoutPlan data) {
- return service.delPlan(data);
- }
-
- /**
- * 鍒犻櫎璁″垝璇︾粏淇℃伅
- * planManagePR#delPlanDetail
- *
- * @param data
- * @return
- */
- @Expose
- public String delPlanDetail(InoutPlanDetail data){
- return service.delPlanDetail(data);
- }
+ /**
+ * 鑾峰彇璁″垝璇︾粏鍒楄〃
+ * planManagePR#listPlanDetail
+ *
+ * @param planId
+ * @return
+ */
+ @DataProvider
+ public List<InoutPlanDetail> listPlanDetail(String planId) {
+ return service.listPlanDetail(planId);
+ }
+
+ /**
+ * 淇濆瓨璁″垝
+ * planManagePR#savePlan
+ *
+ * @param data
+ */
+ @DataResolver
+ public void savePlan(InoutPlan data) {
+ service.savePlan(data);
+ }
+
+ /**
+ * 鍒犻櫎璁″垝
+ * planManagePR#delPlan
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delPlan(InoutPlan data) {
+ return service.delPlan(data);
+ }
+
+ /**
+ * 鍒犻櫎璁″垝璇︾粏淇℃伅
+ * planManagePR#delPlanDetail
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delPlanDetail(InoutPlanDetail data) {
+ return service.delPlanDetail(data);
+ }
}
--
Gitblit v1.9.3