From ca4559d20caf2b5fec3fa6299d3e04d53e7fdd22 Mon Sep 17 00:00:00 2001 From: lzx <2602107437@qq.com> Date: Sun, 29 Sep 2024 21:51:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin-hanhai-vue/.env.development | 2 +- admin-hanhai-vue/.env.production | 2 +- .../src/views/HanHaiMember/HanHaiMemberList.vue | 24 +- .../HanHaiMember/modules/HanHaiMemberForm.vue | 62 ++-- .../views/HanHaiMemberAccount/HanHaiMemberList.vue | 44 +-- .../modules/HanHaiMemberForm.vue | 14 +- .../views/HanHaiMemberPass/HanHaiMemberList.vue | 40 +-- .../src/views/subSchool/ShcoolSubList.vue | 344 +++++++++++++++++++++ .../src/views/subSchool/modules/ShcoolSubForm.vue | 184 +++++++++++ .../modules/ShcoolSubModal.Style#Drawer.vue | 84 +++++ .../src/views/subSchool/modules/ShcoolSubModal.vue | 60 ++++ .../controller/HanHaiMemberController.java | 13 +- .../shcoolSub/controller/ShcoolSubController.java | 80 +++-- .../jeecg/modules/shcoolSub/entity/ShcoolSub.java | 32 +- .../modules/shcoolSub/mapper/ShcoolSubMapper.java | 2 +- .../shcoolSub/service/IShcoolSubService.java | 2 +- .../service/impl/ShcoolSubServiceImpl.java | 2 +- .../jeecg/modules/shcoolSub/vue/ShcoolSubList.vue | 96 +++++- .../shcoolSub/vue/modules/ShcoolSubForm.vue | 37 ++- .../jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts | 123 +++++++- .../controller/HanHaiMemberController.class | Bin 11262 -> 11297 bytes .../shcoolSub/controller/ShcoolSubController.class | Bin 7226 -> 9398 bytes .../jeecg/modules/shcoolSub/entity/ShcoolSub.class | Bin 13115 -> 15212 bytes .../redis/writer/JeecgRedisCacheWriter.class | Bin 13676 -> 13716 bytes .../apiservice/impl/IndexApiServiceImpl.java | 130 +++++++- .../src/main/resources/application-dev.yml | 2 +- 26 files changed, 1202 insertions(+), 177 deletions(-) create mode 100644 admin-hanhai-vue/src/views/subSchool/ShcoolSubList.vue create mode 100644 admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubForm.vue create mode 100644 admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubModal.Style#Drawer.vue create mode 100644 admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubModal.vue diff --git a/admin-hanhai-vue/.env.development b/admin-hanhai-vue/.env.development index f944f3f..4fc3274 100644 --- a/admin-hanhai-vue/.env.development +++ b/admin-hanhai-vue/.env.development @@ -1,5 +1,5 @@ NODE_ENV=development -VUE_APP_API_BASE_URL=http://localhost:8003/school-api/ +VUE_APP_API_BASE_URL=http://localhost:8000/school-api/ VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview diff --git a/admin-hanhai-vue/.env.production b/admin-hanhai-vue/.env.production index da11fb6..f4c58d7 100644 --- a/admin-hanhai-vue/.env.production +++ b/admin-hanhai-vue/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_BASE_URL=http://localhost:8003/school-api/ +VUE_APP_API_BASE_URL=http://localhost:8000/school-api/ VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/HanHaiMember/HanHaiMemberList.vue b/admin-hanhai-vue/src/views/HanHaiMember/HanHaiMemberList.vue index 99a989e..8065dd1 100644 --- a/admin-hanhai-vue/src/views/HanHaiMember/HanHaiMemberList.vue +++ b/admin-hanhai-vue/src/views/HanHaiMember/HanHaiMemberList.vue @@ -132,11 +132,11 @@ dataIndex: 'headImage', scopedSlots: {customRender: 'imgSlot'} }, - { - title:'真实姓名', - align:"center", - dataIndex: 'name' - }, + // { + // title:'真实姓名', + // align:"center", + // dataIndex: 'name' + // }, { title:'openid', align:"center", @@ -182,7 +182,7 @@ deleteBatch: "/hanHaiMember/hanHaiMember/deleteBatch", exportXlsUrl: "/hanHaiMember/hanHaiMember/exportXls", importExcelUrl: "hanHaiMember/hanHaiMember/importExcel", - + }, dictOptions:{}, superFieldList:[], @@ -202,12 +202,12 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''}) - fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''}) - fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''}) - fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''}) - fieldList.push({type:'string',value:'account',text:'登录账号',dictCode:''}) - fieldList.push({type:'string',value:'password',text:'登录密码',dictCode:''}) - fieldList.push({type:'string',value:'passwordSalt',text:'登录盐',dictCode:''}) + // fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''}) + // fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''}) + // fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''}) + // fieldList.push({type:'string',value:'account',text:'登录账号',dictCode:''}) + // fieldList.push({type:'string',value:'password',text:'登录密码',dictCode:''}) + // fieldList.push({type:'string',value:'passwordSalt',text:'登录盐',dictCode:''}) fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''}) this.superFieldList = fieldList } diff --git a/admin-hanhai-vue/src/views/HanHaiMember/modules/HanHaiMemberForm.vue b/admin-hanhai-vue/src/views/HanHaiMember/modules/HanHaiMemberForm.vue index 225bb84..85d9460 100644 --- a/admin-hanhai-vue/src/views/HanHaiMember/modules/HanHaiMemberForm.vue +++ b/admin-hanhai-vue/src/views/HanHaiMember/modules/HanHaiMemberForm.vue @@ -13,41 +13,41 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -136,7 +136,7 @@ that.confirmLoading = false; }) } - + }) }, } diff --git a/admin-hanhai-vue/src/views/HanHaiMemberAccount/HanHaiMemberList.vue b/admin-hanhai-vue/src/views/HanHaiMemberAccount/HanHaiMemberList.vue index ee749b0..bf7a8cb 100644 --- a/admin-hanhai-vue/src/views/HanHaiMemberAccount/HanHaiMemberList.vue +++ b/admin-hanhai-vue/src/views/HanHaiMemberAccount/HanHaiMemberList.vue @@ -68,9 +68,9 @@ - 编辑 + - + 更多 @@ -137,13 +137,13 @@ align:"center", dataIndex: 'name' }, + // { + // title:'手机号码', + // align:"center", + // dataIndex: 'phone' + // }, { - title:'手机号码', - align:"center", - dataIndex: 'phone' - }, - { - title:'登录账号', + title:'登录账号(手机号码)', align:"center", dataIndex: 'account' }, @@ -162,11 +162,11 @@ align:"center", dataIndex: 'sex' }, - { - title:'角色', - align:"center", - dataIndex: 'isDa' - }, + // { + // title:'角色', + // align:"center", + // dataIndex: 'isDai' + // }, { title: '操作', dataIndex: 'action', @@ -182,7 +182,7 @@ deleteBatch: "/hanHaiMember/hanHaiMember/deleteBatch", exportXlsUrl: "/hanHaiMember/hanHaiMember/exportXls", importExcelUrl: "hanHaiMember/hanHaiMember/importExcel", - + }, dictOptions:{}, superFieldList:[], @@ -201,14 +201,14 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''}) - fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''}) - fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''}) - fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''}) - fieldList.push({type:'string',value:'account',text:'登录账号',dictCode:''}) - fieldList.push({type:'string',value:'password',text:'登录密码',dictCode:''}) - fieldList.push({type:'string',value:'passwordSalt',text:'登录盐',dictCode:''}) - fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''}) + // fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''}) + // fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''}) + // fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''}) + // fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''}) + fieldList.push({type:'string',value:'account',text:'登录账号(手机号码)',dictCode:''}) + // fieldList.push({type:'string',value:'password',text:'登录密码',dictCode:''}) + // fieldList.push({type:'string',value:'passwordSalt',text:'登录盐',dictCode:''}) + // fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''}) this.superFieldList = fieldList } } diff --git a/admin-hanhai-vue/src/views/HanHaiMemberAccount/modules/HanHaiMemberForm.vue b/admin-hanhai-vue/src/views/HanHaiMemberAccount/modules/HanHaiMemberForm.vue index ea8889c..5ab014e 100644 --- a/admin-hanhai-vue/src/views/HanHaiMemberAccount/modules/HanHaiMemberForm.vue +++ b/admin-hanhai-vue/src/views/HanHaiMemberAccount/modules/HanHaiMemberForm.vue @@ -18,14 +18,14 @@ + + + + + - - - - - - - + + diff --git a/admin-hanhai-vue/src/views/HanHaiMemberPass/HanHaiMemberList.vue b/admin-hanhai-vue/src/views/HanHaiMemberPass/HanHaiMemberList.vue index 6f68dd6..f3cbb92 100644 --- a/admin-hanhai-vue/src/views/HanHaiMemberPass/HanHaiMemberList.vue +++ b/admin-hanhai-vue/src/views/HanHaiMemberPass/HanHaiMemberList.vue @@ -137,13 +137,13 @@ align:"center", dataIndex: 'name' }, + // { + // title:'手机号码', + // align:"center", + // dataIndex: 'phone' + // }, { - title:'手机号码', - align:"center", - dataIndex: 'phone' - }, - { - title:'登录账号', + title:'登录账号(手机号码)', align:"center", dataIndex: 'account' }, @@ -162,11 +162,11 @@ align:"center", dataIndex: 'sex' }, - { - title:'角色', - align:"center", - dataIndex: 'isDa' - }, + // { + // title:'角色', + // align:"center", + // dataIndex: 'isDa' + // }, { title: '操作', dataIndex: 'action', @@ -182,7 +182,7 @@ deleteBatch: "/hanHaiMember/hanHaiMember/deleteBatch", exportXlsUrl: "/hanHaiMember/hanHaiMember/exportXls", importExcelUrl: "hanHaiMember/hanHaiMember/importExcel", - + }, dictOptions:{}, superFieldList:[], @@ -201,14 +201,14 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''}) - fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''}) - fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''}) - fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''}) - fieldList.push({type:'string',value:'account',text:'登录账号',dictCode:''}) - fieldList.push({type:'string',value:'password',text:'登录密码',dictCode:''}) - fieldList.push({type:'string',value:'passwordSalt',text:'登录盐',dictCode:''}) - fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''}) + // fieldList.push({type:'string',value:'nickName',text:'昵称',dictCode:''}) + // fieldList.push({type:'string',value:'headImage',text:'用户头像',dictCode:''}) + // fieldList.push({type:'string',value:'name',text:'真实姓名',dictCode:''}) + // fieldList.push({type:'string',value:'phone',text:'手机号码',dictCode:''}) + fieldList.push({type:'string',value:'account',text:'登录账号(手机号码)',dictCode:''}) + // fieldList.push({type:'string',value:'password',text:'登录密码',dictCode:''}) + // fieldList.push({type:'string',value:'passwordSalt',text:'登录盐',dictCode:''}) + // fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''}) this.superFieldList = fieldList } } diff --git a/admin-hanhai-vue/src/views/subSchool/ShcoolSubList.vue b/admin-hanhai-vue/src/views/subSchool/ShcoolSubList.vue new file mode 100644 index 0000000..f77dc14 --- /dev/null +++ b/admin-hanhai-vue/src/views/subSchool/ShcoolSubList.vue @@ -0,0 +1,344 @@ + + + + \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubForm.vue b/admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubForm.vue new file mode 100644 index 0000000..99d83df --- /dev/null +++ b/admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubForm.vue @@ -0,0 +1,184 @@ + + + \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubModal.Style#Drawer.vue b/admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubModal.Style#Drawer.vue new file mode 100644 index 0000000..a540798 --- /dev/null +++ b/admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubModal.vue b/admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubModal.vue new file mode 100644 index 0000000..2b0b22e --- /dev/null +++ b/admin-hanhai-vue/src/views/subSchool/modules/ShcoolSubModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java index 40bf3b1..b5704f0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java @@ -54,7 +54,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; public class HanHaiMemberController extends JeecgController { @Autowired private IHanHaiMemberService hanHaiMemberService; - + /** * 分页列表查询 * @@ -135,7 +135,7 @@ public class HanHaiMemberController extends JeecgController { @Autowired private IShcoolSubService shcoolSubService; - + @Autowired + private IHanHaiMemberService hanHaiMemberService; + @Autowired + private ISchoolOrderLogService schoolOrderLogService; + /** * 分页列表查询 * @@ -71,7 +84,7 @@ public class ShcoolSubController extends JeecgController pageList = shcoolSubService.page(page, queryWrapper); return Result.OK(pageList); } - + /** * 添加 * @@ -85,21 +98,48 @@ public class ShcoolSubController extends JeecgController edit(@RequestBody ShcoolSub shcoolSub) { - shcoolSubService.updateById(shcoolSub); - return Result.OK("编辑成功!"); - } - + + /** + * 编辑 + * + * @param shcoolSub + * @return + */ + @AutoLog(value = "报修表-编辑") + @ApiOperation(value="报修表-编辑", notes="报修表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody ShcoolSub shcoolSub) { + ShcoolSub byId1 = shcoolSubService.getById(shcoolSub.getId()); + //查看订单状态是否已完成 + if(byId1.getState().equals("1")){ + return Result.error("订单订单已结单，不能修改"); + } + + if(StringUtils.isNotBlank(shcoolSub.getGiveAccount())){ + //增加转单记录 + //根据标识查询转单师傅信息 + HanHaiMember byId = hanHaiMemberService.getById(shcoolSub.getGiveAccount()); + SchoolOrderLog schoolOrderLog = new SchoolOrderLog(); + + schoolOrderLog.setOrderNo(shcoolSub.getOrderNo()); + schoolOrderLog.setType("0"); + schoolOrderLog.setGiveUser(shcoolSub.getGiveAccount()); + schoolOrderLog.setOrderId(shcoolSub.getId()); + schoolOrderLog.setCreateTime(new Date()); + schoolOrderLog.setCentext("后台员转单给:"+byId.getName()); + schoolOrderLog.setUserId(shcoolSub.getUserId()); + schoolOrderLogService.save(schoolOrderLog); + + } + shcoolSub.setCleckState("0"); + shcoolSub.setReturnValue(""); + shcoolSub.setSuccessPrice(BigDecimal.ZERO); + shcoolSub.setSuccessTitle(""); + shcoolSub.setSucessText(""); + shcoolSub.setSuccessImage(""); + shcoolSubService.updateById(shcoolSub); + return Result.OK("编辑成功!"); + } /** * 通过id删除 * @@ -113,7 +153,7 @@ public class ShcoolSubController extends JeecgController { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java index 0513532..0451fc9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/IShcoolSubService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 报修表 * @Author: jeecg-boot - * @Date: 2024-09-03 + * @Date: 2024-09-29 * @Version: V1.0 */ public interface IShcoolSubService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java index a7dfa95..d8dc726 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/service/impl/ShcoolSubServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 报修表 * @Author: jeecg-boot - * @Date: 2024-09-03 + * @Date: 2024-09-29 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue index 40ebfa6..9b83b3c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/ShcoolSubList.vue @@ -4,6 +4,58 @@
+ + + + + + + + + + + + + + 查询 + 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + + +
@@ -122,11 +174,25 @@ return parseInt(index)+1; } }, + { + title:'创建日期', + align:"center", + sorter: true, + dataIndex: 'createTime', + customRender:function (text) { + return !text?"":(text.length>10?text.substr(0,10):text) + } + }, { title:'楼栋', align:"center", dataIndex: 'building' }, + { + title:'工单号', + align:"center", + dataIndex: 'orderNo' + }, { title:'室号', align:"center", @@ -166,18 +232,23 @@ { title:'状态', align:"center", - dataIndex: 'state' + dataIndex: 'state_dictText' }, { title:'结单/驳回', align:"center", - dataIndex: 'cleckState' + dataIndex: 'cleckState_dictText' }, { title:'驳回原因', align:"center", dataIndex: 'returnValue' }, + { + title:'填单日期', + align:"center", + dataIndex: 'startTime' + }, { title:'结单结果', align:"center", @@ -204,6 +275,11 @@ align:"center", dataIndex: 'giveAccount_dictText' }, + { + title:'结单日期', + align:"center", + dataIndex: 'endTime' + }, { title: '操作', dataIndex: 'action', @@ -219,7 +295,7 @@ deleteBatch: "/shcoolSub/shcoolSub/deleteBatch", exportXlsUrl: "/shcoolSub/shcoolSub/exportXls", importExcelUrl: "shcoolSub/shcoolSub/importExcel", - + }, dictOptions:{}, superFieldList:[], @@ -238,22 +314,26 @@ }, getSuperFieldList(){ let fieldList=[]; + fieldList.push({type:'date',value:'createTime',text:'创建日期'}) fieldList.push({type:'string',value:'building',text:'楼栋',dictCode:''}) + fieldList.push({type:'string',value:'orderNo',text:'工单号',dictCode:''}) fieldList.push({type:'string',value:'room',text:'室号',dictCode:''}) fieldList.push({type:'string',value:'project',text:'项目',dictCode:''}) fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''}) fieldList.push({type:'string',value:'context',text:'简介',dictCode:''}) fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''}) fieldList.push({type:'string',value:'image',text:'照片',dictCode:''}) - fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'account', dictCode:'id'}) - fieldList.push({type:'string',value:'state',text:'状态',dictCode:''}) - fieldList.push({type:'string',value:'cleckState',text:'结单/驳回',dictCode:''}) + fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) + fieldList.push({type:'string',value:'state',text:'状态',dictCode:'sch_order_state'}) + fieldList.push({type:'string',value:'cleckState',text:'结单/驳回',dictCode:'sch_pay_state'}) fieldList.push({type:'string',value:'returnValue',text:'驳回原因',dictCode:''}) + fieldList.push({type:'datetime',value:'startTime',text:'填单日期'}) fieldList.push({type:'string',value:'successTitle',text:'结单结果',dictCode:''}) fieldList.push({type:'BigDecimal',value:'successPrice',text:'结单金额',dictCode:''}) fieldList.push({type:'string',value:'sucessText',text:'处理说明',dictCode:''}) fieldList.push({type:'string',value:'successImage',text:'照片',dictCode:''}) - fieldList.push({type:'sel_search',value:'giveAccount',text:'分配维修员',dictTable:"han_hai_member", dictText:'account', dictCode:'id'}) + fieldList.push({type:'sel_search',value:'giveAccount',text:'分配维修员',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) + fieldList.push({type:'datetime',value:'endTime',text:'结单日期'}) this.superFieldList = fieldList } } @@ -261,4 +341,4 @@ \ No newline at end of file + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubForm.vue index c92b83b..45e7c9f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue/modules/ShcoolSubForm.vue @@ -8,6 +8,11 @@ + + + + + @@ -40,37 +45,32 @@ - - - - - - + - - + + - - + + - + - + - + @@ -80,7 +80,12 @@ - + + + + + + @@ -171,9 +176,9 @@ that.confirmLoading = false; }) } - + }) }, } } - \ No newline at end of file + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts index f5c41ac..0ce3408 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/shcoolSub/vue3/ShcoolSub.data.ts @@ -5,10 +5,24 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { + title: '创建日期', + align:"center", + sorter: true, + dataIndex: 'createTime', + customRender:({text}) =>{ + return !text?"":(text.length>10?text.substr(0,10):text) + }, + }, + { title: '楼栋', align:"center", dataIndex: 'building' }, + { + title: '工单号', + align:"center", + dataIndex: 'orderNo' + }, { title: '室号', align:"center", @@ -48,18 +62,23 @@ export const columns: BasicColumn[] = [ { title: '状态', align:"center", - dataIndex: 'state' + dataIndex: 'state_dictText' }, { title: '结单/驳回', align:"center", - dataIndex: 'cleckState' + dataIndex: 'cleckState_dictText' }, { title: '驳回原因', align:"center", dataIndex: 'returnValue' }, + { + title: '填单日期', + align:"center", + dataIndex: 'startTime' + }, { title: '结单结果', align:"center", @@ -86,9 +105,71 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'giveAccount_dictText' }, + { + title: '结单日期', + align:"center", + dataIndex: 'endTime' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ + { + label: "楼栋", + field: "building", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "室号", + field: "room", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "项目", + field: "project", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "姓名", + field: "name", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "电话", + field: "phone", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "状态", + field: "state", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"sch_order_state" + }, + colProps: {span: 6}, + }, + { + label: "结单/驳回", + field: "cleckState", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"sch_pay_state" + }, + colProps: {span: 6}, + }, + { + label: "分配维修员", + field: "giveAccount", + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + colProps: {span: 6}, + }, ]; //表单数据 export const formSchema: FormSchema[] = [ @@ -97,6 +178,11 @@ export const formSchema: FormSchema[] = [ field: 'building', component: 'Input', }, + { + label: '工单号', + field: 'orderNo', + component: 'Input', + }, { label: '室号', field: 'room', @@ -134,38 +220,39 @@ export const formSchema: FormSchema[] = [ field: 'userId', component: 'JSearchSelect', componentProps:{ - dict:"han_hai_member,account,id" + dict:"han_hai_member,nick_name,id" }, - }, - { - label: '状态', - field: 'state', - component: 'Input', - }, - { - label: '结单/驳回', - field: 'cleckState', - component: 'Input', + dynamicDisabled:true }, { label: '驳回原因', field: 'returnValue', + component: 'InputTextArea',//TODO 注意string转换问题 + dynamicDisabled:true + }, + { + label: '填单日期', + field: 'startTime', component: 'Input', + dynamicDisabled:true }, { label: '结单结果', field: 'successTitle', component: 'Input', + dynamicDisabled:true }, { label: '结单金额', field: 'successPrice', component: 'InputNumber', + dynamicDisabled:true }, { label: '处理说明', field: 'sucessText', - component: 'Input', + component: 'InputTextArea',//TODO 注意string转换问题 + dynamicDisabled:true }, { label: '照片', @@ -179,7 +266,13 @@ export const formSchema: FormSchema[] = [ field: 'giveAccount', component: 'JSearchSelect', componentProps:{ - dict:"han_hai_member,account,id" + dict:"han_hai_member,nick_name,id" }, }, + { + label: '结单日期', + field: 'endTime', + component: 'Input', + dynamicDisabled:true + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.class index abf6d337950e5dacdd4baa171af7acc71854df9e..8f615968d96792d104cfb62ad9d8cb8189678843 100644 GIT binary patch delta 3431 zcmdT{d3;pW75>glX5O1OH_NZt*u2V)!NqDVr$nRc1!IdVv%~zdy^r>@`ryqzu&v(+4ZMwi82BgtCHDW8<{ce(h&&@pzpLY{Ec2dp{-fiZ z$oF-e*YRJ2KxB}M+&oArI(bBTb<%VkZ7#%IuCgZyHwbV?POX7Fq2(q!lqFvxU9 zGIa{dV3tnVA}`a?D>6r?kVd&W4KPqe12xJsD4z;AJyfVsQO7(A>YiT0iec6(s=TA! z=kd~@jz`ni)3o`h)u>p}U@FmQh@zo1jNorv8*ONd*0(h^M>V=!QJAs`sST~ItDt3JdH*vET_>Ll_?rS<%-5qwxV$Y zcD$kqG|@T{$kQibyP{MIS#JmO+*hy+n0f9iS&n8onPm;jt7wX~#>^fxHG{I#J;=Q&zk2Fveq^lK8rx}D<2|$K*!VG&W=o&(qMcy)NL}qThQqfGR(&$=+O*BhUHO*Eu zN1E%Txt?kW>8H95^=xiGwP{Pw=7)O^-^tJg;9QwYee>{rr;pt0%oQn`M>p_b&!+ab zw(U*~^6r&tG)U2nG+(1yMGL4-(L!28$h4lz%yQpEi>;HHx#dsN%?eLby+%tEHBd;= zEi{5)EQ_{HYiw*;x4KPHBh@Hc$~mPdg$Uz0wtVY}P$);ETNN#nF^}xZ21U!IGsLPH z5VYp4auy1#NLI0bm7-=^t#CbRI_k3CaBD5pN|@;s$J)?q z>HlU>p{*u6Txb6pL^ZOTuE@%)JHHlH#G( z{=$(|XY~{o#Km$hlOL!^Sc+DUCHC7DXuvIuL&h3elk%v*Qbdu$>rcR~SjIj_Aq&gV z#K@-bvjQujVHH~zvb|%~oU~e~Hu^-2{d_WpJ1+DarT;10BJQMs^dc+=CKqVl4$T&+tuZm~ z!IzW7_==qbjZaT(VLya>oiMG9L(1Y2iKR3Vi_4BBm-zr3&s*|E4U1-!fucsz!!eT?2JjNS^19XO2sD!#S|t|;!q z{n9*eaU9#Q-PtZw@jG%d1rj?nT%sEBKT#RB!Abb>x*bKf-H!*7VFa*)!BZdP9qi7@ z^@A7ZdS@Tvoq~8L9!jSAVH;vVQk^(~cA$MB*976~Nw75>ynqcc*tkDpj_ky!Zj3&F zGC@7&|DZn28GWlC>QEAN2)p`&-gRlvyZb=z7SOvBpyP6Ke&a)^clDuuG>Lj0W0oU7 zFOlMM7rukS*`>$eGskwr+{;CjdVvt8T_o=y4QF8DUF6_BI{>){*hyaiaaNtQryp{^7Mo3?}N-0w1+P}xlsKH#6nM>i-%!TRBq-pHn8|{D*2nNJ&kX1PGspy zmXZZuI1=ZjyD;J6g#-N-_9YkgB^UN#FP>qj{T3D%PQC846O>~E=%Z4HP>F07Wf*uC z`*~KNL|$Sff@Mp%6BDallOvs&^c438@(k8{wqC?~g?WvwXR%&s&a`#kL2zLZ)6LJ!%@$X-uaxtu)dLZ=x9l_w2elf1|&l zy1v}!-&nVGMaou`>c~k-Uo=Jo@;V<1O~PES(n9 z5*7|LwViD}5E2q7PoWH*meMkXZq;cy-KNtDT1oH(xA&cW*nHpPURptwgrwk;hl1OW z4>WZSywo?)zdQI?XK+`Cj)SyH$BR^@(Cs?iLCHF;rd)!y!RIfosj1sq>(^-wmFsjT z$DgVxnNYwV#%rF4jxoEv-Xw+A>Qp2082O6#>$HvoxGga^&L_LAmp6&o*34vm zTkGzK*5-)T7S^f_uv$Vi+XGty+W_wl)bZm$y%m5o=I-IAp%IPn%dnNPHB^BbaWC#; z%`wqD5Wd1n_c!uBUv0$KhUV2W|GK5|4LbzPpJy22w3#|;0Y_r}s4sgYzWK!>5%|1F zygT~K9*GCOSR}ULTT&LBKoy*>F_I_k=DF*hNY8m0vAKO1%avt}>qT}azlyS|Y!N(W z`Y~N zwt^86FWo@Tl#Z`PA6S zf$`!;PRI|tTcmOkfX{phRBr2hR=b z@Xvq7gGks9;spjEr{R3g4uKMzlbdH`8u>k#BIxZbx6VY09)>tJf;bk3_$&*^p&1*3 zEEVW-upCwu$`L$*!`H%(oviK5y@(%jOvH34Q!(wbO!r{w)rQ@}47(zRU6x_7>q18W zFEQ3(hC5hpXK1Gtp%e>1xLOWNwUAXPZVf*|7rzxK?=TR7(wx(cf`yKv+-?-M^E{0o zy3qFe1*QqP#)u2!V1z1 zMvhmVYi+soCJ2zdeO)49O$=#H$qeiOdCin+daPxvc@`k4|fFK5O=D!l7TLJ(8 diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/controller/ShcoolSubController.class index d238bf8fe22698f35722550ea1f58e57873f381d..c280c16cf6a068ed9353dbe30b07140dcb94f7b1 100644 GIT binary patch literal 9398 zcmd5?d3aRS6+buIOeQaZM7F3Xi)dIMYH%TlCal2#k+3MV)|Z(_@?bJA%zFdGx*%2s z1jQ;URt2}Z7O6@WK(wvZYB#&ueX%BnZg$^X+TVHGyqQckKL04+m$%$^?m54++;h*l z!y6wRK1M|4VsVHTQhNb)(BTjrp`!tMF+|7cr4Z%N%lR~qzEnV8rmuwP75XYay&9y~ z_~mOM8bYu0$QuFrI=_4)NLPpGoAj+9eVZxXK^gF))KA-+Tf8?k4`0^*d{FyI*Vf23u(%<<0_aOZvNdII7{uQEs z(|>sI{UCi1qz{91h^_PyU;Y~q6cR#YL72!6h#W!LQN2M>NsS(Fkd5ft@^x~J-q4`N zD+CQS8pFCCtxMF`squ|kSQT`>MYm2>!wqti9!W%1L-wd-!zPof>(VBIS?RJw%+#9H zm71Z|N7c$$Og9x%(_@C93vB7laV^%cHm)?OoAmg4xn5ObhP+k@n|i!OR=f#vWx~`q zX>m0IwkI_zv4x7ZSZ%6T;~vb5GQji`CXp`eIUQVw8{tN1zBC?D<1mNEw=x6YRMI5p zx=bvx| zWy0awTn_6oGp+xV%2QaBee=AH&cyc3Fp^o4e(qd z4wrxU|GfVCh{un^IPC5THJUCPn-t!6e2LzWE1R{YSX)+rgD!WY5>3Efr*`dl?46em zbU*aO)Xr@;AAjgj=eB$B(zWlg?q?qc8MYP`CN8&9g^{+cY*OpxdMy_536dA6=3=a3 zY(FeTj#^o9TqOMhtpJie;ENLMX5!BTj8Yg zNu`n9M3_=GfLAUfL0A;lnM!y)!qh4SP`0L6?cJkycOSdM6*Q2TchvUBy{&p4QWTPv zTkH*nmo*WXvujr@hYf3&*5Q^HQL)`4*2~L!#>xO9HcJDRlAcoqEj$5+y~OLNWB?xD za$omLw`h^hZTpY!eRMEpm}@DTv}izfRS%-HNN~xTjlM+)DzHCPDQ374=F%caS0j=T zy0&*5zvXrpfaI`osPnDrp~{L+tmb4b<}APdOnL(QR|f02$u?vcGd7%jb#t>GH!qJu zottcE{TEWcOfi6h&ekqdP;&Rdh2~-u)X~aVWTmEVLM#T@^e8mZ`N%$a1zHnBowqrx zMg?scFjzKsUpg7hXlc}eRJDi+n^;i)(jB&f%>HRDb?u7$V?a7<66bSCPO(>TRygXk zG5dY~b27crVwftI!iH7#y3NQUZX1)0$ROj;C#GkZu{ZkiebgaflVd6kT)BDcba3g`Fq682+c1CQ?DlRF)zR{R$dyE%2n0k>68Rz| zXy%Ex1OZVX2}u-!vnZ12QmP4vArh%#Xh0N8qC}h|iD6?;QB}%cS^ASPX7Utsib}x585+{q10da~XPG#n2bRT%QbJrgG+S&HpyGQQC z>w8CczSF*|`^Fbh%yr$>A&Jo}@id-zx+KPku@Wt%+JG1*=$xLy``d>Fo!4{HKsH@T zjAy0K5EBH6>5@28OpwG`d@19hA}ix2Of4$URZLY96U8J!Bh&M6RYHs6_yB!p=kD7& zZ$H?1$GzPzJ_D`aJ+gPEBqoa~l9g(+SPo7hngViH3t>EhH0qmxjr76{A_bY?Tp$*;c6;ZjmJ6Mia@?V+o)EC!#WOB z1&wEmD9uW^k@s3YJ~QmVvstV_n!@yuW-QUoDj;5;rl4CiLcxlpaospc$+6xh>+g1; zp?x$Q0y68sl+W5ihVP}uZ%|iWrtLhX_3^fplu@`T0N%@SHiar0Pi%}8K<1OlPAbHw zIdK(sU5-O%L5my=UfNEn&|Gx~vO54l9-sKdAZ2Ps&C=cI>;w!QHdIU)<9-X<$9?)TJ2A^N(ebs2X1HL|aux>>0#(>D=v5-2o_6 z1c=L2oMOeC1B_vo@=c1_C|79>bJeicq@cdeSv_yrQnWbs3P}45K10B#E)fo^hEW^0 zercHRz)Pp~uVc?`E+Q{x+<{cq%QcfLK(+*gLDq81=04%oP1YG~DAA0AQPp0~p}5+l zZ**Qt9aufqHYW%i_VU@mS(z-m#<%#LHQ=szD<&)Bais+-HBT|@)7uGU{wZD-v+Qfl zU^3`ekc5ZnE;-@WGBzc<+{(f%n66^7rVe%}6>6*Lw<;VndipM&4? zP}ATkiwkZNv>4BMxG%BBP}KGqL&cXi7Q#Ea0bEyLmW(?}LCT%fM&gSWo0YgSQ=*x) z3RlS{pv&nBya`%OYbe*6{1)hf7@IMJ;4YX7KK}^gh7FGhy2sjIYYYdRdV9tV<*~}fm5JR7!Pg-DR(3SKl zSb@i`!V@2V%pis8!KskSC`=JR97DrNrL_Pl56#XdBj$FepJAK{Tma#$>K|K{fNjB05dxB@AV#i3V zLawk>uwh?k!JYu!uVOhRQ0&9}T#R*F2wSPJ zgNm}~Wg4;=E+1M_+)5>TDZk{Tb{ckYaw`pQrxAN;D~Lz(TL+C|;?gBY=;SNf=#-f` zr8yWswUtJ%D$OZ5t(8v4ohe&sjQv#DN@MYKgvMdQ_*Oc@dYOQiGfU2Dr7{HBMBG|w zQY%firvS;+RS-Fiqf&+mCo|{ixSicf=d7Ci9G%-r<@W0g`*xmvJD;bq;V)prU+5U# zj?&dIHNj-XaP??1XgrKGm0D;vyt;s{L2q>}7RYsQ%k_w#Ef~Fl?xwA@A2xi3Zl>qy z7CKDZ@C*8OdYyLAn{+F^MLX$j+GRPi9Cn?J5W5Mq+2E*xew(#2x;^K1JI*b}%Qtmg{%)~e1L9!9}{}a zeT;dZ5A*&Wm>+a8KjdLf05K=E(M~+NYwR_wtx8^7Q!-@GLsUdqf7C{!@LyLrIdG-} z6A%ArvTa_3|LMWG)Q+DZi4SNL;-{xC9!}47kFYwA_;TH&J=F1B@ECm_@_Co3M%XZt zf=QF7lng1UYNI*HjArjOulN8Lcz_G&aU^xYQyst@-}zY>CM&ls#=QsxyYOcR@e_D@ zlAglKVaW?{XUX}N7*3cM%=n zMI`L?6QpOoopvm!_+Ng>ymp%ZJT2heR#-XRw!nn|YO_5^_D=kq#r`ymKM%?mtTlQF KE+(J4ZT|y6v??$F delta 2094 zcmbW1+h0^w6vuz(;B@A42AJWF47VZzCZPf`?Oq62R0wH6Wdlrv5b6w?+2v$eA&F>5 zEQ^xN%|1eWM`RTn+pVr!EW|$A@OAqJlwfA0ot?yoYtu@&=vrIex z&&(WvYW!wJAzraz2s^D9#;Xc;Suuj$RxHA(1upEdVJ}{@LdQOq#?08ylh=9jh8YKV zeAA4#%ow-gZMTLwK{eNCQ?t)9+)FIkb$tp~CSg5~y;Nol3HM!}~ljw7Jpgo=|0 z>K9XQ(Qrz|XP8t`iYXOW;wl9p6*pp9!HkO2m{oBGa}rV_Q>Vkj6Oo}k;o*Z9XSeg7 zN5$v7Xa9Y6{~vREjlCijU*Ie)hKDBpJa9O=C_!>7_)^7J_*%g?D!#=z72iSnUT;pz zG^;p|A0)W-fXQ7hAtN$=EV6ShJQN5YpAOILi;M*#BLx2=yBx$%Dz@Th3Cl@6PcKNy zPgU@XieGU-MG=Z6)as)twLyD&udI7=mpW3{d$xEg`#l3al`Vt5-hm!{EccK;mRV~t zd40YOJ_)<@3(3WLRk|s-Zt)7K(naA0WaP3rAyHr;p@ifsXuO(6D~%LX`j_c{ow7HELD+3 zwpD}caRX7YR83NnkZQ1$EZK>q7R$&(Au{OsmJ??seJgMi6x>Xjg`{t2(WA%IZjGzm zMryZ{nqv|919{?XXHUQ#^vSqW+&+(_yXdR)6LvlS8i=i~1Ck$&SVfv8d@TuglhQqY zveV?pz4P;Gp4;yeD)*yVL`2Ik77?-15#RyXutr28Q_LOlNI0UAU`&%FFb%ZT07JN%UJ774nYmjq6~gC z1F?$`yZ;Yj^*mx*46%(7wKlYq3nPvlc&G!i7Z2kR{;gYx{3tvew@VPGFmdW7h&K_j z?=r-l=z=DR$ET=vl363F-3z1YjUjs(*^9^GQSA|k4vuQ{-8=DkJ9=rpJ`USVm*?>2 zi10cclW>NRHjQ+G)|?rapw^Iv=M$)N;;E2>KBA68_gx;kKL*{;(ESO}Pb5HVL`K=# z7o#4CQ*WjnE;Ls(DKcehZ&^+5bFetGL&yoZL$GjyB#8tus(J*;*i98aifroW+zq(; z$VmJGE($bXAQ>r~)$D%*DVQPsjcf%Q|N9)97S^ASFXT(8KYzl7jQhl2VGx@Mz(^UB zK(UoqxSd(f+$k(3diFoxz{V4hZE<89wot2)h|(qsQ5K9AnU*1nk-K9uDYVmPWb%_F zZN*d6pV)OhjT{Awa6N^*`MT1$s{%(899!a!Epf*dY{S!p${ir;cpHgEzCI%Ylq~>a zrSvS9l4Mko8P6H*nobl6cVxur3L!s;hJq8cDka3Aick%^8s#9@|8`+NpVnU>%@;+> N+kuy8Z~nqB{|kwnIUfK3 diff --git a/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/entity/ShcoolSub.class b/jeecg-boot-base/jeecg-boot-base-core/target/classes/org/jeecg/modules/shcoolSub/entity/ShcoolSub.class index c493e68c8baa594e101b6b8ca52fc5e60f3cda11..c1276438d70984274426617335c5e18e08d1d1e0 100644 GIT binary patch literal 15212 zcmd^Fd7MAAtMYT10-q^YBHX8Q(tE%_Q~2W_`z@A_%>tg68^ZKt>KG&Y!zQj#S$u(Qn8GR&r#7q#Z^=+r(y*a zom8x(;%X{ZQE?3wtEuRsVht5*saQwF=c)Jt71vU69TnGm`4|1HkuTEum+1LrKaA^j zegi$jI^RIg2zk179;M2SI`5%pug+ui+^F+S^z74lKRx3*PtbEf=Qq(asq+*)(>l-4 zbF&wTXlXLJ#W|f9rV0Y=iBLdm(K5|=RG>#LC>8!-$l>eI=`2m z_v!q8dOo1@J@kA~=MPbT_j>t0sy|G_yPt{!UjB%eALOhu6-~y%ee0shR4fr++p(B4 zeidhBixTlvIvh{03-@KBZcGmS$2rqt-JDgg*cjd%4)ulOJ)y32G8XTd!i0UIjcg08NPWh>XyOSG(rB|@n!;hvsoGN+AHXu&|NGtnLGTa`=< zM3d=l(789$OLFEp{o1Ls2VUe%k0hhvbadf1#2nmxc<|I4r{8#kGru&i!AoM`!19Ix&!lg`!&{ z(Z1Y%EFlBluq2MYVqk}kzB%;F{dmnSvF>!QXZ|#mPt2Q0c1M#d6Ex5#j}Gp6WbmPr zkR=m|e#i!2d`{H81Ifh3Xe15O*(0wHAI21U29NC@+`9)O7D>d@(XHege(}!Jr>K>I zUNNYi;RCOpIsPOJvHoxm^<#L)vEh4n0c4Q&9T?ca@PX%tcAp%2X4jeHJJE^mSR^gd zkhAjMaD07lIJUk&+P@*1L`!h45iR-RvB;+N^4-X~2nj_gN0TImCxmqGrXN*&;ZyrDI-#>)`_|y$r?5VW zJ`mn!kxP@&bS4=Ws}*l0X@d_wJ$U#TycHrQ(`t4Hk9-4xtl15uGLc9$m0A-^_n|uh z*$m2|r=CDnc~>Q45qRrl$|HGuLknX)i=z>YD^0VKo!zzX?6VkdKV%eBj8$OpxqF89 z?mTn+m7zx;%!cfcGg8_U+ZxI>&+w^NPQUfy;J!yO=Fxb!>bUHh z)p5@iv3M+fC17cVNS#VR2)HZ!?C$h=alIWl7tmrFw@j$9N3)!_R8 z*Q$j;W-HeK7vtp1lf_1iEGb3&oLRMNa*F1wRi|Mo%Z?tpx``^rlR>53^jGn>|-= zpw%>|^ z&JI{9hah(ktdcF{9lPa%hQRi!kfa<-m89gYlxoGwGv*Q10?H>UqkMtf6IZ=Jt|>2? zS|j<|;Uog9DN)?vL?h9s@LaD-*C!5}S&`xD{P-di;K<*TyFgG>a#wT*}&O^ zPx^d$Yj-2!2K zi>!gRCOg?-`wqQk1#CGv5A%14nl+2mhxvQ#_e5ja6#(P!=X1qEfcg8X4>{`r*0;%u zF;vR}mUpNJyd}U+ldCQJP4>wbzyKf1h5~F51s})9BgM0cBM*Mu{e=lXE_8_>PGUFH zcLg@B@W252fFA*JFB0mBrFbgGjc{O1D#t|TVlh}Yrr0Ld zmty@a4vzqepMV$3cVwWO;J}hDI#3FHtbWBeP|M)|%_+8pZC%W^S^e7rBld@pv|ICN zw}OTpWF+nOJlgG`VUHO}yEBh=C-uaMwmpxw9W?AyBct7&N4py|>|`TpJMw5dK*L@) zlC~?4whJ`uhKe=^6P96a8n=5T?YmYU)il;k@aU?s4J%!>~j$$0% z4q|Vic($V$=e&bhFBH#p6ysLlAodlC7dVP>fp8G}3&l$u#kg)bh)WB_9gbq$OdQ04 zLUE^~7}ppFaap1G8b>kiJPzXWLh)KhG44kW;)+7?b&g_OrX0kTh2r&&VqCf$#8rjj zZbvchW)9-&LUFI77?(H)@u)&^pQ9L8JqK}3p?JVij0>TIxVBK7b`;~{=pe2u6mNAD z<9g{Jt}hhd>L|u7)Ir=(DBkWU#)Z{EY!r%jIEw#({UOc>+PCN6sp09J+WIQfrWVTO zwolhWP}H_hNM0F#0IQp$Qi-nok#kH}(J|!}Q^kymm_KBHjH|_newGv+Q{GNh%pSy~ zTQ2oB|Dwv-pE&p4U35$GUaMLf5N-UabMHMx$COuM6*KuUz5g@k-g}E~NnWN^OKH*j zKX;C)7addHyj9FwM9jZ%j_E5pro5)Bn74_TKXQ)gFFK~Y)2oR=1-hsmKPmUeut=-J4MXDc8*z5 zbWHitqGIkAG5^LnW@XVa<@bwd!9J9XYnDX;Z#XKTn{=zwCL(wtix1fsotcdyd&hu^*9aDZ5s+iA- znE1gi*x0Ej*f>0@$4lHqc!I!qMF7a%_ro?jyUm@{a z!dFT>kMMkn7f|08O1y~dizQw{_N5XpBm3th?jU@X#LEeV}s{x*~ZE zJ%`k6`ao(n{f3W7ens*b{v6U|vlOJsX22*VQb3V_a!4&^8AvT=xlu->az!dL%5zAq zW(7#CW~EUx^0=)hSY~QI|uSY1V@@(`+#6iPWG-^+rPuX_je#G|Ox>3?elul3_IFkS;Sv zgLIiW#u!bcF^V+Wz?!n>ZnilVq}k>;V=R%zDbiR2E6yg(F~@^6$80jj6RAm&#v53Q zHfgRo0i?O+L}LPxCMwbd18dYK%`+!~G|vnglZX^lq)7(WuuWQEHiNXlyvS%K(nX5Y zY+!NQq($arkQSL!jLAfrqDYesta_WY#B2d+i8>prr zv8k>;_K!d%Y?YbOqV3fONLciOgR z19lFmfxpgwhJ)b@Gx%HlC!7N{@}Kk9xCS(upXT4>E}$`*i|^+pKw~u@-^1NN0W?K>pS{W}fm*a-cAQrMO?7$LUS18<>I$&?_$Z(@S1a4Z zYk=BaGgy?@0!?$RVoP})P{_58&FA$%(_I-hfj0onaNUCUGk`AUjW`*r*>bP`0W0_N z(I2upFCT+HI{%P0Na*{22${M}4C69ULVpt`4>>j)i-UeOaMS5VYf39zQ{r!%K(N*n z&{>Q$w<4aU>k0jh8cg^Jplmflj7FRXD(75LGFKdqV=CwLVoT5~TaPg>t`uE2kiE$) zA%{_-JUShi(lya^3m48xA<_-Ec~jR;miiHQTHdu1ed5V_B-^m{r1s6IrRMEZ1DKTDYoh7tU#^ znrDs@E*#NHHOg`=Fl&UX#&+T0ma0W&t#IMYR;pUdwZyCwt~%R=lU%Bnnf1bjLtLrq zEmw!xAY2W$3rD+DEjJC}!l|xQhUMxs8-=UUcHyjtYK-Gyfvrg7sY+~@b}w(@6OhGj zZ5N*iq%psC7oUV=cVWAW@gPtMyHZ=pn}OWyT5Tr32*|_IS_7X95BU@zoqe7E zg0}$q*!TH6d@7Kiy~khRtw5#hH+&y&0}AjuzL~cJmGK$;dOi)PoUh>Xc?hV2_wZ(1 zPU*0?i~IQupep_(`xU zCMt_=BHPOOX;ed1=hINOt@D)H?mFQB-H@KU-(ABXa=)sV?E0;j@g795gjb7bceK zm~kOGmL0JR7EX1q@d9-(+rtYPQFU_kh3jOtpBFeNy2>;@hd#~t72+>O@vp1+T-;M5 SDSjoNhifXpe7+#X7ycj7XpQIq literal 13115 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 diff --git a/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.class b/jeecg-boot-base/jeecg-boot-base-tools/target/classes/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.class index 0eeaa52f45bad90f6a03919e90411d27985a18fc..4f487ebf10987a0b5fcf75b6634128475214ff52 100644 GIT binary patch delta 67 zcmaEpH6?q)azjSu%_|IrnM4>$85kJ&S%Cy2Lm7|+fyuj!6B(H&%b2VX1j+KUAj=&x GSp@(9UJXb9 delta 28 kcmbP|{U&R}azjR@%_|IrnI>N_PGDr3Y-qA#@*9&C0I5t1b^rhX diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java index 678999a..7522500 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.apiservice.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import org.apache.commons.lang.StringUtils; @@ -16,15 +17,23 @@ import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.pay.MpWxPayService; import org.jeecg.modules.schoolIndex.entity.SchoolIndex; import org.jeecg.modules.schoolIndex.service.ISchoolIndexService; +import org.jeecg.modules.schoolOrderLog.entity.SchoolOrderLog; +import org.jeecg.modules.schoolOrderLog.service.ISchoolOrderLogService; import org.jeecg.modules.shcoolFloor.entity.ShcoolFloor; import org.jeecg.modules.shcoolFloor.service.IShcoolFloorService; import org.jeecg.modules.shcoolSub.entity.ShcoolSub; +import org.jeecg.modules.shcoolSub.mapper.ShcoolSubMapper; import org.jeecg.modules.shcoolSub.service.IShcoolSubService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import javax.transaction.Transactional; import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; @@ -47,6 +56,11 @@ public class IndexApiServiceImpl implements IndexApiService { @Resource private ISchoolIndexService schoolIndexService; + //工单流转明细 + @Resource + private ISchoolOrderLogService schoolOrderLogService; + @Resource + private ShcoolSubMapper shcoolSubMapper; @@ -89,11 +103,38 @@ public class IndexApiServiceImpl implements IndexApiService { @Override public Result addUserSchoolOrder(String token,ShcoolSub bean){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + // 获取当前日期 + LocalDate today = LocalDate.now(); + // 定义一个DateTimeFormatter，用于将日期格式化为YYYYMMDD + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); + // 使用formatter将today格式化为字符串 + String formattedDate = today.format(formatter); + + + LocalDateTime todayStart = LocalDateTime.of(LocalDate.now(), LocalTime.MIN); + LocalDateTime todayEnd = todayStart.plusDays(1).minusNanos(1); // 加上一天然后减去一秒，得到当天的23:59:59.999999999 + + // 使用lambdaQuery()构建查询条件（注意：lambdaQuery()并非MyBatis-Plus的标准API，这里使用LambdaQueryWrapper作为示例） + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.between(ShcoolSub::getCreateTime, todayStart, todayEnd); // 假设getCreateTime是获取创建时间的getter方法 + + // 执行查询并获取数量 + // 注意：这里假设orderMapper有一个selectCount方法，它实际上可能是自定义的或使用MyBatis-Plus提供的工具方法 + Long aLong = shcoolSubMapper.selectCount(queryWrapper); + + String orderNo = formattedDate + (aLong+1); + + + bean.setOrderNo(orderNo); bean.setUserId(hanHaiMember.getId()); bean.setState("0"); bean.setCreateTime(new Date()); + bean.setStartTime(new Date()); + //接单人 + String giveUser = ""; //查看传入的是几楼 + HanHaiMember hanHaiMember1 = new HanHaiMember(); if(StringUtils.isNotBlank(bean.getBuilding())){ ShcoolFloor shcoolFloor = shcoolFloorService.lambdaQuery() .eq(ShcoolFloor::getName,bean.getBuilding()) @@ -101,30 +142,77 @@ public class IndexApiServiceImpl implements IndexApiService { //得到维修账号 if(shcoolFloor!=null){ //根据维修账号查询用户信息 - HanHaiMember hanHaiMember1 = hanHaiMemberService.lambdaQuery() + hanHaiMember1 = hanHaiMemberService.lambdaQuery() .eq(HanHaiMember::getAccount,shcoolFloor.getUserAccount()) .one(); - bean.setGiveAccount(hanHaiMember1.getId()); - } - } - - + //判断是否为空 + if(hanHaiMember1==null){ + return Result.error("该楼栋暂无维修人员"); + } + giveUser = hanHaiMember1.getId(); + bean.setGiveAccount(giveUser); + } + } shcoolSubService.save(bean); + + //增加工单流转明细 + SchoolOrderLog schoolOrderLog = new SchoolOrderLog(); + schoolOrderLog.setOrderId(bean.getId()); + //生成工单号逻辑:// 年月份日期 + 当天的需要到单日期 + schoolOrderLog.setOrderNo(orderNo); + schoolOrderLog.setGiveUser(giveUser); + schoolOrderLog.setType("0"); + schoolOrderLog.setCentext(hanHaiMember.getNickName()+"提交工单"+"=>分配给"+hanHaiMember1.getName()); + schoolOrderLog.setUserId(hanHaiMember.getId()); + schoolOrderLog.setOrderName(bean.getName()); + schoolOrderLog.setCreateTime(new Date()); + schoolOrderLogService.save(schoolOrderLog); return Result.OK("增加成功"); } //驳回 @Override + @Transactional public Result editSchoolOrderError(String token,ShcoolSub bean){ HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); if(StringUtils.isBlank(bean.getId())){ return Result.error("订单标识不能为空"); } + //驳回原因不能为空 + if(StringUtils.isBlank(bean.getReturnValue())){ + return Result.error("驳回原因不能为空"); + } + + //根据标识查询用户信息 + ShcoolSub sub = shcoolSubService.getById(bean.getId()); + + //增加转单记录 + //根据标识查询转单师傅信息 + HanHaiMember byId = hanHaiMemberService.getById(sub.getGiveAccount()); + SchoolOrderLog schoolOrderLog = new SchoolOrderLog(); + + schoolOrderLog.setOrderNo(sub.getOrderNo()); + schoolOrderLog.setType("2"); + schoolOrderLog.setGiveUser(sub.getGiveAccount()); + schoolOrderLog.setOrderId(sub.getId()); + schoolOrderLog.setCreateTime(new Date()); + schoolOrderLog.setCentext(byId.getName()+":驳回订单"); + schoolOrderLog.setUserId(sub.getUserId()); + schoolOrderLogService.save(schoolOrderLog); + + + + bean.setSuccessPrice(BigDecimal.ZERO); + bean.setSuccessTitle(""); + bean.setSucessText(""); + bean.setSuccessImage(""); bean.setCleckState("2"); bean.setGiveAccount("-------"); shcoolSubService.updateById(bean); + + return Result.OK("驳回成功"); } @@ -135,8 +223,14 @@ public class IndexApiServiceImpl implements IndexApiService { if(StringUtils.isBlank(bean.getId())){ return Result.error("订单标识不能为空"); } - bean.setGiveAccount("-----"); + bean.setGiveAccount(""); bean.setCleckState("2"); + + //驳回原因不能为空 + if(StringUtils.isBlank(bean.getReturnValue())){ + return Result.error("驳回原因不能为空"); + } + shcoolSubService.updateById(bean); return Result.OK("驳回成功"); } @@ -150,7 +244,28 @@ public class IndexApiServiceImpl implements IndexApiService { } bean.setCleckState("1"); bean.setState("1"); + bean.setEndTime(new Date()); + bean.setReturnValue(""); shcoolSubService.updateById(bean); + + //根据标识查询用户信息 + ShcoolSub sub = shcoolSubService.getById(bean.getId()); + + //增加转单记录 + //根据标识查询转单师傅信息 + HanHaiMember byId = hanHaiMemberService.getById(sub.getGiveAccount()); + SchoolOrderLog schoolOrderLog = new SchoolOrderLog(); + + schoolOrderLog.setOrderNo(sub.getOrderNo()); + schoolOrderLog.setType("1"); + schoolOrderLog.setGiveUser(sub.getGiveAccount()); + schoolOrderLog.setOrderId(sub.getId()); + schoolOrderLog.setCreateTime(new Date()); + schoolOrderLog.setCentext(byId.getName()+":师傅结单"); + schoolOrderLog.setUserId(sub.getUserId()); + schoolOrderLogService.save(schoolOrderLog); + + return Result.OK("结单成功"); } @@ -163,6 +278,7 @@ public class IndexApiServiceImpl implements IndexApiService { } bean.setCleckState("1"); bean.setState("1"); + bean.setEndTime(new Date()); shcoolSubService.updateById(bean); return Result.OK("结单成功"); } diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 725819f..de21f50 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8003 + port: 8000 tomcat: max-swallow-size: -1 error: