luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/new-exam' into new-exam

Browse Source
new-exam
wangxy 7 months ago
parent 23f8db7845 95465fac0e
commit 33e5960620
8 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File

6
ruoyi-admin/src/main/resources/templates/system/property/property/add.html
Unescape View File

@ -10,7 +10,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">所属地市：</label>
<div class="col-sm-8">
<select id="City" name="part" required @change="getAreaList()" v-model="City" class="form-control m-b">
<select id="City" name="part" required @change="getAreaList()" v-model="City" class="form-control">
<option value="">---请选择---</option>
<option v-for="option in CityList" :value="option.id" :key="option.id">
{{ option.name }}
@ -21,7 +21,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">所属区县：</label>
<div class="col-sm-8">
<select id="Area" name="areaId" required v-model="Area" class="form-control m-b">
<select id="Area" name="areaId" required v-model="Area" class="form-control">
<option value="">---请选择---</option>
<option v-for="option in AreaList" :value="option.id" :key="option.id">
{{ option.name }}
@ -83,7 +83,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required ">密品分类：</label>
<div class="col-sm-8">
<select name="secretsType" required class="form-control m-b" th:with="type=${@dict.getType('sys_secrets_type')}">
<select name="secretsType" required class="form-control" th:with="type=${@dict.getType('sys_secrets_type')}">
<option value="">请选择</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>

12
ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
Unescape View File

@ -17,7 +17,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">所属地市：</label>
<div class="col-sm-8">
<select id="City" name="part" required @change="getAreaList()" v-model="City" class="form-control m-b">
<select id="City" name="part" required @change="getAreaList()" v-model="City" class="form-control ">
<option value="">---请选择---</option>
<option v-for="option in CityList" :value="option.id" :key="option.id">
{{ option.name }}
@ -28,7 +28,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">所属区县：</label>
<div class="col-sm-8">
<select id="Area" name="areaId" required v-model="Area" class="form-control m-b">
<select id="Area" name="areaId" required v-model="Area" class="form-control ">
<option value="">---请选择---</option>
<option v-for="option in AreaList" :value="option.id" :key="option.id">
{{ option.name }}
@ -60,12 +60,6 @@
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">单位名称：</label>
<div class="col-sm-8">
<input name="frameworkId" required th:field="*{frameworkId}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">登记部门：</label>
<div class="col-sm-8">
@ -90,7 +84,7 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">密品分类：</label>
<div class="col-sm-8">
<select name="secretsType" class="form-control m-b" th:with="type=${@dict.getType('sys_secrets_type')}">
<select name="secretsType" class="form-control " th:with="type=${@dict.getType('sys_secrets_type')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:field="*{secretsType}" th:value="${dict.dictValue}"></option>
</select>
</div>

5
ruoyi-system/src/main/java/com/ruoyi/system/domain/TdMeeting.java
Unescape View File

@ -79,6 +79,11 @@ public class TdMeeting extends BaseEntity {
*/
private String fileName;
/**
* 部门
*/
private Long deptId;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}

5
ruoyi-system/src/main/java/com/ruoyi/system/domain/check/TdCheckReport.java
Unescape View File

@ -109,6 +109,11 @@ public class TdCheckReport implements Serializable {
@Excel(name = "备注")
private String remark;
/**
* 部门
*/
private Long deptId;
@TableField(exist = false)
private static final long serialVersionUID = 1L;

5
ruoyi-system/src/main/java/com/ruoyi/system/domain/place/TdPlace.java
Unescape View File

@ -65,6 +65,11 @@ public class TdPlace extends BaseEntity {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date afterTime;
/**
* 部门
*/
private Long deptId;
@TableField(exist = false)
private static final long serialVersionUID = 1L;

3
ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml
Unescape View File

@ -20,13 +20,14 @@
<result property="realScore" column="real_score" jdbcType="VARCHAR"/>
<result property="percentageScore" column="percentage_score" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<result property="deptId" column="dept_id" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
check_id,adduser,depart,
check_start_time,check_end_time,check_type,
area,framework,check_state,
check_name,create_time,total_score,real_score,percentage_score,remark
check_name,create_time,total_score,real_score,percentage_score,remark,dept_id
</sql>
<select id="selectTdCheckReportList" resultType="com.ruoyi.system.domain.check.TdCheckReport">
select <include refid="Base_Column_List"/> from td_check_report

3
ruoyi-system/src/main/resources/mapper/system/TdMeetingMapper.xml
Unescape View File

@ -22,6 +22,7 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="deptId" column="dept_id" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
@ -29,7 +30,7 @@
meeting_address,meeting_usernum,meeting_host,
meeting_type,meeting_state,agenda,
summary,file_url,
file_name,create_by, create_time, update_by, update_time, remark
file_name,create_by, create_time, update_by, update_time, remark,dept_id
</sql>
<select id="selectTdMeetingList" resultType="com.ruoyi.system.domain.TdMeeting">
select <include refid="Base_Column_List"/> from td_meeting

3
ruoyi-system/src/main/resources/mapper/system/TdPlaceMapper.xml
Unescape View File

@ -18,12 +18,13 @@
<result property="afterRule" column="after_rule" jdbcType="VARCHAR"/>
<result property="state" column="state" jdbcType="VARCHAR"/>
<result property="isDissolve" column="is_dissolve" jdbcType="VARCHAR"/>
<result property="deptId" column="dept_id" jdbcType="INTEGER"/>
</resultMap>
<sql id="Base_Column_List">
id,place_name,place_rule,
create_by,create_time,update_by,
update_time,remark,after_time,after_name,after_rule,state,is_dissolve
update_time,remark,after_time,after_name,after_rule,state,is_dissolve,dept_id
</sql>
<select id="selectTdPlaceList" resultType="com.ruoyi.system.domain.place.TdPlace">
select <include refid="Base_Column_List"/> from td_place

Write Preview
Loading…
Cancel
Save