Commit 076fbd30 authored by 赵啸非's avatar 赵啸非

添加排序字段

parent 828be6bc
...@@ -77,4 +77,4 @@ ALTER TABLE mortals_sys_matter ADD COLUMN `areaLevel` tinyint(2) COMMENT ' ...@@ -77,4 +77,4 @@ ALTER TABLE mortals_sys_matter ADD COLUMN `areaLevel` tinyint(2) COMMENT '
INSERT INTO `mortals_sys_area` VALUES (null, ',16ca461e2c824257a50dd0c7fab6f2de', '达州东部经开区', 'gde17ba11bbf48568547c21b174c8a32', '16ca461e2c824257a50dd0c7fab6f2de', 'True', 'True', 'false', 'false', '511715000000', 3, '达州东部经开区', 'dzsgxjscyy.sczwfw.gov.cn', 1, '2025-03-20 10:20:10', NULL, '2025-03-20 10:20:10'); INSERT INTO `mortals_sys_area` VALUES (null, ',16ca461e2c824257a50dd0c7fab6f2de', '达州东部经开区', 'gde17ba11bbf48568547c21b174c8a32', '16ca461e2c824257a50dd0c7fab6f2de', 'True', 'True', 'false', 'false', '511715000000', 3, '达州东部经开区', 'dzsgxjscyy.sczwfw.gov.cn', 1, '2025-03-20 10:20:10', NULL, '2025-03-20 10:20:10');
ALTER TABLE mortals_ent_life_matter ADD COLUMN `num` int(4) NULL DEFAULT 0 COMMENT '数量'; ALTER TABLE mortals_ent_life_matter ADD COLUMN `num` int(4) NULL DEFAULT 0 COMMENT '数量';
\ No newline at end of file \ No newline at end of file
...@@ -42,8 +42,6 @@ import com.mortals.xhx.common.code.*; ...@@ -42,8 +42,6 @@ import com.mortals.xhx.common.code.*;
@RequestMapping("ent/life/matter") @RequestMapping("ent/life/matter")
public class EntLifeMatterController extends BaseCRUDJsonBodyMappingController<EntLifeMatterService, EntLifeMatterEntity, Long> { public class EntLifeMatterController extends BaseCRUDJsonBodyMappingController<EntLifeMatterService, EntLifeMatterEntity, Long> {
@Autowired
private ParamService paramService;
public EntLifeMatterController() { public EntLifeMatterController() {
super.setModuleDesc("企业周期事项主"); super.setModuleDesc("企业周期事项主");
......
...@@ -655,21 +655,21 @@ ...@@ -655,21 +655,21 @@
, ,
</if> </if>
<if test="conditionParamRef.containsKey('lifeCycleIdList') and conditionParamRef.lifeCycleIdList.size() > 0"> <if test="conditionParamRef.containsKey('lifeCycleIdList') and conditionParamRef.lifeCycleIdList.size() > 0">
field(a.lifeCycleId, field(a.life_cycle_id,
<foreach collection="conditionParamRef.lifeCycleIdList" open="" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.lifeCycleIdList" open="" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0"> <if test="conditionParamRef.containsKey('deptIdList') and conditionParamRef.deptIdList.size() > 0">
field(a.deptId, field(a.dept_id,
<foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deptIdList" open="" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
, ,
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
field(a.createUserId, field(a.create_user_id,
<foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
......
...@@ -48,7 +48,7 @@ client.global.set("EntLifeMatter_id", JSON.parse(response.body).data.id); ...@@ -48,7 +48,7 @@ client.global.set("EntLifeMatter_id", JSON.parse(response.body).data.id);
%} %}
###企业周期事项主查看 ###企业周期事项主查看
GET {{baseUrl}}/ent/life/matter/info?id=1 GET {{baseUrl}}/ent/life/matter/interinfo?id=500
###企业周期事项主编辑 ###企业周期事项主编辑
GET {{baseUrl}}/ent/life/matter/edit?id=1 GET {{baseUrl}}/ent/life/matter/edit?id=1
......
...@@ -9,5 +9,10 @@ ...@@ -9,5 +9,10 @@
}, },
"product": { "product": {
"baseUrl": "http://192.168.0.250:11089/entservice" "baseUrl": "http://192.168.0.250:11089/entservice"
},
"dazhou": {
"baseUrl": "http://61.157.227.62:11072/basics_api/entservice"
} }
} }
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