Skip to content

S
sample-form-platform
Commit b3bb0953 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加根据区域编码查询基础事项

parent ffb8e2f1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1248 additions and 1057 deletions
sample-form-manager-ui/admin/src/pages/software/librarymanage/LibraryManage.vue
View file @ b3bb0953
......@@ -14,29 +14,29 @@
>
</div>
<div slot="right" class="flex">
<!-- <el-select
<el-select
v-model="department"
size="small"
class="autoWidth"
placeholder="选择部门"
>
<template slot="prefix">
{{ (deptList.find((v) => v.id === department) || {}).name }}
{{ (deptList.find((v) => v.deptNumber === department) || {}).name }}
</template>
<el-option
v-for="item in deptList"
:key="item.id"
:key="item.deptNumber"
:label="item.name"
:value="item.id"
:value="item.deptNumber"
>
</el-option>
</el-select>-->
</el-select>
<el-input
size="small"
v-model="searchVal"
style="width: 200px"
class="ml10 mr10"
placeholder="请输入事项名称搜索"
placeholder="请输入材料名称搜索"
></el-input>
<el-button size="small" type="primary" @click="handleSearch"
>搜索</el-button
......@@ -70,9 +70,9 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
label="部门编号"
label="部门名称"
align="center"
prop="deptCode"
prop="deptName"
width="160"
>
</el-table-column>
......@@ -136,6 +136,7 @@
import TableHeader from "@/components/TableHeader.vue";
import PreviewMaterals from "./modal/PreviewMaterals.vue";
import { getPubdatumList,delPubdatum } from "@/api/libray";
import { mapGetters } from "vuex";
export default {
components: {
TableHeader,
......@@ -161,9 +162,9 @@ export default {
created() {
this.getPbuList();
},
// computed: {
// ...mapGetters(["deptList"]),
// },
computed: {
...mapGetters(["deptList"]),
},
methods: {
// 系统事项列表
async getPbuList() {
......
sample-form-manager-ui/admin/src/pages/software/materials/MaterialsManage.vue
View file @ b3bb0953
......@@ -19,13 +19,13 @@
class="autoWidth"
>
<template slot="prefix">
{{ (deptList.find((v) => v.id === departmentLeft) || {}).name }}
{{ (deptList.find((v) => v.deptNumber === departmentLeft) || {}).name }}
</template>
<el-option
v-for="item in deptList"
:key="item.id"
:key="item.deptNumber"
:label="item.name"
:value="item.id"
:value="item.deptNumber"
>
</el-option>
</el-select>
......@@ -68,9 +68,9 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
label="部门编号"
label="部门名称"
align="center"
prop="deptCode"
prop="deptName"
>
</el-table-column>
<el-table-column
......@@ -189,9 +189,9 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
label="部门编码"
label="部门名称"
align="center"
prop="deptCode"
prop="deptName"
>
</el-table-column>
<el-table-column prop="name" show-overflow-tooltip label="材料名称">
......
sample-form-manager-ui/admin/src/pages/software/matter/MatterManage.vue
View file @ b3bb0953
......@@ -23,7 +23,7 @@
class="autoWidth"
>
<template slot="prefix">
{{ (deptList.find((v) => v.deptCode === departmentLeft) || {}).name }}
{{ (deptList.find((v) => v.deptNumber === departmentLeft) || {}).name }}
</template>
<el-option
v-for="item in deptList"
......@@ -72,9 +72,9 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
label="部门编号"
label="部门名称"
align="center"
prop="deptCode"
prop="deptName"
>
</el-table-column>
<el-table-column prop="matterName" show-overflow-tooltip label="事项名称">
......@@ -169,7 +169,7 @@
>
<template slot="prefix">
{{
(deptList.find((v) => v.deptCode === departmentRight) || {}).name
(deptList.find((v) => v.deptNumber === departmentRight) || {}).name
}}
</template>
<el-option
......@@ -223,9 +223,9 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
label="部门编号"
label="部门名称"
align="center"
prop="deptCode"
prop="deptName"
>
</el-table-column>
<el-table-column
......
sample-form-manager/db/module.sql
View file @ b3bb0953
......@@ -120,49 +120,52 @@ CREATE TABLE mortals_xhx_matter
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_matter_datum`;
CREATE TABLE mortals_xhx_matter_datum(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
`matterId` bigint(20) COMMENT '事项matter id',
`siteId` bigint(20) COMMENT '站点ID',
`deptId` bigint(20) COMMENT '部门ID',
`deptCode` varchar(64) COMMENT '部门编号',
`materialName` varchar(1024) NOT NULL COMMENT '材料名',
`materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名',
`source` tinyint(2) COMMENT '事项来源(0.政务网，1.自定义)',
`isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐，1.推荐)',
`total` int(8) COMMENT '填单次数',
`sort` int(4) COMMENT '排序',
`sampleName` varchar(255) COMMENT '样表名称',
`samplePath` varchar(255) COMMENT '样表地址',
`preViewPath` varchar(255) COMMENT '样表预览地址',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`)
`id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
`matterId` bigint(20) COMMENT '事项matter id',
`siteId` bigint(20) COMMENT '站点ID',
`deptId` bigint(20) COMMENT '部门ID',
`deptCode` varchar(256) COMMENT '部门编号',
`deptName` varchar(256) COMMENT '部门名称',
`materialName` varchar(1024) NOT NULL COMMENT '材料名',
`materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名',
`source` tinyint(2) COMMENT '事项来源(0.政务网，1.自定义)',
`isRecommend` tinyint(2) COMMENT '是否推荐(0.未推荐，1.推荐)',
`total` int(8) COMMENT '填单次数',
`sort` int(4) COMMENT '排序',
`sampleName` varchar(255) COMMENT '样表名称',
`samplePath` varchar(255) COMMENT '样表地址',
`preViewPath` varchar(255) COMMENT '样表预览地址',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项申请材料业务';
-- ----------------------------
-- 事项材料公共库表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_pubdatum`;
CREATE TABLE mortals_xhx_pubdatum
(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
`matterId` bigint(20) COMMENT '事项matter id',
`deptId` bigint(20) COMMENT '部门ID',
`deptCode` varchar(64) COMMENT '部门编号',
`materialName` varchar(1024) NOT NULL COMMENT '材料名',
`materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名',
`total` int(8) COMMENT '填单次数',
`sort` int(4) COMMENT '排序',
`sampleName` varchar(255) COMMENT '样表名称',
`samplePath` varchar(255) COMMENT '样表地址',
`preViewPath` varchar(255) COMMENT '样表预览地址',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`)
CREATE TABLE mortals_xhx_pubdatum(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键，自增长',
`matterId` bigint(20) COMMENT '事项matter id',
`deptId` bigint(20) COMMENT '部门ID',
`deptCode` varchar(256) COMMENT '部门编号',
`deptName` varchar(256) COMMENT '部门名称',
`materialName` varchar(1024) NOT NULL COMMENT '材料名',
`materiaFullName` varchar(1024) NOT NULL COMMENT '材料全名',
`total` int(8) COMMENT '填单次数',
`sort` int(4) COMMENT '排序',
`sampleName` varchar(255) COMMENT '样表名称',
`samplePath` varchar(255) COMMENT '样表地址',
`preViewPath` varchar(255) COMMENT '样表预览地址',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='事项材料公共库';
......@@ -171,3 +174,5 @@ CREATE TABLE mortals_xhx_pubdatum
sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumEntity.java
View file @ b3bb0953
......@@ -10,7 +10,7 @@ import com.mortals.xhx.module.matter.model.vo.MatterDatumVo;
* 事项申请材料业务实体对象
*
* @author zxfei
* @date 2022-11-11
* @date 2022-11-17
*/
public class MatterDatumEntity extends MatterDatumVo {
......@@ -32,6 +32,10 @@ public class MatterDatumEntity extends MatterDatumVo {
* 部门编号
*/
private String deptCode;
/**
* 部门名称
*/
private String deptName;
/**
* 材料名
*/
......@@ -128,6 +132,20 @@ public class MatterDatumEntity extends MatterDatumVo {
public void setDeptCode(String deptCode){
this.deptCode = deptCode;
}
/**
* 获取 部门名称
* @return String
*/
public String getDeptName(){
return deptName;
}
/**
* 设置 部门名称
* @param deptName
*/
public void setDeptName(String deptName){
this.deptName = deptName;
}
/**
* 获取 材料名
* @return String
......@@ -280,6 +298,7 @@ public class MatterDatumEntity extends MatterDatumVo {
sb.append(",siteId:").append(getSiteId());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptCode:").append(getDeptCode());
sb.append(",deptName:").append(getDeptName());
sb.append(",materialName:").append(getMaterialName());
sb.append(",materiaFullName:").append(getMateriaFullName());
sb.append(",source:").append(getSource());
......@@ -302,6 +321,8 @@ public class MatterDatumEntity extends MatterDatumVo {
this.deptCode = "";
this.deptName = "";
this.materialName = "";
this.materiaFullName = "";
......
sample-form-manager/src/main/java/com/mortals/xhx/module/matter/model/MatterDatumQuery.java
View file @ b3bb0953
......@@ -6,7 +6,7 @@ import com.mortals.xhx.module.matter.model.MatterDatumEntity;
* 事项申请材料业务查询对象
*
* @author zxfei
* @date 2022-11-11
* @date 2022-11-17
*/
public class MatterDatumQuery extends MatterDatumEntity {
/** 开始 主键，自增长 */
......@@ -60,6 +60,9 @@ public class MatterDatumQuery extends MatterDatumEntity {
/** 部门编号 */
private List<String> deptCodeList;
/** 部门名称 */
private List<String> deptNameList;
/** 材料名 */
private List<String> materialNameList;
......@@ -426,6 +429,21 @@ public class MatterDatumQuery extends MatterDatumEntity {
public void setDeptCodeList(List<String> deptCodeList){
this.deptCodeList = deptCodeList;
}
/**
* 获取 部门名称
* @return deptNameList
*/
public List<String> getDeptNameList(){
return this.deptNameList;
}
/**
* 设置 部门名称
* @param deptNameList
*/
public void setDeptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
}
/**
* 获取 材料名
* @return materialNameList
......@@ -1085,6 +1103,25 @@ public class MatterDatumQuery extends MatterDatumEntity {
}
/**
* 设置 部门名称
* @param deptName
*/
public MatterDatumQuery deptName(String deptName){
setDeptName(deptName);
return this;
}
/**
* 设置 部门名称
* @param deptNameList
*/
public MatterDatumQuery deptNameList(List<String> deptNameList){
this.deptNameList = deptNameList;
return this;
}
/**
* 设置 材料名
* @param materialName
......
sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
View file @ b3bb0953
......@@ -96,6 +96,7 @@ public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, Matter
matterEntity.initAttrValue();
matterEntity.setSiteId(siteId);
matterEntity.setDeptCode(sheetMatterEntity.getDeptCode());
matterEntity.setDeptName(sheetMatterEntity.getDeptName());
matterEntity.setTid(sheetMatterEntity.getTid());
matterEntity.setTcode(sheetMatterEntity.getTcode());
matterEntity.setTname(sheetMatterEntity.getTname());
......
sample-form-manager/src/main/java/com/mortals/xhx/module/pubdatum/model/PubdatumEntity.java
View file @ b3bb0953
......@@ -7,196 +7,214 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.pubdatum.model.vo.PubdatumVo;
/**
* 事项材料公共库实体对象
*
* @author zxfei
* @date 2022-11-10
*/
* 事项材料公共库实体对象
*
* @author zxfei
* @date 2022-11-17
*/
public class PubdatumEntity extends PubdatumVo {
private static final long serialVersionUID = 1L;
/**
* 事项matter id
*/
* 事项matter id
*/
private Long matterId;
/**
* 部门ID
*/
* 部门ID
*/
private Long deptId;
/**
* 部门编号
*/
* 部门编号
*/
private String deptCode;
/**
* 材料名
*/
* 部门名称
*/
private String deptName;
/**
* 材料名
*/
private String materialName;
/**
* 材料全名
*/
* 材料全名
*/
private String materiaFullName;
/**
* 填单次数
*/
* 填单次数
*/
private Integer total;
/**
* 排序
*/
* 排序
*/
private Integer sort;
/**
* 样表名称
*/
* 样表名称
*/
private String sampleName;
/**
* 样表地址
*/
* 样表地址
*/
private String samplePath;
/**
* 样表预览地址
*/
* 样表预览地址
*/
private String preViewPath;
public PubdatumEntity(){}
/**
* 获取 事项matter id
* @return Long
*/
* 获取 事项matter id
* @return Long
*/
public Long getMatterId(){
return matterId;
}
/**
* 设置 事项matter id
* @param matterId
*/
* 设置 事项matter id
* @param matterId
*/
public void setMatterId(Long matterId){
this.matterId = matterId;
}
/**
* 获取 部门ID
* @return Long
*/
* 获取 部门ID
* @return Long
*/
public Long getDeptId(){
return deptId;
}
/**
* 设置 部门ID
* @param deptId
*/
* 设置 部门ID
* @param deptId
*/
public void setDeptId(Long deptId){
this.deptId = deptId;
}
/**
* 获取 部门编号
* @return String
*/
* 获取 部门编号
* @return String
*/
public String getDeptCode(){
return deptCode;
}
/**
* 设置 部门编号
* @param deptCode
*/
* 设置 部门编号
* @param deptCode
*/
public void setDeptCode(String deptCode){
this.deptCode = deptCode;
}
/**
* 获取 材料名
* @return String
*/
* 获取 部门名称
* @return String
*/
public String getDeptName(){
return deptName;
}
/**
* 设置 部门名称
* @param deptName
*/
public void setDeptName(String deptName){
this.deptName = deptName;
}
/**
* 获取 材料名
* @return String
*/
public String getMaterialName(){
return materialName;
}
/**
* 设置 材料名
* @param materialName
*/
* 设置 材料名
* @param materialName
*/
public void setMaterialName(String materialName){
this.materialName = materialName;
}
/**
* 获取 材料全名
* @return String
*/
* 获取 材料全名
* @return String
*/
public String getMateriaFullName(){
return materiaFullName;
}
/**
* 设置 材料全名
* @param materiaFullName
*/
* 设置 材料全名
* @param materiaFullName
*/
public void setMateriaFullName(String materiaFullName){
this.materiaFullName = materiaFullName;
}
/**
* 获取 填单次数
* @return Integer
*/
* 获取 填单次数
* @return Integer
*/
public Integer getTotal(){
return total;
}
/**
* 设置 填单次数
* @param total
*/
* 设置 填单次数
* @param total
*/
public void setTotal(Integer total){
this.total = total;
}
/**
* 获取 排序
* @return Integer
*/
* 获取 排序
* @return Integer
*/
public Integer getSort(){
return sort;
}
/**
* 设置 排序
* @param sort
*/
* 设置 排序
* @param sort
*/
public void setSort(Integer sort){
this.sort = sort;
}
/**
* 获取 样表名称
* @return String
*/
* 获取 样表名称
* @return String
*/
public String getSampleName(){
return sampleName;
}
/**
* 设置 样表名称
* @param sampleName
*/
* 设置 样表名称
* @param sampleName
*/
public void setSampleName(String sampleName){
this.sampleName = sampleName;
}
/**
* 获取 样表地址
* @return String
*/
* 获取 样表地址
* @return String
*/
public String getSamplePath(){
return samplePath;
}
/**
* 设置 样表地址
* @param samplePath
*/
* 设置 样表地址
* @param samplePath
*/
public void setSamplePath(String samplePath){
this.samplePath = samplePath;
}
/**
* 获取 样表预览地址
* @return String
*/
* 获取 样表预览地址
* @return String
*/
public String getPreViewPath(){
return preViewPath;
}
/**
* 设置 样表预览地址
* @param preViewPath
*/
* 设置 样表预览地址
* @param preViewPath
*/
public void setPreViewPath(String preViewPath){
this.preViewPath = preViewPath;
}
......@@ -206,7 +224,7 @@ public class PubdatumEntity extends PubdatumVo {
@Override
public int hashCode() {
return this.getId().hashCode();
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
......@@ -214,7 +232,7 @@ public class PubdatumEntity extends PubdatumVo {
if (obj instanceof PubdatumEntity) {
PubdatumEntity tmp = (PubdatumEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
return true;
}
}
return false;
......@@ -225,6 +243,7 @@ public class PubdatumEntity extends PubdatumVo {
sb.append(",matterId:").append(getMatterId());
sb.append(",deptId:").append(getDeptId());
sb.append(",deptCode:").append(getDeptCode());
sb.append(",deptName:").append(getDeptName());
sb.append(",materialName:").append(getMaterialName());
sb.append(",materiaFullName:").append(getMateriaFullName());
sb.append(",total:").append(getTotal());
......@@ -237,24 +256,26 @@ public class PubdatumEntity extends PubdatumVo {
public void initAttrValue(){
this.matterId = null;
this.matterId = null;
this.deptId = null;
this.deptId = null;
this.deptCode = "";
this.deptCode = "";
this.deptName = "";
this.materialName = "";
this.materialName = "";
this.materiaFullName = "";
this.materiaFullName = "";
this.total = null;
this.total = null;
this.sort = null;
this.sort = null;
this.sampleName = "";
this.sampleName = "";
this.samplePath = "";
this.samplePath = "";
this.preViewPath = "";
this.preViewPath = "";
}
}
\ No newline at end of file
sample-form-manager/src/main/resources/sqlmap/module/matter/MatterDatumMapper.xml
View file @ b3bb0953
......@@ -10,6 +10,7 @@
<result property="siteId" column="siteId" />
<result property="deptId" column="deptId" />
<result property="deptCode" column="deptCode" />
<result property="deptName" column="deptName" />
<result property="materialName" column="materialName" />
<result property="materiaFullName" column="materiaFullName" />
<result property="source" column="source" />
......@@ -44,6 +45,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptCode') or colPickMode == 1 and data.containsKey('deptCode')))">
a.deptCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptName') or colPickMode == 1 and data.containsKey('deptName')))">
a.deptName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('materialName') or colPickMode == 1 and data.containsKey('materialName')))">
a.materialName,
</if>
......@@ -85,18 +89,18 @@
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="MatterDatumEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_matter_datum
(matterId,siteId,deptId,deptCode,materialName,materiaFullName,source,isRecommend,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
(matterId,siteId,deptId,deptCode,deptName,materialName,materiaFullName,source,isRecommend,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
VALUES
(#{matterId},#{siteId},#{deptId},#{deptCode},#{materialName},#{materiaFullName},#{source},#{isRecommend},#{total},#{sort},#{sampleName},#{samplePath},#{preViewPath},#{createTime},#{createUserId},#{updateTime})
(#{matterId},#{siteId},#{deptId},#{deptCode},#{deptName},#{materialName},#{materiaFullName},#{source},#{isRecommend},#{total},#{sort},#{sampleName},#{samplePath},#{preViewPath},#{createTime},#{createUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_matter_datum
(matterId,siteId,deptId,deptCode,materialName,materiaFullName,source,isRecommend,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
(matterId,siteId,deptId,deptCode,deptName,materialName,materiaFullName,source,isRecommend,total,sort,sampleName,samplePath,preViewPath,createTime,createUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.matterId},#{item.siteId},#{item.deptId},#{item.deptCode},#{item.materialName},#{item.materiaFullName},#{item.source},#{item.isRecommend},#{item.total},#{item.sort},#{item.sampleName},#{item.samplePath},#{item.preViewPath},#{item.createTime},#{item.createUserId},#{item.updateTime})
(#{item.matterId},#{item.siteId},#{item.deptId},#{item.deptCode},#{item.deptName},#{item.materialName},#{item.materiaFullName},#{item.source},#{item.isRecommend},#{item.total},#{item.sort},#{item.sampleName},#{item.samplePath},#{item.preViewPath},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -127,6 +131,9 @@
<if test="(colPickMode==0 and data.containsKey('deptCode')) or (colPickMode==1 and !data.containsKey('deptCode'))">
a.deptCode=#{data.deptCode},
</if>
<if test="(colPickMode==0 and data.containsKey('deptName')) or (colPickMode==1 and !data.containsKey('deptName'))">
a.deptName=#{data.deptName},
</if>
<if test="(colPickMode==0 and data.containsKey('materialName')) or (colPickMode==1 and !data.containsKey('materialName'))">
a.materialName=#{data.materialName},
</if>
......@@ -233,6 +240,13 @@
</if>
</foreach>
</trim>
<trim prefix="deptName=(case" suffix="ELSE deptName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deptName')) or (colPickMode==1 and !item.containsKey('deptName'))">
when a.id=#{item.id} then #{item.deptName}
</if>
</foreach>
</trim>
<trim prefix="materialName=(case" suffix="ELSE materialName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('materialName')) or (colPickMode==1 and !item.containsKey('materialName'))">
......@@ -543,6 +557,21 @@
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptName')">
<if test="conditionParamRef.deptName != null and conditionParamRef.deptName != ''">
${_conditionType_} a.deptName like #{${_conditionParam_}.deptName}
</if>
<if test="conditionParamRef.deptName == null">
${_conditionType_} a.deptName is null
</if>
</if>
<if test="conditionParamRef.containsKey('deptNameList')">
${_conditionType_} a.deptName in
<foreach collection="conditionParamRef.deptNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('materialName')">
<if test="conditionParamRef.materialName != null and conditionParamRef.materialName != ''">
${_conditionType_} a.materialName like #{${_conditionParam_}.materialName}
......@@ -790,6 +819,11 @@
<if test='orderCol.deptCode != null and "DESC".equalsIgnoreCase(orderCol.deptCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deptName')">
a.deptName
<if test='orderCol.deptName != null and "DESC".equalsIgnoreCase(orderCol.deptName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('materialName')">
a.materialName
<if test='orderCol.materialName != null and "DESC".equalsIgnoreCase(orderCol.materialName)'>DESC</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment