public/cyx-ament-pc
public
/
cyx-ament-pc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: public:d9798de0d942894860c90bf726cb016314cd7267
Branches Tags
public:master
..
compare: public:76f91a51abf7a82e6dfe01e394195b723fdb3469
Branches Tags
public:master

2 Commits
d9798de0d9 ... 76f91a51ab

Author SHA1 Message Date
liuwu 76f91a51ab Merge remote-tracking branch 'origin/master' 2023-09-22 15:37:41 +08:00
liuwu 7a2bea92a2 修改页面和接口 2023-09-22 15:37:33 +08:00
5 changed files with 118 additions and 82 deletions
Show Stats Expand all files Collapse all files

6
cyx-admin/src/main/java/com/cyx/web/base/domain/TAmentTrade.java
View File

@ -24,7 +24,7 @@ public class TAmentTrade extends BaseEntity
/** 交易额 */ /** 交易额 */
@Excel(name = "交易额") @Excel(name = "交易额")
private Long tradeMony; private Double tradeMony;
private String tradeType; private String tradeType;
@ -62,12 +62,12 @@ public class TAmentTrade extends BaseEntity
{ {
return tradeCount; return tradeCount;
} }
public void setTradeMony(Long tradeMony) public void setTradeMony(Double tradeMony)
{ {
this.tradeMony = tradeMony; this.tradeMony = tradeMony;
} }
public Long getTradeMony() public Double getTradeMony()
{ {
return tradeMony; return tradeMony;
} }

9
cyx-admin/src/main/resources/application.yml
View File

@ -7,16 +7,17 @@ ruoyi:
# 版权年份 # 版权年份
copyrightYear: 2023 copyrightYear: 2023
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: false
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
profile: D:/ruoyi/uploadPath # profile: D:/ruoyi/uploadPath
profile: /home/ruoyi/uploadPath
# 获取ip地址开关 # 获取ip地址开关
addressEnabled: false addressEnabled: false
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口，默认为80 # 服务器的HTTP端口，默认为80
port: 8101 port: 8088
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /
@ -66,7 +67,7 @@ spring:
# 单个文件大小 # 单个文件大小
max-file-size: 100MB max-file-size: 100MB
# 设置总上传的文件大小 # 设置总上传的文件大小
max-request-size: 200MB max-request-size: 1000MB
# 服务模块 # 服务模块
devtools: devtools:
restart: restart:

141
cyx-admin/src/main/resources/templates/base/affairs/add.html
View File

