Skip to content

T
traffic-front
Commit 0bd7d9fa authored by Mccoy Z Xia's avatar Mccoy Z Xia
Browse files
Options

calendar action 相关页面和接口

parent 5b83e87f
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 58 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/CalendarActionController.java
View file @ 0bd7d9fa
...@@ -20,17 +20,17 @@ public class CalendarActionController { ...@@ -20,17 +20,17 @@ public class CalendarActionController {
@Autowired @Autowired
private ICalendarActionService actionServiceImpl; private ICalendarActionService actionServiceImpl;
@PostMapping("saveCalendarAction") @PostMapping("saveAction")
public OperationResultDto saveCalendarAction(@RequestBody CalendarActionDto dto){ public OperationResultDto saveCalendarAction(@RequestBody CalendarActionDto dto){
return actionServiceImpl.saveCalendarAction(dto); return actionServiceImpl.saveCalendarAction(dto);
} }
@GetMapping("getCalendarActionList") @GetMapping("getActionList")
public OperationResultDto getCalendarActionList(){ public OperationResultDto getCalendarActionList(){
return actionServiceImpl.getCalendarActionList(); return actionServiceImpl.getCalendarActionList();
} }
@PostMapping("deleteCalendarAction/{id}") @GetMapping("deleteAction/{id}")
public OperationResultDto getCalendarDataForDisplay(@PathVariable("id") Long id){ public OperationResultDto getCalendarDataForDisplay(@PathVariable("id") Long id){
return actionServiceImpl.deleteCalendarAction(id); return actionServiceImpl.deleteCalendarAction(id);
} }
......
atms-dao/src/main/java/pwc/taxtech/atms/calendar/dto/CalendarActionDto.java
View file @ 0bd7d9fa
...@@ -27,8 +27,7 @@ public class CalendarActionDto { ...@@ -27,8 +27,7 @@ public class CalendarActionDto {
private String name; private String name;
@JsonSerialize(using = ToStringSerializer.class) private Integer triggerId;
private Long triggerId;
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long taskTypeId; private Long taskTypeId;
......
atms-dao/src/main/java/pwc/taxtech/atms/calendar/entity/CalendarAction.java
View file @ 0bd7d9fa
...@@ -37,7 +37,7 @@ public class CalendarAction extends BaseEntity implements Serializable { ...@@ -37,7 +37,7 @@ public class CalendarAction extends BaseEntity implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
private Long triggerId; private Integer triggerId;
/** /**
* *
...@@ -139,7 +139,7 @@ public class CalendarAction extends BaseEntity implements Serializable { ...@@ -139,7 +139,7 @@ public class CalendarAction extends BaseEntity implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
public Long getTriggerId() { public Integer getTriggerId() {
return triggerId; return triggerId;
} }
...@@ -151,7 +151,7 @@ public class CalendarAction extends BaseEntity implements Serializable { ...@@ -151,7 +151,7 @@ public class CalendarAction extends BaseEntity implements Serializable {
* *
* @mbg.generated * @mbg.generated
*/ */
public void setTriggerId(Long triggerId) { public void setTriggerId(Integer triggerId) {
this.triggerId = triggerId; this.triggerId = triggerId;
} }
......
atms-dao/src/main/java/pwc/taxtech/atms/calendar/entity/CalendarActionExample.java
View file @ 0bd7d9fa
...@@ -335,52 +335,52 @@ public class CalendarActionExample { ...@@ -335,52 +335,52 @@ public class CalendarActionExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTriggerIdEqualTo(Long value) { public Criteria andTriggerIdEqualTo(Integer value) {
addCriterion("trigger_id =", value, "triggerId"); addCriterion("trigger_id =", value, "triggerId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTriggerIdNotEqualTo(Long value) { public Criteria andTriggerIdNotEqualTo(Integer value) {
addCriterion("trigger_id <>", value, "triggerId"); addCriterion("trigger_id <>", value, "triggerId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTriggerIdGreaterThan(Long value) { public Criteria andTriggerIdGreaterThan(Integer value) {
addCriterion("trigger_id >", value, "triggerId"); addCriterion("trigger_id >", value, "triggerId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTriggerIdGreaterThanOrEqualTo(Long value) { public Criteria andTriggerIdGreaterThanOrEqualTo(Integer value) {
addCriterion("trigger_id >=", value, "triggerId"); addCriterion("trigger_id >=", value, "triggerId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTriggerIdLessThan(Long value) { public Criteria andTriggerIdLessThan(Integer value) {
addCriterion("trigger_id <", value, "triggerId"); addCriterion("trigger_id <", value, "triggerId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTriggerIdLessThanOrEqualTo(Long value) { public Criteria andTriggerIdLessThanOrEqualTo(Integer value) {
addCriterion("trigger_id <=", value, "triggerId"); addCriterion("trigger_id <=", value, "triggerId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTriggerIdIn(List<Long> values) { public Criteria andTriggerIdIn(List<Integer> values) {
addCriterion("trigger_id in", values, "triggerId"); addCriterion("trigger_id in", values, "triggerId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTriggerIdNotIn(List<Long> values) { public Criteria andTriggerIdNotIn(List<Integer> values) {
addCriterion("trigger_id not in", values, "triggerId"); addCriterion("trigger_id not in", values, "triggerId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTriggerIdBetween(Long value1, Long value2) { public Criteria andTriggerIdBetween(Integer value1, Integer value2) {
addCriterion("trigger_id between", value1, value2, "triggerId"); addCriterion("trigger_id between", value1, value2, "triggerId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTriggerIdNotBetween(Long value1, Long value2) { public Criteria andTriggerIdNotBetween(Integer value1, Integer value2) {
addCriterion("trigger_id not between", value1, value2, "triggerId"); addCriterion("trigger_id not between", value1, value2, "triggerId");
return (Criteria) this; return (Criteria) this;
} }
......
atms-dao/src/main/resources/pwc/taxtech/atms/calendar/dao/CalendarActionMapper.xml
View file @ 0bd7d9fa
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
--> -->
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" /> <result column="name" jdbcType="VARCHAR" property="name" />
<result column="trigger_id" jdbcType="BIGINT" property="triggerId" /> <result column="trigger_id" jdbcType="INTEGER" property="triggerId" />
<result column="task_type_id" jdbcType="BIGINT" property="taskTypeId" /> <result column="task_type_id" jdbcType="BIGINT" property="taskTypeId" />
<result column="status" jdbcType="TINYINT" property="status" /> <result column="status" jdbcType="TINYINT" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
insert into calendar_action (id, `name`, trigger_id, insert into calendar_action (id, `name`, trigger_id,
task_type_id, `status`, create_time, task_type_id, `status`, create_time,
update_time) update_time)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{triggerId,jdbcType=BIGINT}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{triggerId,jdbcType=INTEGER},
#{taskTypeId,jdbcType=BIGINT}, #{status,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP}, #{taskTypeId,jdbcType=BIGINT}, #{status,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}) #{updateTime,jdbcType=TIMESTAMP})
</insert> </insert>
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
#{name,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
</if> </if>
<if test="triggerId != null"> <if test="triggerId != null">
#{triggerId,jdbcType=BIGINT}, #{triggerId,jdbcType=INTEGER},
</if> </if>
<if test="taskTypeId != null"> <if test="taskTypeId != null">
#{taskTypeId,jdbcType=BIGINT}, #{taskTypeId,jdbcType=BIGINT},
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
`name` = #{record.name,jdbcType=VARCHAR}, `name` = #{record.name,jdbcType=VARCHAR},
</if> </if>
<if test="record.triggerId != null"> <if test="record.triggerId != null">
trigger_id = #{record.triggerId,jdbcType=BIGINT}, trigger_id = #{record.triggerId,jdbcType=INTEGER},
</if> </if>
<if test="record.taskTypeId != null"> <if test="record.taskTypeId != null">
task_type_id = #{record.taskTypeId,jdbcType=BIGINT}, task_type_id = #{record.taskTypeId,jdbcType=BIGINT},
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
update calendar_action update calendar_action
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
`name` = #{record.name,jdbcType=VARCHAR}, `name` = #{record.name,jdbcType=VARCHAR},
trigger_id = #{record.triggerId,jdbcType=BIGINT}, trigger_id = #{record.triggerId,jdbcType=INTEGER},
task_type_id = #{record.taskTypeId,jdbcType=BIGINT}, task_type_id = #{record.taskTypeId,jdbcType=BIGINT},
`status` = #{record.status,jdbcType=TINYINT}, `status` = #{record.status,jdbcType=TINYINT},
create_time = #{record.createTime,jdbcType=TIMESTAMP}, create_time = #{record.createTime,jdbcType=TIMESTAMP},
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
`name` = #{name,jdbcType=VARCHAR}, `name` = #{name,jdbcType=VARCHAR},
</if> </if>
<if test="triggerId != null"> <if test="triggerId != null">
trigger_id = #{triggerId,jdbcType=BIGINT}, trigger_id = #{triggerId,jdbcType=INTEGER},
</if> </if>
<if test="taskTypeId != null"> <if test="taskTypeId != null">
task_type_id = #{taskTypeId,jdbcType=BIGINT}, task_type_id = #{taskTypeId,jdbcType=BIGINT},
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
--> -->
update calendar_action update calendar_action
set `name` = #{name,jdbcType=VARCHAR}, set `name` = #{name,jdbcType=VARCHAR},
trigger_id = #{triggerId,jdbcType=BIGINT}, trigger_id = #{triggerId,jdbcType=INTEGER},
task_type_id = #{taskTypeId,jdbcType=BIGINT}, task_type_id = #{taskTypeId,jdbcType=BIGINT},
`status` = #{status,jdbcType=TINYINT}, `status` = #{status,jdbcType=TINYINT},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
......
atms-web/src/main/webapp/app/admin/systemConfiguration/calendarAction/calendar-action.ctrl.js
View file @ 0bd7d9fa
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
$scope.deleteAction = function (action) { $scope.deleteAction = function (action) {
calendarActionService.deleteCalendarAction(action).success(function (result) { calendarActionService.deleteCalendarAction(action.id).success(function (result) {
if (result.result) { if (result.result) {
SweetAlert.success($translate.instant('CommonSuccess')); SweetAlert.success($translate.instant('CommonSuccess'));
$scope.editActionInstance.dismiss('cancel'); $scope.editActionInstance.dismiss('cancel');
...@@ -208,8 +208,6 @@ ...@@ -208,8 +208,6 @@
var taskTypeList = $scope.taskTypeList; var taskTypeList = $scope.taskTypeList;
var jurisdictionList = actionModel.jurisdictionDtoList;
var logicUnitList = constant.trigger.logicUnit; var logicUnitList = constant.trigger.logicUnit;
$scope.formOptions = { $scope.formOptions = {
...@@ -272,27 +270,23 @@ ...@@ -272,27 +270,23 @@
title: "Hong Kong", title: "Hong Kong",
items: [ items: [
{ {
dataField: "status", dataField: "jurisdictionDtoList[0].status",
caption: "Valid", caption: "Valid",
editorType: "dxCheckBox" editorType: "dxCheckBox"
}, { }, {
dataField: "logicNum", dataField: "jurisdictionDtoList[0].logicNum",
caption: "LogicNum" caption: "LogicNum"
}, { }, {
dataField: "logicUnit", dataField: "jurisdictionDtoList[0].logicUnit",
caption: "LogicUnit", caption: "LogicUnit",
editorType: "dxSelectBox", editorType: "dxSelectBox",
editorOptions: { editorOptions: {
items: logicUnitList, items: logicUnitList,
displayExpr: "name", displayExpr: "name",
valueExpr: "id" valueExpr: "id"
}, }
validationRules: [{
type: "required",
message: "LogicUnit is required"
}]
}, { }, {
dataField: "description", dataField: "jurisdictionDtoList[0].description",
caption: "Description", caption: "Description",
editorType: "dxTextArea", editorType: "dxTextArea",
colSpan: 3, colSpan: 3,
...@@ -305,27 +299,23 @@ ...@@ -305,27 +299,23 @@
title: "BVI", title: "BVI",
items: [ items: [
{ {
dataField: "status", dataField: "jurisdictionDtoList[1].status",
caption: "Valid", caption: "Valid",
editorType: "dxCheckBox" editorType: "dxCheckBox"
}, { }, {
dataField: "logicNum", dataField: "jurisdictionDtoList[1].logicNum",
caption: "LogicNum" caption: "LogicNum"
}, { }, {
dataField: "logicUnit", dataField: "jurisdictionDtoList[1].logicUnit",
caption: "LogicUnit", caption: "LogicUnit",
editorType: "dxSelectBox", editorType: "dxSelectBox",
editorOptions: { editorOptions: {
items: logicUnitList, items: logicUnitList,
displayExpr: "name", displayExpr: "name",
valueExpr: "id" valueExpr: "id"
}, }
validationRules: [{
type: "required",
message: "LogicUnit is required"
}]
}, { }, {
dataField: "description", dataField: "jurisdictionDtoList[1].description",
caption: "Description", caption: "Description",
editorType: "dxTextArea", editorType: "dxTextArea",
colSpan: 3, colSpan: 3,
...@@ -338,27 +328,23 @@ ...@@ -338,27 +328,23 @@
title: "Cayman Islands", title: "Cayman Islands",
items: [ items: [
{ {
dataField: "status", dataField: "jurisdictionDtoList[2].status",
caption: "Valid", caption: "Valid",
editorType: "dxCheckBox" editorType: "dxCheckBox"
}, { }, {
dataField: "logicNum", dataField: "jurisdictionDtoList[2].logicNum",
caption: "LogicNum" caption: "LogicNum"
}, { }, {
dataField: "logicUnit", dataField: "jurisdictionDtoList[2].logicUnit",
caption: "LogicUnit", caption: "LogicUnit",
editorType: "dxSelectBox", editorType: "dxSelectBox",
editorOptions: { editorOptions: {
items: logicUnitList, items: logicUnitList,
displayExpr: "name", displayExpr: "name",
valueExpr: "id" valueExpr: "id"
}, }
validationRules: [{
type: "required",
message: "LogicUnit is required"
}]
}, { }, {
dataField: "description", dataField: "jurisdictionDtoList[2].description",
caption: "Description", caption: "Description",
editorType: "dxTextArea", editorType: "dxTextArea",
colSpan: 3, colSpan: 3,
......
atms-web/src/main/webapp/app/common/webservices/calendarAction.svc.js
View file @ 0bd7d9fa
...@@ -3,13 +3,13 @@ webservices.factory('calendarActionService', ['$http', 'apiConfig', function ($h ...@@ -3,13 +3,13 @@ webservices.factory('calendarActionService', ['$http', 'apiConfig', function ($h
return { return {
getCalendarActionList: function () { getCalendarActionList: function () {
return $http.get('/calendarAction/getCalendarActionList', apiConfig.create()); return $http.get('/calendarAction/getActionList', apiConfig.create());
}, },
saveCalendarAction: function (data) { saveCalendarAction: function (data) {
return $http.post('/calendarAction/saveCalendarAction', data, apiConfig.create()); return $http.post('/calendarAction/saveAction', data, apiConfig.create());
}, },
deleteCalendarAction: function (id) { deleteCalendarAction: function (id) {
return $http.get('/calendarAction/deleteCalendarAction/' + id, apiConfig.create()); return $http.get('/calendarAction/deleteAction/' + id, apiConfig.create());
} }
}; };
......
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