| jcdm-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-system/src/main/resources/mapper/system/SysRoleMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/bs/workshop/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
jcdm-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml
@@ -75,7 +75,7 @@ <if test="status !=null">status = #{status},</if> <if test="remark != null and remark != ''">remark = #{remark},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> update_time = sysdate() update_time = getdate() </set> where job_id = #{jobId} </update> @@ -104,7 +104,7 @@ <if test="status != null and status != ''">#{status},</if> <if test="remark != null and remark != ''">#{remark},</if> <if test="createBy != null and createBy != ''">#{createBy},</if> sysdate() getdate() ) </insert>
@@ -84,13 +84,27 @@ </select> <select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult"> <include refid="selectRoleVo"/> where r.role_name=#{roleName} and r.del_flag = '0' limit 1 <!-- <include refid="selectRoleVo"/>--> <!-- where r.role_name=#{roleName} and r.del_flag = '0' limit 1--> select distinct top(1) r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, r.status, r.del_flag, r.create_time, r.remark from sys_role r left join sys_user_role ur on ur.role_id = r.role_id left join sys_user u on u.user_id = ur.user_id left join sys_dept d on u.dept_id = d.dept_id where r.role_name=#{roleName} and r.del_flag = '0' </select> <select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult"> <include refid="selectRoleVo"/> where r.role_key=#{roleKey} and r.del_flag = '0' limit 1 <!-- <include refid="selectRoleVo"/>--> <!-- where r.role_key=#{roleKey} and r.del_flag = '0' limit 1--> select distinct top(1) r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, r.status, r.del_flag, r.create_time, r.remark from sys_role r left join sys_user_role ur on ur.role_id = r.role_id left join sys_user u on u.user_id = ur.user_id left join sys_dept d on u.dept_id = d.dept_id where r.role_key=#{roleKey} and r.del_flag = '0' </select> <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId"> @@ -133,7 +147,7 @@ <if test="status != null and status != ''">status = #{status},</if> <if test="remark != null">remark = #{remark},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> update_time = sysdate() update_time = getdate() </set> where role_id = #{roleId} </update> jcdm-ui/src/views/main/bs/workshop/index.vue
@@ -45,6 +45,11 @@ </el-card> <el-card style="margin-top: 10px" class="box-card"> <!-- <el-row class="mb8" style="float: left">--> <!-- <div>--> <!-- <i class="el-icon-s-grid"></i>车间信息--> <!-- </div>--> <!-- </el-row>--> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> <el-button @@ -90,44 +95,22 @@ </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> <el-table v-loading="loading" border :data="workshopList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="workshopList" @selection-change="handleSelectionChange" v-if="workshopList.length > 0"> <el-table-column type="selection" width="55" align="center" /> <!-- <el-table-column label="id" align="center" prop="id" />--> <el-table-column label="车间编码" align="center" prop="workshopCode"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.workshopCode"/>--> <!-- </template>--> </el-table-column> <el-table-column label="车间名称" align="center" prop="workshopName"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.workshopName"/>--> <!-- </template>--> </el-table-column> <el-table-column label="备注" align="center" prop="remarks"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.remarks"/>--> <!-- </template>--> </el-table-column> <el-table-column label="创建人" align="center" prop="createUser"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.createUser"/>--> <!-- </template>--> </el-table-column> <el-table-column label="创建时间" align="center" prop="createTime" width="180"> <!-- <template slot-scope="scope">--> <!-- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>--> <!-- </template>--> </el-table-column> <el-table-column label="更新人" align="center" prop="updateUser"> <!-- <template slot-scope="scope">--> <!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.updateUser"/>--> <!-- </template>--> </el-table-column> <el-table-column label="更新时间" align="center" prop="updateTime" width="180"> <!-- <template slot-scope="scope">--> <!-- <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>--> <!-- </template>--> </el-table-column> <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> @@ -148,6 +131,9 @@ </template> </el-table-column> </el-table> <el-empty v-else> <span slot="description">暂无数据</span> </el-empty> </el-card>