@ -8,7 +8,8 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-affairs-add"> <form class="form-horizontal m" id="form-affairs-add">
<input name="method" type="hidden" id="method" class="form-control" /> <input name="method" type="hidden" id="method" class="form-control" />
<div class="form-group"> <div class="row">
<div class="form-group col-sm-12 col-md-12">
<label class="col-sm-3 control-label">类型：</label> <label class="col-sm-3 control-label">类型：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select required name="type" id="type-selector" class="form-control m-b"> <select required name="type" id="type-selector" class="form-control m-b">
@ -20,44 +21,44 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group col-sm-12 col-md-12">
<label class="col-sm-3 control-label" id="target">目标项：</label> <label class="col-sm-3 control-label" id="target">目标项：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea required name="target" class="form-control"></textarea> <textarea required name="target" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group col-sm-12 col-md-12">
<label class="col-sm-3 control-label" id="shotName">简写：</label> <label class="col-sm-3 control-label" id="shotName">简写：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input required name="shotName" class="form-control" /> <input required name="shotName" class="form-control" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group col-sm-12 col-md-12">
<label class="col-sm-3 control-label" id="demand">目标要求：</label> <label class="col-sm-3 control-label" id="demand">目标要求：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="demand" class="form-control"></textarea> <textarea name="demand" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="form-group dy" style="display: none"> <div class="form-group col-sm-12 col-md-12 dy " style="display: none">
<label class="col-sm-3 control-label" >标准要求：</label> <label class="col-sm-3 control-label" >标准要求：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea name="method1" id="method1" class="form-control"></textarea> <textarea name="method1" id="method1" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group col-sm-12 col-md-12">
<label class="col-sm-3 control-label" id="detailed">工作任务：</label> <label class="col-sm-3 control-label" id="detailed">工作任务：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<textarea required name="detailed" class="form-control"></textarea> <textarea required name="detailed" class="form-control"></textarea>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group col-sm-12 col-md-12">
<label class="col-sm-3 control-label" id="degree">重点工作：</label> <label class="col-sm-3 control-label" id="degree">重点工作：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<label class="radio-box"> <input type="radio" name="degree" value="0" th:checked="true"/>非重点工作</label> <label class="radio-box"> <input type="radio" name="degree" value="0" th:checked="true"/>非重点工作</label>
<label class="radio-box"> <input type="radio" name="degree" value="1" />重点工作</label> <label class="radio-box"> <input type="radio" name="degree" value="1" />重点工作</label>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group col-sm-12 col-md-12">
<label class="col-sm-3 control-label" id="score">达标分：</label> <label class="col-sm-3 control-label" id="score">达标分：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input required name="score" class="form-control" type="number"/> <input required name="score" class="form-control" type="number"/>
@ -69,68 +70,74 @@
<!-- <input required name="unit" class="form-control" />--> <!-- <input required name="unit" class="form-control" />-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<div class="form-group" id="dw" style="display: none"> <div class="form-group col-sm-12 col-md-12" id="dw" style="display: none">
<label class="col-sm-3 control-label" >考核方式：</label> <label class="col-sm-3 control-label" >考核方式：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="method2" id="method2" class="form-control" /> <input name="method2" id="method2" class="form-control" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group col-sm-12 col-md-12 row">
<label class="col-sm-3 control-label">负责人：</label> <div class="col-sm-6 col-md-6">
<div class="col-sm-8"> <label class="col-sm-6 control-label">负责人：</label>
<select required name="head" id="head" class="form-control m-b"> <div class="col-sm-6">
<option value="">请选择</option> <select required name="head" id="head" class="form-control m-b">
</select> <option value="">请选择</option>
</div> </select>
</div> </div>
<div class="form-group"> </div>
<label class="col-sm-3 control-label">审核人：</label> <div class="col-sm-6 col-md-6">
<div class="col-sm-8"> <label class="col-sm-4 control-label">审核人：</label>
<select required name="reviewed" id="reviewed" class="form-control m-b"> <div class="col-sm-6">
<option value="">请选择</option> <select required name="reviewed" id="reviewed" class="form-control m-b">
</select> <option value="">请选择</option>
</div> </select>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">完成截止时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input required name="finishDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
</div> <div class="form-group col-sm-12 col-md-12 row">
<div class="form-group"> <div class="col-sm-6 col-md-6">
<label class="col-sm-3 control-label">周/月/季度：</label> <label class="col-sm-6 control-label">完成截止时间：</label>
<div class="col-sm-8"> <div class="col-sm-6">
<select name="unit" id="unit" class="form-control m-b"> <div class="input-group date">
<option value="">请选择</option> <input required name="finishDate" readonly class="form-control" placeholder="yyyy-MM-dd" type="text">
<option value="工程建设项目">周</option> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<option value="政府采购">月</option> </div>
<option value="国有产权交易">季度</option> </div>
</select> </div>
<div class="col-sm-6 col-md-6">
<label class="col-sm-4 control-label">周/月/季度：</label>
<div class="col-sm-6">
<select name="unit" id="unit" class="form-control m-b">
<option value="">请选择</option>
<option value="工程建设项目">周</option>
<option value="政府采购">月</option>
<option value="国有产权交易">季度</option>
</select>
</div>
</div>
</div> </div>
</div> <div class="form-group col-sm-12 col-md-12 dy" style="display: none">
<div class="form-group dy" style="display: none"> <label class="col-sm-3 control-label">部门：</label>
<label class="col-sm-3 control-label">部门：</label> <div class="col-sm-8">
<div class="col-sm-8"> <select name="deptId" disabled id="deptId" class="form-control m-b">
<select name="deptId" id="deptId" class="form-control m-b"> <option value="">请选择</option>
<option value="">请选择</option> </select>
</select> </div>
</div> </div>
</div> <div class="form-group col-sm-12 col-md-12">
<div class="form-group"> <label class="col-sm-3 control-label">支部：</label>
<label class="col-sm-3 control-label">支部：</label> <div class="col-sm-8">
<div class="col-sm-8"> <select name="branchId" disabled id="branchId" class="form-control m-b">
<select name="branchId" id="branchId" class="form-control m-b"> <option value="">请选择</option>
<option value="">请选择</option> </select>
</select> </div>
</div> </div>
</div> <div class="form-group col-sm-12 col-md-12">
<div class="form-group"> <label class="col-sm-3 control-label">备注：</label>
<label class="col-sm-3 control-label">备注：</label> <div class="col-sm-8">
<div class="col-sm-8"> <textarea name="remark" class="form-control"></textarea>
<textarea name="remark" class="form-control"></textarea> </div>
</div> </div>
</div> </div>
</form> </form>
@ -144,6 +151,20 @@
focusCleanup: true focusCleanup: true
}); });
$("#head").on("change", function() {
var data = $(this).val();
$.ajax({
type: "post",
url: ctx + "base/personnel/getById?id="+data,
data: {
},
success: function(res) {
$("#deptId").val(res.data.deptId);
$("#branchId").val(res.data.branchId);
}
});
})
$(document).ready(function () { $(document).ready(function () {
$.ajax({ $.ajax({
type: "post", type: "post",

40
cyx-admin/src/main/resources/templates/base/affairs/edit.html
View File

@ -79,7 +79,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">负责人：</label> <label class="col-sm-3 control-label">负责人：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="parentId" th:field="*{head}" id="parentId" class="form-control"> <select name="parentId" th:field="*{head}" onchange="headChange(this)" id="parentId" class="form-control">
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="item : ${perList}" th:text="${item.name}" th:value="${item.id}"></option> <option th:each="item : ${perList}" th:text="${item.name}" th:value="${item.id}"></option>
</select> </select>
@ -118,20 +118,20 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group"> <!-- <div class="form-group"> -->
<label class="col-sm-3 control-label">操作人员：</label> <!-- <label class="col-sm-3 control-label">操作人员：</label>-->
<div class="col-sm-8"> <!-- <div class="col-sm-8">-->
<select name="perId" th:field="*{perId}" id="perId" class="form-control m-b"> <!-- <select name="perId" th:field="*{perId}" id="perId" class="form-control m-b">-->
<option value="">请选择</option> <!-- <option value="">请选择</option>-->
<option th:each="item : ${perList}" th:text="${item.name}" th:value="${item.id}"></option> <!-- <option th:each="item : ${perList}" th:text="${item.name}" th:value="${item.id}"></option>-->
</select> <!-- </select>-->
<!-- <input name="perId" th:field="*{perId}" class="form-control" type="text">--> <!--&lt;!&ndash; <input name="perId" th:field="*{perId}" class="form-control" type="text">&ndash;&gt;-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">部门：</label> <label class="col-sm-3 control-label">部门：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="deptId" th:field="*{deptId}" id="deptId" class="form-control m-b"> <select name="deptId" th:field="*{deptId}" disabled id="deptId" class="form-control m-b">
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="item : ${deptList}" th:text="${item.deptName}" th:value="${item.deptId}"></option> <option th:each="item : ${deptList}" th:text="${item.deptName}" th:value="${item.deptId}"></option>
</select> </select>
@ -140,7 +140,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">支部：</label> <label class="col-sm-3 control-label">支部：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="branchId" th:field="*{branchId}" id="branchId" class="form-control m-b"> <select name="branchId" th:field="*{branchId}" disabled id="branchId" class="form-control m-b">
<option value="">请选择</option> <option value="">请选择</option>
<option th:each="item : ${branchList}" th:text="${item.branchName}" th:value="${item.branchId}"></option> <option th:each="item : ${branchList}" th:text="${item.branchName}" th:value="${item.branchId}"></option>
</select> </select>
@ -162,6 +162,20 @@
focusCleanup: true focusCleanup: true
}); });
function headChange(obj){
var data = $(obj).val();
$.ajax({
type: "post",
url: ctx + "base/personnel/getById?id="+data,
data: {
},
success: function(res) {
$('#deptId').val(res.data.deptId)
$('#branchId').val(res.data.branchId)
}
});
}
$("#type-selector").on("change", function() { $("#type-selector").on("change", function() {
var type = $(this).val(); var type = $(this).val();
var target = $("#target"); var target = $("#target");

4
cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
View File

@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="shotName != null and shotName != ''"> and a.shot_name = #{shotName}</if> <if test="shotName != null and shotName != ''"> and a.shot_name = #{shotName}</if>
<if test="unit != null and unit != ''"> and a.unit = #{unit}</if> <if test="unit != null and unit != ''"> and a.unit = #{unit}</if>
<if test="target != null and target != ''"> and a.target = #{target}</if> <if test="target != null and target != ''"> and a.target = #{target}</if>
<if test="zhiwu != null and zhiwu != ''"> and b.party_duties = #{zhiwu}</if> <if test="zhiwu != null and zhiwu != ''"> and d.party_duties = #{zhiwu}</if>
<!-- <if test="target != null and target != ''">--> <!-- <if test="target != null and target != ''">-->
<!-- AND a.target like concat('%', #{target}, '%')--> <!-- AND a.target like concat('%', #{target}, '%')-->
<!-- </if>--> <!-- </if>-->
@ -320,7 +320,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM FROM
t_ament_party_affairs a LEFT JOIN sys_dept d on a.dept_id = d.dept_id t_ament_party_affairs a LEFT JOIN sys_dept d on a.dept_id = d.dept_id
WHERE WHERE
a.type IN ( '日常考核指标', '季度考核指标' ) a.type IN ( '日常考核指标', '季度考核指标' ) and a.dept_id != 100
GROUP BY GROUP BY
a.dept_id, a.dept_id,
a.type a.type