From 37758b759bce63f0ed20d6c9c95b7ee9dda5224e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 26 十一月 2025 18:30:56 +0800
Subject: [PATCH] 新增收储公司、库区页面，及相关逻辑调整
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/DicPR.java | 2
fzzy-igdss-web/src/main/resources/templates/system/dept/edit.html | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/Constant.java | 6
fzzy-igdss-web/src/main/resources/templates/system/dept/dept.html | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java | 81 ++
fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java | 202 +++++
fzzy-igdss-view/src/main/java/models/core.model.xml | 94 ++
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java | 85 ++
fzzy-igdss-view/src/main/java/com/fzzy/igds/DicArea.view.xml | 202 +----
fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java | 48 +
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DepotStore.java | 98 ++
fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml | 463 +++++++++++++
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeptRepository.java | 36 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml | 557 ++++++++++++++++
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Grain.java | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/CompanyRepository.java | 27
fzzy-igdss-web/src/main/resources/templates/system/dept/add.html | 2
fzzy-igdss-web/src/main/resources/templates/system/dept/tree.html | 2
fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java | 45 +
fzzy-igdss-web/src/main/resources/d7/common.css | 9
fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml | 22
22 files changed, 1,834 insertions(+), 155 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/Constant.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/Constant.java
index 468cafc..c244709 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/Constant.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/Constant.java
@@ -7,6 +7,12 @@
*/
public class Constant {
+
+ /**
+ * 閮ㄩ棬绫诲瀷
+ */
+ public static String DEPT_TYPE_10 = "10"; //鍏徃
+ public static String DEPT_TYPE_20 = "20"; //搴撳尯
//鏄紝鍚敤
public static final String YN_Y = "Y";
//鍚︼紝绂佺敤
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DepotStore.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DepotStore.java
new file mode 100644
index 0000000..3e5732a
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DepotStore.java
@@ -0,0 +1,98 @@
+package com.fzzy.igds.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 绮搴撳瓨绠＄悊
+ * @Author CZT
+ * @Date 2025/11/26 11:10
+ */
+@Data
+@Entity
+@Table(name = "d_depot_store")
+@TableName("d_depot_store")
+@EqualsAndHashCode(callSuper = false)
+public class DepotStore extends BizBaseEntity implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ public static String SORT_PROP = "updateDate";
+
+ @Id
+ @Column(name = "id", columnDefinition = "varchar(50) COMMENT '涓婚敭'")
+ @TableField("id")
+ private String id;
+
+ @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
+ @TableField("dept_id")
+ private String deptId;
+
+ @Column(name = "depot_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炰粨搴�'")
+ @TableField("depot_id")
+ private String depotId;
+
+ @Column(name = "food_type", columnDefinition = "varchar(3) COMMENT '绮鎬ц川'")
+ @TableField("food_type")
+ private String foodType;
+
+ @Column(name = "food_variety", columnDefinition = "varchar(7) COMMENT '绮鍝佺'")
+ @TableField("food_variety")
+ private String foodVariety;
+
+ @Column(name = "food_level", columnDefinition = "varchar(2) COMMENT '绮绛夌骇'")
+ @TableField("food_level")
+ private String foodLevel;
+
+ @Column(name = "food_locationId", columnDefinition = "varchar(40) COMMENT '绮浜у湴'")
+ @TableField("food_locationId")
+ private String foodLocationId;
+
+ @Column(name = "food_location", columnDefinition = "varchar(40) COMMENT '绮浜у湴'")
+ @TableField("food_location")
+ private String foodLocation;
+
+ @Column(name = "food_year", columnDefinition = "varchar(4) COMMENT '绮骞翠唤'")
+ @TableField("food_year")
+ private String foodYear;
+
+ @Column(name = "depot_status", columnDefinition = "varchar(2) COMMENT '浠撳簱鐘舵��(1=绌轰粨,2=鍏ュ簱涓�,3=灏佷粨,4=鍑哄簱涓�,9=鍏朵粬)'")
+ @TableField("depot_status")
+ private String depotStatus;
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @Column(name = "store_date", columnDefinition = "datetime COMMENT '鍏ュ簱鏃堕棿'")
+ @TableField("store_date")
+ private Date storeDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @Column(name = "full_date", columnDefinition = "datetime COMMENT '灏佷粨鏃ユ湡'")
+ @TableField("full_date")
+ private Date fullDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @Column(name = "out_date", columnDefinition = "datetime COMMENT '鍑轰粨鏃堕棿'")
+ @TableField("out_date")
+ private Date outDate;
+
+ @Column(name = "storage_real", columnDefinition = "decimal(20,2) COMMENT '瀹為檯鍌ㄩ噺(鍗曚綅锛欿G)'")
+ @TableField("storage_real")
+ private Double storageReal;
+
+ @Column(name = "remark", columnDefinition = "varchar(40) COMMENT '澶囨敞'")
+ @TableField("remark")
+ private String remark;
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Grain.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Grain.java
index 0b49e78..9d3d837 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Grain.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Grain.java
@@ -102,7 +102,7 @@
@TableField("remark")
private String remark;
- @Column(name = "points", columnDefinition = "longtext(2000) COMMENT '閲囬泦鐐逛俊鎭�'")
+ @Column(name = "points", columnDefinition = "varchar(2000) COMMENT '閲囬泦鐐逛俊鎭�'")
@TableField("points")
private String points;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java
index 90c2f30..d205fea 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java
@@ -60,7 +60,7 @@
@TableField("weight")
private Double weight = 0.00;
- @Column(name = "points", columnDefinition = "longtext(2000) COMMENT '閲囬泦鐐逛俊鎭�'")
+ @Column(name = "points", columnDefinition = "varchar(2000) COMMENT '閲囬泦鐐逛俊鎭�'")
@TableField("points")
private String points;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/CompanyRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/CompanyRepository.java
new file mode 100644
index 0000000..c8d6855
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/CompanyRepository.java
@@ -0,0 +1,27 @@
+package com.fzzy.igds.repository;
+
+import com.fzzy.igds.domain.Company;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author CZT
+ * @Date 2025/11/26 15:48
+ */
+@Service
+public interface CompanyRepository extends JpaRepository<Company, String> {
+
+ /**
+ * 鏍规嵁companyId鑾峰彇淇℃伅
+ *
+ * @param companyId
+ * @return
+ */
+ @Query("from Company where companyId =:companyId order by id")
+ List<Company> getAllData(@Param("companyId") String companyId);
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeptRepository.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeptRepository.java
new file mode 100644
index 0000000..6fdb937
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/repository/DeptRepository.java
@@ -0,0 +1,36 @@
+package com.fzzy.igds.repository;
+
+import com.fzzy.igds.domain.Dept;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description
+ * @Author CZT
+ * @Date 2025/11/26 15:48
+ */
+@Service
+public interface DeptRepository extends JpaRepository<Dept, String> {
+
+ /**
+ * 鏍规嵁id鑾峰彇淇℃伅
+ *
+ * @param id
+ * @return
+ */
+ @Query("from Dept where id =:id order by id")
+ Dept getDataById(@Param("id") String id);
+
+ /**
+ * 鏍规嵁companyId鑾峰彇淇℃伅
+ *
+ * @param companyId
+ * @return
+ */
+ @Query("from Dept where companyId =:companyId order by id")
+ List<Dept> getAllData(@Param("companyId") String companyId);
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
new file mode 100644
index 0000000..84b2ecb
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java
@@ -0,0 +1,85 @@
+package com.fzzy.igds.service;
+
+import com.fzzy.igds.domain.Company;
+import com.fzzy.igds.repository.CompanyRepository;
+import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description service灞�
+ * @Author CZT
+ * @Date 2025/11/26 15:48
+ */
+@Service
+public class CoreCompanyService {
+
+ @Resource
+ private CompanyRepository companyRepository;
+
+ /**
+ * jpa鏌ヨ鍏徃淇℃伅
+ * @param companyId
+ * @return
+ */
+ public List<Company> getAllData(String companyId) {
+
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getCompanyId();
+ }
+ return companyRepository.getAllData(companyId);
+ }
+
+ /**
+ * jpa鏂板鍏徃淇℃伅
+ * @param sysDept
+ * @return
+ */
+ public void saveOrUpdate(SysDept sysDept) {
+ if (null == sysDept) {
+ return;
+ }
+ Company company = new Company();
+ company.setId(sysDept.getDeptId() + "");
+ company.setDwmc(sysDept.getDeptName());
+ company.setQylxr(sysDept.getLeader());
+ company.setFrlxfs(sysDept.getPhone());
+ company.setDzyx(sysDept.getEmail());
+ company.setDwzt(sysDept.getStatus());
+ company.setCompanyId(sysDept.getCompanyId());
+
+ //鍒涘缓淇℃伅
+ company.setCreateBy(ContextUtil.getLoginUserName());
+ company.setCreateTime(new Date());
+
+ this.update(company);
+ }
+
+ /**
+ * jpa鏇存柊鍏徃淇℃伅
+ * @param data
+ */
+ public void update(Company data) {
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ //鏇存柊淇℃伅
+ data.setUpdateBy(ContextUtil.getLoginUserName());
+ data.setUpdateTime(new Date());
+
+ companyRepository.save(data);
+ }
+
+ /**
+ * 鍒犻櫎鍏徃淇℃伅
+ * @param deptId
+ * @return
+ */
+ public void delData(String deptId) {
+ companyRepository.deleteById(deptId);
+ }
+}
\ No newline at end of file
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
new file mode 100644
index 0000000..d376ebb
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
@@ -0,0 +1,81 @@
+package com.fzzy.igds.service;
+
+import com.fzzy.igds.domain.Dept;
+import com.fzzy.igds.repository.DeptRepository;
+import com.fzzy.igds.utils.ContextUtil;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description service灞�
+ * @Author CZT
+ * @Date 2025/11/26 17:48
+ */
+@Service
+public class CoreDeptService {
+
+ @Resource
+ private DeptRepository deptRepository;
+
+ /**
+ * jpa鏌ヨ淇℃伅
+ * @param companyId
+ * @return
+ */
+ public List<Dept> getAllData(String companyId) {
+
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getCompanyId();
+ }
+ return deptRepository.getAllData(companyId);
+ }
+
+ /**
+ * jpa鏂板搴撳尯淇℃伅
+ * @param sysDept
+ * @return
+ */
+ public void saveOrUpdate(SysDept sysDept) {
+ if (null == sysDept) {
+ return;
+ }
+ Dept dept = new Dept();
+ dept.setId(sysDept.getDeptId() + "");
+ dept.setKqmc(sysDept.getDeptName());
+ dept.setCompanyId(sysDept.getCompanyId());
+
+ //鍒涘缓淇℃伅
+ dept.setCreateBy(ContextUtil.getLoginUserName());
+ dept.setCreateTime(new Date());
+
+ this.update(dept);
+ }
+
+ /**
+ * jpa鏇存柊搴撳尯淇℃伅
+ * @param data
+ */
+ public void update(Dept data) {
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ //鏇存柊淇℃伅
+ data.setUpdateBy(ContextUtil.getLoginUserName());
+ data.setUpdateTime(new Date());
+
+ deptRepository.save(data);
+ }
+
+ /**
+ * 鍒犻櫎搴撳尯淇℃伅
+ * @param deptId
+ * @return
+ */
+ public void delData(String deptId) {
+ deptRepository.deleteById(deptId);
+ }
+}
\ No newline at end of file
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml
index 9fa0f12..5270dff 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml
@@ -4,13 +4,21 @@
<Context/>
<Model/>
<View layout="padding:10">
+ <ClientEvent name="onClick">
+/**
+* 鏌ヨ
+*/
+query = function(){
+ view.get("#dsMain").flushAsync();
+}
</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
+ <Property name="loadMode">lazy</Property>
<Property name="dataType">[dtBank]</Property>
<Property name="dataProvider">bankPR#listAll</Property>
</DataSet>
<DataSet id="dsParam">
- <ClientEvent name="onReady">self.insert();</ClientEvent>
+ <ClientEvent name="onReady">self.insert({});</ClientEvent>
<Property name="dataType">dtBaseParam</Property>
</DataSet>
<Container>
@@ -28,6 +36,7 @@
</AutoFormElement>
<Button>
<ClientEvent name="onClick">var param = view.get("#dsParam.data");
+console.log("param");
view.get("#dsMian").set("parameter",param).flushAsync();
</ClientEvent>
<Property name="caption">鎼滅储</Property>
@@ -73,7 +82,7 @@
$alert("寮傚父淇℃伅锛�"+result.message);
}else{
$notify("鎵ц鎴愬姛");
- data.remove()
+ query();
}
})
}</ClientEvent>
@@ -87,22 +96,29 @@
<ClientEvent name="onDataRowClick">self.set("selection", arg.data)</ClientEvent>
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
- <RowNumColumn/>
<RowSelectorColumn/>
+ <RowNumColumn/>
<DataColumn name="name">
<Property name="property">name</Property>
+ <Property name="width">400</Property>
</DataColumn>
<DataColumn name="status">
<Property name="property">status</Property>
+ <Property name="align">center</Property>
+ <Property name="width">150</Property>
</DataColumn>
<DataColumn name="remark">
<Property name="property">remark</Property>
</DataColumn>
<DataColumn name="updateBy">
<Property name="property">updateBy</Property>
+ <Property name="align">center</Property>
+ <Property name="width">160</Property>
</DataColumn>
<DataColumn name="updateTime">
<Property name="property">updateTime</Property>
+ <Property name="align">center</Property>
+ <Property name="width">200</Property>
</DataColumn>
</DataGrid>
</Container>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml
new file mode 100644
index 0000000..6778bd3
--- /dev/null
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml
@@ -0,0 +1,557 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.igds.domain.Company</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">鍏徃缂栫爜</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">绯荤粺缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="dwdm">
+ <Property></Property>
+ <Property name="label">鍗曚綅淇＄敤鐮�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="dwmc">
+ <Property></Property>
+ <Property name="label">鍗曚綅鍚嶇О</Property>
+ <Property name="required">true</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="dwlx">
+ <Property></Property>
+ <Property name="label">鍗曚綅绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-绮浠撳偍浼佷笟</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11-涓ぎ鐩村睘鍌ㄥ绮簱</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12-涓胺绮补闆嗗洟</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">13</Property>
+ <Property name="value">13-鐪佺骇鍌ㄥ绮簱</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">14</Property>
+ <Property name="value">14-鍦板競绾у偍澶囩伯搴�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">15</Property>
+ <Property name="value">15-鍘跨骇鍌ㄥ绮簱</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">19</Property>
+ <Property name="value">19-鍏朵粬浠撳偍浼佷笟</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-绮璐攢浼佷笟</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3-绮鍔犲伐浼佷笟</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4-绮璁惧鍒堕�犱紒涓�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">9</Property>
+ <Property name="value">9-鍏朵粬绮浼佷笟</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="zcrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">娉ㄥ唽鏃ユ湡</Property>
+ </PropertyDef>
+ <PropertyDef name="zczb">
+ <Property name="dataType">Double</Property>
+ <Property name="label">娉ㄥ唽璧勬湰</Property>
+ <Property name="displayFormat">#0.000 涓囧厓</Property>
+ </PropertyDef>
+ <PropertyDef name="zcze">
+ <Property name="dataType">Double</Property>
+ <Property name="label">璧勪骇鎬婚</Property>
+ <Property name="displayFormat">#0.000 涓囧厓</Property>
+ </PropertyDef>
+ <PropertyDef name="fddbr">
+ <Property></Property>
+ <Property name="label">娉曞畾浠ｈ〃浜�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="frsfzh">
+ <Property></Property>
+ <Property name="label">娉曚汉韬唤璇�</Property>
+ </PropertyDef>
+ <PropertyDef name="frlxfs">
+ <Property></Property>
+ <Property name="label">娉曚汉鐢佃瘽</Property>
+ </PropertyDef>
+ <PropertyDef name="qylxr">
+ <Property></Property>
+ <Property name="label">浼佷笟鑱旂郴浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="bgdh">
+ <Property></Property>
+ <Property name="label">鍔炲叕鐢佃瘽</Property>
+ </PropertyDef>
+ <PropertyDef name="zcdz">
+ <Property></Property>
+ <Property name="label">娉ㄥ唽鍦板潃</Property>
+ </PropertyDef>
+ <PropertyDef name="dzyx">
+ <Property></Property>
+ <Property name="label">鐢靛瓙閭</Property>
+ </PropertyDef>
+ <PropertyDef name="qygfwzdz">
+ <Property></Property>
+ <Property name="label">瀹樻柟缃戝潃</Property>
+ </PropertyDef>
+ <PropertyDef name="czhm">
+ <Property></Property>
+ <Property name="label">浼犵湡鍙风爜</Property>
+ </PropertyDef>
+ <PropertyDef name="yzbm">
+ <Property></Property>
+ <Property name="label">閭斂缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="xzqhdm">
+ <Property></Property>
+ <Property name="label">鍖哄垝浠ｇ爜</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="xzqhmc">
+ <Property></Property>
+ <Property name="label">鍖哄垝鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="kqs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">搴撳尯鏁�</Property>
+ <Property name="displayFormat">#0 涓�</Property>
+ </PropertyDef>
+ <PropertyDef name="jd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">缁忓害</Property>
+ </PropertyDef>
+ <PropertyDef name="wd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绾害</Property>
+ </PropertyDef>
+ <PropertyDef name="dwzt">
+ <Property></Property>
+ <Property name="label">鍗曚綅鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-姝ｅ父</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-寮傚父</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒涘缓鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="createBy">
+ <Property></Property>
+ <Property name="label">鍒涘缓浜�</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateBy">
+ <Property></Property>
+ <Property name="label">鏇存柊浜�</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="padding:10">
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataProvider">companyPR#getData</Property>
+ <Property name="dataType">[dtMain]</Property>
+ </DataSet>
+ <Container>
+ <Property name="className">c-param</Property>
+ <ToolBar>
+ <ToolBarButton>
+ <ClientEvent name="onClick">var select = view.get("#dgMain").get("selection");
+if(select){
+ view.get("#dialogMain").show();;
+}else{
+ $notify("璇烽�夋嫨闇�瑕佺紪杈戠殑鏁版嵁鈥︹��");
+}</ClientEvent>
+ <Property name="caption">淇敼</Property>
+ <Property name="exClassName">btn2</Property>
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-pencil-square-o</Property>
+ </ToolBarButton>
+ <ToolBarButton>
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();
+ </ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="exClassName">btn-q2</Property>
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </ToolBarButton>
+ </ToolBar>
+ <DataGrid id="dgMain" layoutConstraint="padding:8">
+ <ClientEvent name="onDataRowClick">view.get("#dgMain").set("selection",arg.data);</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="selectionMode">singleRow</Property>
+ <RowSelectorColumn/>
+ <RowNumColumn/>
+ <DataColumn name="id">
+ <Property name="property">id</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="dwmc">
+ <Property name="property">dwmc</Property>
+ </DataColumn>
+ <DataColumn name="dwdm">
+ <Property name="property">dwdm</Property>
+ <Property name="align">center</Property>
+ <Property name="width">180</Property>
+ </DataColumn>
+ <DataColumn name="dwlx">
+ <Property name="property">dwlx</Property>
+ <Property name="align">center</Property>
+ <Property name="width">180</Property>
+ </DataColumn>
+ <DataColumn name="zcze">
+ <Property name="property">zcze</Property>
+ <Property name="align">center</Property>
+ <Property name="width">180</Property>
+ </DataColumn>
+ <DataColumn name="fddbr">
+ <Property name="property">fddbr</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="kqs">
+ <Property name="property">kqs</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn name="dwzt">
+ <Property name="property">dwzt</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn name="updateBy">
+ <Property name="property">updateBy</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
+ <Property name="align">center</Property>
+ <Property name="width">160</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="width">1200</Property>
+ <Property name="caption">鏀跺偍鍏徃淇℃伅</Property>
+ <Property name="closeable">false</Property>
+ <Property name="iconClass">fa fa-tasks</Property>
+ <Buttons>
+ <Button id="btnOk">
+ <ClientEvent name="onClick">view.get("#uaSave").execute(function(result){
+ if(result){
+ $alert(result);
+ }else{
+ $notify("淇濆瓨鎴愬姛锛侊紒");
+ view.get("#dialogMain").hide();
+ }
+ });</ClientEvent>
+ <Property name="caption">淇濆瓨</Property>
+ <Property name="iconClass">fa fa-check-circle</Property>
+ <Property name="exClassName">btn1</Property>
+ <Property name="width">120</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
+ self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="exClassName">btn3</Property>
+ <Property name="iconClass">fa fa-times-circle</Property>
+ <Property name="width">120</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator"> : </Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">dwmc</Property>
+ <Property name="property">dwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwdm</Property>
+ <Property name="property">dwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwlx</Property>
+ <Property name="property">dwlx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwzt</Property>
+ <Property name="property">dwzt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zcrq</Property>
+ <Property name="property">zcrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zczb</Property>
+ <Property name="property">zczb</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zcze</Property>
+ <Property name="property">zcze</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fddbr</Property>
+ <Property name="property">fddbr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">frsfzh</Property>
+ <Property name="property">frsfzh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">frlxfs</Property>
+ <Property name="property">frlxfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qylxr</Property>
+ <Property name="property">qylxr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bgdh</Property>
+ <Property name="property">bgdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dzyx</Property>
+ <Property name="property">dzyx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">zcdz</Property>
+ <Property name="property">zcdz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yzbm</Property>
+ <Property name="property">yzbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">qygfwzdz</Property>
+ <Property name="property">qygfwzdz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czhm</Property>
+ <Property name="property">czhm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzqhmc</Property>
+ <Property name="property">xzqhmc</Property>
+ <Property name="trigger">ddFoodOrigin</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzqhdm</Property>
+ <Property name="property">xzqhdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqs</Property>
+ <Property name="property">kqs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jd</Property>
+ <Property name="property">jd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createBy</Property>
+ <Property name="property">createBy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createTime</Property>
+ <Property name="property">createTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wd</Property>
+ <Property name="property">wd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateBy</Property>
+ <Property name="property">updateBy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Link>
+ <Property name="href">http://api.map.baidu.com/lbsapi/getpoint/</Property>
+ <Property name="target">_blank</Property>
+ <Property name="style">
+ <Property name="padding-left">150px</Property>
+ </Property>
+ <Property name="text">甯姪锛氱偣鍑诲潗鏍囦綅缃嬀鍙�</Property>
+ </Link>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="uaSave">
+ <Property name="dataResolver">companyPR#updateData</Property>
+ <Property name="successMessage">鏁版嵁淇濆瓨瀹屾垚锛�</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="validateData">false</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <CustomDropDown id="ddFoodOrigin">
+ <Property name="minHeight">500</Property>
+ <Property name="assignmentMap">xzqhmc=name,xzqhdm=code</Property>
+ <Property name="minWidth">500</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsFoodOrigin">
+ <Property name="dataProvider">dicAreaPR#pageList</Property>
+ <Property name="dataType">[dtArea]</Property>
+ <Property name="parameter"></Property>
+ <Property name="pageSize">10</Property>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key2">
+ <Property name="blankText"> -- 鍚嶇О --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key2.value");
+view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="exClassName">btn4</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }</ClientEvent>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="exClassName">btn1</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }</ClientEvent>
+ <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="code">
+ <Property name="property">code</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="name">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.processDefault = true;</ClientEvent>
+ <Property name="property">name</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="simple">
+ <Property name="property">simple</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ <DataPilot layoutConstraint="bottom">
+ <Property name="dataSet">dsFoodOrigin</Property>
+ </DataPilot>
+ </Container>
+ </CustomDropDown>
+ </View>
+</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java
new file mode 100644
index 0000000..9ae2259
--- /dev/null
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/CompanyPR.java
@@ -0,0 +1,48 @@
+package com.fzzy.igds;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.fzzy.igds.domain.Company;
+import com.fzzy.igds.service.CoreCompanyService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Description 鏀跺偍鍏徃PR灞�
+ * @Author CZT
+ * @Date 2025/11/26 15:48
+ */
+@Component
+public class CompanyPR {
+
+ @Resource
+ private CoreCompanyService coreCompanyService;
+
+ /**
+ * 鏌ヨ璁惧,灏嗘搷浣滀俊鎭皟鏁翠负绌猴紝榛樿鍖呮嫭鍒嗗簱鍙傛暟
+ *
+ * companyPR#getData
+ *
+ * @return
+ */
+ @DataProvider
+ public List<Company> getData() {
+
+ return coreCompanyService.getAllData(null);
+ }
+
+
+ /**
+ * companyPR#saveData
+ */
+ @DataResolver
+ public void updateData(Company data) {
+
+ Company company = new Company();
+ BeanUtils.copyProperties(data, company);
+ coreCompanyService.update(company);
+ }
+
+}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml
new file mode 100644
index 0000000..b46488a
--- /dev/null
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Dept.view.xml
@@ -0,0 +1,463 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.fzzy.igds.domain.Dept</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">搴撳尯缂栫爜</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="kqmc">
+ <Property></Property>
+ <Property name="label">搴撳尯鍚嶇О</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="kqdz">
+ <Property></Property>
+ <Property name="label">搴撳尯鍦板潃</Property>
+ </PropertyDef>
+ <PropertyDef name="xzqhdm">
+ <Property></Property>
+ <Property name="label">鍖哄垝浠ｇ爜</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="xzqhmc">
+ <Property></Property>
+ <Property name="label">鍖哄垝鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="kqcq">
+ <Property></Property>
+ <Property name="label">搴撳尯浜ф潈</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-鑷湁</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-绉熻祦</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3-鍏辨湁</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4-娣峰悎</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">9</Property>
+ <Property name="value">9-鍏朵粬</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="yxcr">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鏈夋晥浠撳</Property>
+ <Property name="displayFormat">#0.000 鍚�</Property>
+ </PropertyDef>
+ <PropertyDef name="zdmj">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗犲湴闈㈢Н</Property>
+ <Property name="displayFormat">#0.000 骞虫柟绫�</Property>
+ </PropertyDef>
+ <PropertyDef name="cfs">
+ <Property name="dataType">Integer</Property>
+ <Property name="label">浠撳簱鏁�</Property>
+ <Property name="displayFormat">#0 鏍�</Property>
+ </PropertyDef>
+ <PropertyDef name="jd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">缁忓害</Property>
+ </PropertyDef>
+ <PropertyDef name="wd">
+ <Property name="dataType">Double</Property>
+ <Property name="label">绾害</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒涘缓鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="createBy">
+ <Property></Property>
+ <Property name="label">鍒涘缓浜�</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="updateBy">
+ <Property></Property>
+ <Property name="label">鏇存柊浜�</Property>
+ <Property name="readOnly">true</Property>
+ </PropertyDef>
+ <PropertyDef name="imgId">
+ <Property></Property>
+ <Property name="label">楦熺灠鍥緄d</Property>
+ </PropertyDef>
+ <PropertyDef name="imgName">
+ <Property></Property>
+ <Property name="label">楦熺灠鍥�</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="padding:10">
+ <ClientEvent name="onClick">/**
+ /**
+ * 棰勮鍥剧墖
+ */
+ showImg = function(){
+ var cur = view.get("#dsMain.data:#");
+ var imgName = cur.get("imgId");
+ if(!imgName){
+ $alert("娌℃湁涓婁紶瑙嗛淇℃伅锛屾棤娉曢瑙堛��");
+ return;
+ }
+ var id = cur.get("id");
+ 
+ view.get("#iFrameImg").set("path", "./basic/file/dept-img?id=" + id);
+ view.get("#dialogImg").show();
+ 
+ };</ClientEvent>
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataProvider">deptPR#getData</Property>
+ <Property name="dataType">[dtMain]</Property>
+ </DataSet>
+ <Container>
+ <Property name="className">c-param</Property>
+ <ToolBar>
+ <ToolBarButton>
+ <ClientEvent name="onClick">var select = view.get("#dgMain").get("selection");
+if(select){
+ view.get("#dialogMain").show();;
+}else{
+ $notify("璇烽�夋嫨闇�瑕佺紪杈戠殑鏁版嵁鈥︹��");
+}</ClientEvent>
+ <Property name="caption">淇敼</Property>
+ <Property name="exClassName">btn2</Property>
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-pencil-square-o</Property>
+ </ToolBarButton>
+ <ToolBarButton>
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();
+ </ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="exClassName">btn-q2</Property>
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </ToolBarButton>
+ </ToolBar>
+ <DataGrid id="dgMain" layoutConstraint="padding:8">
+ <ClientEvent name="onDataRowClick">view.get("#dgMain").set("selection",arg.data);</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="selectionMode">singleRow</Property>
+ <RowSelectorColumn/>
+ <RowNumColumn/>
+ <DataColumn name="id">
+ <Property name="property">id</Property>
+ <Property name="align">center</Property>
+ <Property name="width">160</Property>
+ </DataColumn>
+ <DataColumn name="kqmc">
+ <Property name="property">kqmc</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="kqcq">
+ <Property name="property">kqcq</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="yxcr">
+ <Property name="property">yxcr</Property>
+ <Property name="align">center</Property>
+ <Property name="width">180</Property>
+ </DataColumn>
+ <DataColumn name="zdmj">
+ <Property name="property">zdmj</Property>
+ <Property name="align">center</Property>
+ <Property name="width">180</Property>
+ </DataColumn>
+ <DataColumn name="cfs">
+ <Property name="property">cfs</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn name="updateBy">
+ <Property name="property">updateBy</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
+ <Property name="align">center</Property>
+ <Property name="width">160</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="iconClass">fa fa-tasks</Property>
+ <Property name="caption">搴撳尯淇℃伅</Property>
+ <Property name="width">1200</Property>
+ <Property name="closeable">false</Property>
+ <Buttons>
+ <Button id="btnOk">
+ <ClientEvent name="onClick">view.get("#uaSave").execute(function(result){
+ if(result){
+ $alert(result);
+ }else{
+ $notify("淇濆瓨鎴愬姛锛侊紒");
+ view.get("#dialogMain").hide();
+ }
+ });</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="exClassName">btn1</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
+ self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="exClassName">btn3</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator"> : </Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">kqmc</Property>
+ <Property name="property">kqmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">kqdz</Property>
+ <Property name="property">kqdz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqcq</Property>
+ <Property name="property">kqcq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yxcr</Property>
+ <Property name="property">yxcr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zdmj</Property>
+ <Property name="property">zdmj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cfs</Property>
+ <Property name="property">cfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzqhmc</Property>
+ <Property name="property">xzqhmc</Property>
+ <Property name="trigger">ddFoodOrigin</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzqhdm</Property>
+ <Property name="property">xzqhdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Label>
+ <Property name="text"></Property>
+ </Label>
+ <AutoFormElement>
+ <Property name="name">createBy</Property>
+ <Property name="property">createBy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">createTime</Property>
+ <Property name="property">createTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jd</Property>
+ <Property name="property">jd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateBy</Property>
+ <Property name="property">updateBy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wd</Property>
+ <Property name="property">wd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">imgName</Property>
+ <Property name="property">imgName</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="editorType">Label</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText"> -- 绯荤粺鑷姩鐢熸垚 --</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <Container>
+ <Button layoutConstraint="left">
+ <Property name="action">uploadFileImg</Property>
+ <Property name="caption">楦熺灠鍥句笂浼�...</Property>
+ <Property name="exClassName">btn2</Property>
+ <Property name="iconClass">fa fa-cloud-upload</Property>
+ </Button>
+ </Container>
+ <Link>
+ <Property name="href">http://api.map.baidu.com/lbsapi/getpoint/</Property>
+ <Property name="target">_blank</Property>
+ <Property name="style">
+ <Property name="padding-left">150px</Property>
+ </Property>
+ <Property name="text">甯姪锛氱偣鍑诲潗鏍囦綅缃嬀鍙�</Property>
+ </Link>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <Dialog id="dialogImg">
+ <Property name="width">1000</Property>
+ <Property name="height">640</Property>
+ <Property name="iconClass">fa fa-tasks</Property>
+ <Property name="caption">楦熺灠鍥鹃瑙�</Property>
+ <Buttons/>
+ <Children>
+ <IFrame id="iFrameImg">
+ <Property name="width">100%</Property>
+ </IFrame>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="uaSave">
+ <Property name="dataResolver">deptPR#updateData</Property>
+ <Property name="successMessage">鏁版嵁淇濆瓨瀹屾垚锛�</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="validateData">false</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <CustomDropDown id="ddFoodOrigin">
+ <Property name="minHeight">500</Property>
+ <Property name="assignmentMap">xzqhmc=name,xzqhdm=code</Property>
+ <Property name="minWidth">500</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsFoodOrigin">
+ <Property name="dataProvider">dicAreaPR#pageList</Property>
+ <Property name="dataType">[dtArea]</Property>
+ <Property name="parameter"></Property>
+ <Property name="pageSize">10</Property>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key2">
+ <Property name="blankText"> -- 鍚嶇О --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key2.value");
+ view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="exClassName">btn4</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }</ClientEvent>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="exClassName">btn1</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }</ClientEvent>
+ <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="code">
+ <Property name="property">code</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="name">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.processDefault = true;</ClientEvent>
+ <Property name="property">name</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="simple">
+ <Property name="property">simple</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ <DataPilot layoutConstraint="bottom">
+ <Property name="dataSet">dsFoodOrigin</Property>
+ </DataPilot>
+ </Container>
+ </CustomDropDown>
+ <UploadAction id="uploadFileImg">
+ <ClientEvent name="onFileUploaded">var imgId = arg.returnValue;
+ var data = view.get("#dsMain.data:#");
+ data.set("imgId",imgId);
+ data.set("imgName",arg.file.name);</ClientEvent>
+ <Property name="fileResolver">fileUploadManage#imgFile</Property>
+ <Property name="maxFileSize">50MB</Property>
+ <Filters/>
+ </UploadAction>
+ </View>
+</ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
new file mode 100644
index 0000000..3e16a32
--- /dev/null
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
@@ -0,0 +1,45 @@
+package com.fzzy.igds;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.fzzy.igds.domain.Dept;
+import com.fzzy.igds.service.CoreDeptService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Description 搴撳尯淇℃伅
+ * @Author CZT
+ * @Date 2025/11/26 17:58
+ */
+@Component
+public class DeptPR {
+
+ @Resource
+ private CoreDeptService coreDeptService;
+
+ /**
+ * 鏌ヨ璁惧,灏嗘搷浣滀俊鎭皟鏁翠负绌猴紝榛樿鍖呮嫭鍒嗗簱鍙傛暟
+ *
+ * deptPR#getData
+ *
+ * @return
+ */
+ @DataProvider
+ public List<Dept> getData() {
+
+ return coreDeptService.getAllData(null);
+ }
+
+ /**
+ * deptPR#saveData
+ */
+ @DataResolver
+ public void updateData(Dept data) {
+ Dept dept = new Dept();
+ BeanUtils.copyProperties(data, dept);
+ coreDeptService.update(dept);
+ }
+}
\ No newline at end of file
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicArea.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicArea.view.xml
index 44c3020..2ee1fdb 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicArea.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicArea.view.xml
@@ -2,92 +2,7 @@
<ViewConfig>
<Arguments/>
<Context/>
- <Model>
- <DataType name="dtMain">
- <Property name="creationType">com.fzzy.igds.domain.DicArea</Property>
- <PropertyDef name="code">
- <Property></Property>
- <Property name="label">鍖哄煙缂栫爜</Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="name">
- <Property></Property>
- <Property name="label">鍚嶇О</Property>
- <Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="parentCode">
- <Property></Property>
- <Property name="label">鎵�灞炲尯鍩�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicAreaPR#getDicAreaByParentCode").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="parentName">
- <Property></Property>
- <Property name="label">涓婄骇鍖哄煙</Property>
- <Property name="required">false</Property>
- </PropertyDef>
- <PropertyDef name="type">
- <Property></Property>
- <Property name="label">绫诲瀷</Property>
- <Property name="required">true</Property>
- <Property name="mapping">
- <Property name="keyProperty">value</Property>
- <Property name="valueProperty">name</Property>
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="name">鐪�</Property>
- <Property name="value">1</Property>
- </Entity>
- <Entity>
- <Property name="name">甯�</Property>
- <Property name="value">2</Property>
- </Entity>
- <Entity>
- <Property name="name">鍖哄幙</Property>
- <Property name="value">3</Property>
- </Entity>
- </Collection>
- </Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="simple">
- <Property></Property>
- <Property name="label">绠�鎷�</Property>
- <Property name="required">false</Property>
- </PropertyDef>
- <PropertyDef name="disabledTag">
- <Property></Property>
- <Property name="label">鏄惁绂佺敤</Property>
- <Property name="required">false</Property>
- <Property name="mapping">
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="name">绂佺敤</Property>
- <Property name="value">Y</Property>
- </Entity>
- <Entity>
- <Property name="name">鍚敤</Property>
- <Property name="value">N</Property>
- </Entity>
- </Collection>
- </Property>
- <Property name="keyProperty">value</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="remark">
- <Property></Property>
- <Property name="label">澶囨敞</Property>
- <Property name="required">false</Property>
- </PropertyDef>
- </DataType>
- </Model>
- <View layout="padding:5;regionPadding:5">
+ <View layout="padding:10">
<ClientEvent name="onReady">//鏌ヨ
query = function(){
view.get("#dsMain").flushAsync();
@@ -96,64 +11,65 @@
query();</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
- <Property name="dataType">[dtMain]</Property>
+ <Property name="dataType">[dtArea]</Property>
<Property name="dataProvider">dicAreaPR#pageList</Property>
<Property name="loadMode">manual</Property>
<Property name="pageSize">20</Property>
</DataSet>
- <Container layout="regionPadding:10" layoutConstraint="top">
- <Property name="exClassName">bg-color</Property>
- <Property name="contentOverflow">hidden</Property>
- <Property name="height">55</Property>
- <Label layoutConstraint="left">
- <Property name="text">鑿滃崟鏍忥細</Property>
- </Label>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsMain").insert();
- view.get("#dialogMain").show();
- </ClientEvent>
- <Property name="caption">鏂板</Property>
- <Property name="exClassName">btn1</Property>
- <Property name="iconClass">fa fa-plus</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">
- 
-var select = view.get("#dataGridMain").get("selection");
-if(select){
- view.get("#dialogMain").show();;
-}else{
- $notify("璇烽�夋嫨闇�瑕佷慨鏀圭殑鏁版嵁鈥︹��");
-} </ClientEvent>
- <Property name="caption">缂栬緫</Property>
- <Property name="exClassName">btn2</Property>
- <Property name="iconClass">fa fa-pencil</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick"> 
-var select = view.get("#dataGridMain").get("selection");
-if(select){
- view.get("#ajaxDel").set("parameter",select).execute(function(){
- select.remove();
- });
-}else{
- $notify("璇烽�夋嫨闇�瑕佸垹闄ょ殑鏁版嵁鈥︹��");
-}</ClientEvent>
- <Property name="caption">鍒犻櫎</Property>
- <Property name="exClassName">btn3</Property>
- <Property name="iconClass">fa fa-minus</Property>
- </Button>
- </Container>
- <Container layoutConstraint="center">
- <Property name="exClassName">bg-color</Property>
- <DataGrid id="dataGridMain" layoutConstraint="center">
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
- if(data){
- view.get("#dialogMain").show();
- }</ClientEvent>
+ <Container>
+ <Property name="className">c-param</Property>
+ <ToolBar>
+ <ToolBarButton>
+ <ClientEvent name="onClick">view.get("#dsMain").insert();
+ view.get("#dialogMain").show();
+ </ClientEvent>
+ <Property name="caption">鏂板</Property>
+ <Property name="exClassName">btn1</Property>
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ </ToolBarButton>
+ <ToolBarButton>
+ <ClientEvent name="onClick">
+ 
+ var select = view.get("#dataGridMain").get("selection");
+ if(select){
+ view.get("#dialogMain").show();;
+ }else{
+ $notify("璇烽�夋嫨闇�瑕佷慨鏀圭殑鏁版嵁鈥︹��");
+ } </ClientEvent>
+ <Property name="caption">淇敼</Property>
+ <Property name="exClassName">btn2</Property>
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-pencil-square-o</Property>
+ </ToolBarButton>
+ <ToolBarButton>
+ <ClientEvent name="onClick"> 
+ var select = view.get("#dataGridMain").get("selection");
+ if(select){
+ view.get("#ajaxDel").set("parameter",select).execute(function(){
+ select.remove();
+ });
+ }else{
+ $notify("璇烽�夋嫨闇�瑕佸垹闄ょ殑鏁版嵁鈥︹��");
+ }</ClientEvent>
+ <Property name="caption">鍒犻櫎</Property>
+ <Property name="exClassName">btn3</Property>
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </ToolBarButton>
+ <ToolBarButton>
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();
+ </ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="exClassName">btn-q2</Property>
+ <Property name="width">100</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ </ToolBarButton>
+ </ToolBar>
+ <DataGrid id="dataGridMain" layoutConstraint="padding:8" selectionMode="singleRow">
+ <ClientEvent name="onDataRowClick">self.set("selection", arg.data)</ClientEvent>
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
- <Property name="selectionMode">singleRow</Property>
<RowSelectorColumn/>
<RowNumColumn/>
<DataColumn>
@@ -194,7 +110,7 @@
</DataGrid>
</Container>
<Container layoutConstraint="bottom">
- <Property name="exClassName">bg-color</Property>
+ <Property name="className">c-bottom</Property>
<DataPilot layoutConstraint="right">
<Property name="dataSet">dsMain</Property>
<Property name="itemCodes">pageSize,pages</Property>
@@ -220,13 +136,17 @@
self.get("parent").hide();
});</ClientEvent>
<Property name="caption">纭畾</Property>
- <Property name="iconClass">fa fa-check</Property>
+ <Property name="iconClass">fa fa-check-circle</Property>
+ <Property name="exClassName">btn1</Property>
+ <Property name="width">120</Property>
</Button>
<Button>
<ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
self.get("parent").hide();</ClientEvent>
<Property name="caption">鍙栨秷</Property>
- <Property name="iconClass">fa fa-times</Property>
+ <Property name="exClassName">btn3</Property>
+ <Property name="iconClass">fa fa-times-circle</Property>
+ <Property name="width">120</Property>
</Button>
</Buttons>
<Children>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicPR.java
index b88ad10..42daa21 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DicPR.java
@@ -87,7 +87,7 @@
}
/**
- * ${dorado.getDataProvider("dicTriggerPR#triggerYN").getResult()}
+ * ${dorado.getDataProvider("dicPR#triggerYN").getResult()}
*
* @return
*/
diff --git a/fzzy-igdss-view/src/main/java/models/core.model.xml b/fzzy-igdss-view/src/main/java/models/core.model.xml
index 599d8ff..fa3c9b0 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -11,7 +11,12 @@
</PropertyDef>
<PropertyDef name="status">
<Property/>
- <Property name="label">绯荤粺鐘舵��</Property>
+ <Property name="label">鏄惁鍚敤</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerYN").getResult("DEVICE_STATUS")}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="remark">
<Property/>
@@ -26,7 +31,7 @@
<Property name="label">鍒涘缓浜�</Property>
</PropertyDef>
<PropertyDef name="createTime">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鍒涘缓鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="updateBy">
@@ -34,7 +39,7 @@
<Property name="label">鏇存柊浜�</Property>
</PropertyDef>
<PropertyDef name="updateTime">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
</PropertyDef>
</DataType>
@@ -60,4 +65,87 @@
<Property name="label">鎴鏃堕棿</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtArea">
+ <Property name="creationType">com.fzzy.igds.domain.DicArea</Property>
+ <PropertyDef name="code">
+ <Property></Property>
+ <Property name="label">鍖哄煙缂栫爜</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property></Property>
+ <Property name="label">鍚嶇О</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="parentCode">
+ <Property></Property>
+ <Property name="label">鎵�灞炲尯鍩�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicAreaPR#getDicAreaByParentCode").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="parentName">
+ <Property></Property>
+ <Property name="label">涓婄骇鍖哄煙</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property></Property>
+ <Property name="label">绫诲瀷</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">value</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">鐪�</Property>
+ <Property name="value">1</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">甯�</Property>
+ <Property name="value">2</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">鍖哄幙</Property>
+ <Property name="value">3</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="simple">
+ <Property></Property>
+ <Property name="label">绠�鎷�</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="disabledTag">
+ <Property></Property>
+ <Property name="label">鏄惁绂佺敤</Property>
+ <Property name="required">false</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">绂佺敤</Property>
+ <Property name="value">Y</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">鍚敤</Property>
+ <Property name="value">N</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">value</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ </DataType>
</Model>
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java
new file mode 100644
index 0000000..a3401a5
--- /dev/null
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java
@@ -0,0 +1,202 @@
+package com.fzzy.sys.controller.system;
+
+import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.service.CoreCompanyService;
+import com.fzzy.igds.service.CoreDeptService;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.Ztree;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.service.ISysDeptService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 閮ㄩ棬淇℃伅
+ *
+ * @author ruoyi
+ */
+@Controller
+@RequestMapping("/system/dept-new")
+public class SysDeptNewController extends BaseController {
+ private String prefix = "system/dept";
+
+ @Autowired
+ private ISysDeptService deptService;
+ @Autowired
+ private CoreCompanyService coreCompanyService;
+ @Autowired
+ private CoreDeptService coreDeptService;
+
+ @RequiresPermissions("system:dept:view")
+ @GetMapping()
+ public String dept() {
+ return prefix + "/dept";
+ }
+
+ @RequiresPermissions("system:dept:list")
+ @PostMapping("/list")
+ @ResponseBody
+ public List<SysDept> list(SysDept dept) {
+ List<SysDept> deptList = deptService.selectDeptList(dept);
+ return deptList;
+ }
+
+ /**
+ * 鏂板閮ㄩ棬
+ */
+ @GetMapping("/add/{parentId}")
+ public String add(@PathVariable("parentId") Long parentId, ModelMap mmap) {
+ if (!getSysUser().isAdmin()) {
+ parentId = getSysUser().getDeptId();
+ }
+ SysDept dept = deptService.selectDeptById(parentId);
+ if(dept == null){
+ parentId = Long.valueOf(getSysUser().getCompanyId());
+ dept = deptService.selectDeptById(parentId);
+ }
+ mmap.put("dept", dept);
+ return prefix + "/add";
+ }
+
+ /**
+ * 鏂板淇濆瓨閮ㄩ棬
+ */
+ @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT)
+ @RequiresPermissions("system:dept:add")
+ @PostMapping("/add")
+ @ResponseBody
+ public AjaxResult addSave(@Validated SysDept dept) {
+ if (!deptService.checkDeptNameUnique(dept)) {
+ return error("鏂板閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
+ }
+ dept.setCreateBy(getLoginName());
+ int i = deptService.insertDept(dept);
+ if(i > 0){
+ if (Constant.DEPT_TYPE_10.equals(dept.getType())) {
+ //鏂板鍏徃淇℃伅
+ coreCompanyService.saveOrUpdate(dept);
+ }
+ if (Constant.DEPT_TYPE_20.equals(dept.getType())) {
+ //鏂板搴撳尯淇℃伅
+ coreDeptService.saveOrUpdate(dept);
+ }
+ }
+ return toAjax(i);
+ }
+
+ /**
+ * 淇敼閮ㄩ棬
+ */
+ @RequiresPermissions("system:dept:edit")
+ @GetMapping("/edit/{deptId}")
+ public String edit(@PathVariable("deptId") Long deptId, ModelMap mmap) {
+ deptService.checkDeptDataScope(deptId);
+ SysDept dept = deptService.selectDeptById(deptId);
+ if (StringUtils.isNotNull(dept) && 100L == deptId) {
+ dept.setParentName("鏃�");
+ }
+ mmap.put("dept", dept);
+ return prefix + "/edit";
+ }
+
+ /**
+ * 淇敼淇濆瓨閮ㄩ棬
+ */
+ @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE)
+ @RequiresPermissions("system:dept:edit")
+ @PostMapping("/edit")
+ @ResponseBody
+ public AjaxResult editSave(@Validated SysDept dept) {
+ Long deptId = dept.getDeptId();
+ deptService.checkDeptDataScope(deptId);
+ if (!deptService.checkDeptNameUnique(dept)) {
+ return error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
+ } else if (dept.getParentId().equals(deptId)) {
+ return error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛屼笂绾ч儴闂ㄤ笉鑳芥槸鑷繁");
+ } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) {
+ return AjaxResult.error("璇ラ儴闂ㄥ寘鍚湭鍋滅敤鐨勫瓙閮ㄩ棬锛�");
+ }
+ dept.setUpdateBy(getLoginName());
+ int i = deptService.updateDept(dept);
+ if(i > 0){
+ if (Constant.DEPT_TYPE_10.equals(dept.getType())) {
+ //鏂板鍏徃淇℃伅
+ coreCompanyService.saveOrUpdate(dept);
+ }
+ if (Constant.DEPT_TYPE_20.equals(dept.getType())) {
+ //鏂板搴撳尯淇℃伅
+ coreDeptService.saveOrUpdate(dept);
+ }
+ }
+ return toAjax(i);
+ }
+
+ /**
+ * 鍒犻櫎
+ */
+ @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.DELETE)
+ @RequiresPermissions("system:dept:remove")
+ @GetMapping("/remove/{deptId}")
+ @ResponseBody
+ public AjaxResult remove(@PathVariable("deptId") Long deptId) {
+ if (deptService.selectDeptCount(deptId) > 0) {
+ return AjaxResult.warn("瀛樺湪涓嬬骇閮ㄩ棬,涓嶅厑璁稿垹闄�");
+ }
+ if (deptService.checkDeptExistUser(deptId)) {
+ return AjaxResult.warn("閮ㄩ棬瀛樺湪鐢ㄦ埛,涓嶅厑璁稿垹闄�");
+ }
+ deptService.checkDeptDataScope(deptId);
+ int i = deptService.deleteDeptById(deptId);
+ if(i > 0){
+ coreCompanyService.delData(deptId + "");
+ coreDeptService.delData(deptId + "");
+ }
+ return toAjax(i);
+ }
+
+ /**
+ * 鏍￠獙閮ㄩ棬鍚嶇О
+ */
+ @PostMapping("/checkDeptNameUnique")
+ @ResponseBody
+ public boolean checkDeptNameUnique(SysDept dept) {
+ return deptService.checkDeptNameUnique(dept);
+ }
+
+ /**
+ * 閫夋嫨閮ㄩ棬鏍�
+ *
+ * @param deptId 閮ㄩ棬ID
+ * @param excludeId 鎺掗櫎ID
+ */
+ @GetMapping(value = {"/selectDeptTree/{deptId}", "/selectDeptTree/{deptId}/{excludeId}"})
+ public String selectDeptTree(@PathVariable("deptId") Long deptId,
+ @PathVariable(value = "excludeId", required = false) Long excludeId, ModelMap mmap) {
+ mmap.put("dept", deptService.selectDeptById(deptId));
+ mmap.put("excludeId", excludeId);
+ return prefix + "/tree";
+ }
+
+ /**
+ * 鍔犺浇閮ㄩ棬鍒楄〃鏍戯紙鎺掗櫎涓嬬骇锛�
+ */
+ @GetMapping("/treeData/{excludeId}")
+ @ResponseBody
+ public List<Ztree> treeDataExcludeChild(@PathVariable(value = "excludeId", required = false) Long excludeId) {
+ SysDept dept = new SysDept();
+ dept.setExcludeId(excludeId);
+ List<Ztree> ztrees = deptService.selectDeptTreeExcludeChild(dept);
+ return ztrees;
+ }
+}
diff --git a/fzzy-igdss-web/src/main/resources/d7/common.css b/fzzy-igdss-web/src/main/resources/d7/common.css
index 10453bb..106ee04 100644
--- a/fzzy-igdss-web/src/main/resources/d7/common.css
+++ b/fzzy-igdss-web/src/main/resources/d7/common.css
@@ -19,7 +19,6 @@
border-radius: 6px;
box-shadow: 1px 1px 3px rgba(0, 0, 0, .2);
padding-top: 5px;
- padding-bottom: 13px;
min-height: 1px;
}
@@ -31,6 +30,14 @@
/* padding-bottom: 13px;*/
}
+.c-bottom {
+ border-radius: 6px;
+ box-shadow: 1px 1px 3px rgba(0, 0, 0, .2);
+ padding-top: 5px;
+ padding-bottom: 5px;
+ margin-top: 10px;
+}
+
.d-toolbar {
border-width: 0 !important;
margin-top: 10px;
diff --git a/fzzy-igdss-web/src/main/resources/templates/system/dept/add.html b/fzzy-igdss-web/src/main/resources/templates/system/dept/add.html
index 29c4026..e98216f 100644
--- a/fzzy-igdss-web/src/main/resources/templates/system/dept/add.html
+++ b/fzzy-igdss-web/src/main/resources/templates/system/dept/add.html
@@ -68,7 +68,7 @@
</div>
<th:block th:include="include :: footer" />
<script type="text/javascript">
- var prefix = ctx + "system/dept";
+ var prefix = ctx + "system/dept-new";
$("#form-dept-add").validate({
onkeyup: false,
diff --git a/fzzy-igdss-web/src/main/resources/templates/system/dept/dept.html b/fzzy-igdss-web/src/main/resources/templates/system/dept/dept.html
index 5b7a610..c4b2033 100644
--- a/fzzy-igdss-web/src/main/resources/templates/system/dept/dept.html
+++ b/fzzy-igdss-web/src/main/resources/templates/system/dept/dept.html
@@ -54,7 +54,7 @@
var removeFlag = [[${@permission.hasPermi('system:dept:remove')}]];
var datas = [[${@dict.getType('sys_normal_disable')}]];
var types = [[${@dict.getType('sys_dept_type')}]];
- var prefix = ctx + "system/dept"
+ var prefix = ctx + "system/dept-new"
$(function () {
var options = {
diff --git a/fzzy-igdss-web/src/main/resources/templates/system/dept/edit.html b/fzzy-igdss-web/src/main/resources/templates/system/dept/edit.html
index 6a2b2ea..0afa857 100644
--- a/fzzy-igdss-web/src/main/resources/templates/system/dept/edit.html
+++ b/fzzy-igdss-web/src/main/resources/templates/system/dept/edit.html
@@ -69,7 +69,7 @@
</div>
<th:block th:include="include :: footer" />
<script type="text/javascript">
- var prefix = ctx + "system/dept";
+ var prefix = ctx + "system/dept-new";
$("#form-dept-edit").validate({
onkeyup: false,
diff --git a/fzzy-igdss-web/src/main/resources/templates/system/dept/tree.html b/fzzy-igdss-web/src/main/resources/templates/system/dept/tree.html
index 4c32182..39243b0 100644
--- a/fzzy-igdss-web/src/main/resources/templates/system/dept/tree.html
+++ b/fzzy-igdss-web/src/main/resources/templates/system/dept/tree.html
@@ -28,7 +28,7 @@
<th:block th:include="include :: footer" />
<th:block th:include="include :: ztree-js" />
<script th:inline="javascript">
- var prefix = ctx + "system/dept"
+ var prefix = ctx + "system/dept-new"
var deptId = [[${deptId}]];
var excludeId = [[${excludeId}]];
$(function() {
--
Gitblit v1.9.3