Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

project_data/sql/0.0.3/soc/soc.sql

@@ -668,3 +668,23 @@ INSERT INTO sys_config (config_id, config_name, config_key, config_value, config
 DELETE FROM sys_dict_data WHERE dict_type = 'materials_status' and dict_value=2;
 UPDATE sys_dict_data t SET t.dict_label = '已发布' WHERE dict_type = 'materials_status' and dict_value=1;
 UPDATE sys_dict_data t SET t.dict_label = '待发布' WHERE dict_type = 'materials_status' and dict_value=0;
+DELETE FROM sys_menu WHERE id IN(01714200330384744450,01714195109957963777);
+DELETE FROM sys_menu WHERE menu_name IN('导入设备','导出模版');
+INSERT INTO `sys_menu` VALUES (01714200330384744450, '导入设备', 2050, 6, '', NULL, NULL, 1, 0, 'F', '0', '0', 'system:device:importData', '1', '#', NULL, '超级管理员', '2023-09-04 17:46:17', '超级管理员', '2023-09-04 17:47:06', '');
+INSERT INTO `sys_menu` VALUES (01714195109957963777, '导出模版', 2050, 5, '', NULL, NULL, 1, 0, 'F', '0', '0', 'system:device:export', '1', '#', NULL, '超级管理员', '2023-09-04 17:46:17', '超级管理员', '2023-09-04 17:47:06', '');
+DELETE from `sys_role_menu` WHERE `menu_id` in (01714200330384744450,01714195109957963777);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 01714200330384744450);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01714200330384744450);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 01714200330384744450);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 01714200330384744450);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 01714200330384744450);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 01714200330384744450);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 01714200330384744450);
+
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (114, 01714195109957963777);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (115, 01714195109957963777);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (116, 01714195109957963777);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (117, 01714195109957963777);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (118, 01714195109957963777);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (119, 01714195109957963777);
+INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (120, 01714195109957963777);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/resumptionRecord/ResumptionRecordPageVo.java

@@ -87,7 +87,7 @@ public class ResumptionRecordPageVo {
     private Date submitTime;
 
     @ApiModelProperty("隐患数量")
-    @ExcelProperty(value = "隐患数量",index = 9)
+    @ExcelProperty(value = "隐患问题数",index = 9)
     @ColumnWidth(15)
     private Integer abnormalDataNums;
 

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionMapper.xml

@@ -123,7 +123,7 @@
           AND a.ymd_quarter = #{quarter}
     </select>
     <select id="findResumptionApp" resultType="com.xunmei.core.resumption.vo.ResumptionAppVo">
-        select r.id,r.plan_start_time,plan_end_time,r.status,p.plan_name,p.plan_cycle
+        select r.id,r.plan_start_time,plan_end_time,r.status,r.name as plan_name,p.plan_cycle
         from core_resumption r
         inner join core_resumption_plan p on r.plan_id = p.id and p.deleted=0 and p.plan_status=1
         where r.org_id=#{res.orgId}

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionRecordMapper.xml

@@ -387,7 +387,7 @@
         from core_resumption_plan p
         inner join core_resumption_plan_to_role pr on p.id=pr.plan_id
         inner join sys_role r on pr.role_id=r.id
-        where p.plan_status = 1 and plan_create_org_id=plan_of_org_id
+        where plan_create_org_id=plan_of_org_id
         <if test="query.planCycle != null">
             and p.plan_cycle = #{query.planCycle}
         </if>

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeviceController.java

@@ -252,7 +252,7 @@ public class SysDeviceController extends BaseController {
         return success();
     }
 
-    @RequiresPermissions("system:user:export")
+    @RequiresPermissions("system:device:export")
     @PostMapping("/downInChargeOfTemplate")
     public void downInChargeOfTemplate(HttpServletResponse response) throws IOException{
         sysDeviceService.downInChargeOfTemplate(response);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysOrgMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
  */
 @Component
 public interface SysOrgMapper extends BaseMapper<SysOrg> {
-    SysOrg selectByShortName(String name);
+  List<SysOrg>   selectByShortName(String name);
     /**
      * 查询【请填写功能名称】
      *

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -550,7 +550,10 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
 
     @Override
     public SysOrg selectByShortName(String shortName) {
-        SysOrg sysOrg = baseMapper.selectByShortName(shortName);
-        return sysOrg;
+        List<SysOrg> sysOrgs = baseMapper.selectByShortName(shortName);
+        if (!CollectionUtil.isEmpty(sysOrgs)) {
+            return sysOrgs.get(0);
+        }
+        return null;
     }
 }

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -687,6 +687,7 @@
 
     </select>
     <select id="selectByShortName" resultType="com.xunmei.system.api.domain.SysOrg">
-        SELECT * FROM sys_org WHERE short_name=#{name}  AND deleted=0
+            SELECT * FROM sys_org WHERE short_name=#{name}  AND deleted=0
     </select>
+
 </mapper>