产品管理

.idea/shelf/Uncommitted_changes_before_Update_at_2022-04-19_16_43__Default_Changelist_.xml

@@ -1,4 +0,0 @@
-<changelist name="Uncommitted_changes_before_Update_at_2022-04-19_16_43_[Default_Changelist]" date="1650357829642" recycled="false" toDelete="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022-04-19_16_43_[Default_Changelist]/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before Update at 2022-04-19 16:43 [Default Changelist]" />
-</changelist>

.idea/workspace.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="2e06e18d-7f5e-4cbb-94ca-32a48e9e7e1f" name="Default Changelist" comment="" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <list default="true" id="2e06e18d-7f5e-4cbb-94ca-32a48e9e7e1f" name="Default Changelist" comment="gitignore" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -15,19 +14,6 @@
     <option name="testRunner" value="GRADLE" />
     <option name="delegatedBuild" value="true" />
   </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/fhKeeper/formulahousekeeper/.gitignore">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="437">
-              <caret line="23" selection-start-line="23" selection-end-line="23" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -60,6 +46,7 @@
     <option name="width" value="1190" />
     <option name="height" value="920" />
   </component>
+  <component name="ProjectId" id="2T3aGTVV4p290kiNh3VASlwQynm" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
@@ -91,28 +78,20 @@
       <pane id="Scope" />
     </panes>
   </component>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
   <component name="PropertiesComponent">
     <property name="ASKED_SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/fhKeeper/formulahousekeeper" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="MavenSettings" />
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -125,6 +104,7 @@
       <updated>1577949023712</updated>
       <workItem from="1577949027501" duration="489000" />
       <workItem from="1577949544335" duration="24000" />
+      <workItem from="1690274124261" duration="12000" />
     </task>
     <task id="LOCAL-00001" summary="gitignore">
       <created>1577949176115</created>

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/ProdCategoryController.java

@@ -10,6 +10,7 @@ import com.management.platform.util.HttpRespMsg;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -66,7 +67,7 @@ public class ProdCategoryController {
      * @return
      */
     @RequestMapping("delete")
-    public HttpRespMsg delete(Integer id){
+    public HttpRespMsg delete(@RequestParam Integer id){
         return prodCategoryService.delete(id);
     }
 

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ProdCategoryServiceImpl.java

@@ -56,14 +56,12 @@ public class ProdCategoryServiceImpl extends ServiceImpl<ProdCategoryMapper, Pro
                 new LambdaQueryWrapper<Product>()
                         .eq(id != null, Product::getCategoryId, id)
         );
-        System.out.println(id);
-        System.out.println(count);
         if(count==0){
             prodCategoryMapper.deleteById(id);
         }else{
             msg.setError("category is used");
         }
-        System.out.println(msg.code);
+
         return msg;
     }
 }

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/product/list.vue

@@ -159,7 +159,7 @@
         </el-table>
 
         <!--工具条-->
-        <el-col :span="24" class="toolbar">
+        <el-col :span="24" class="toolbar" v-if="false">
                 <el-button size="small" @click="batchSetWudulistBtn1" v-if="(user.timeType.customDegreeActive || user.company.packageProject) && (showColumnWidth != '0' || permissions.projectManagement)">{{ $t('btn.cancel') }}</el-button>
             <template v-if="user.timeType.customDegreeActive && (showColumnWidth != '0' || permissions.projectManagement)">
                 <el-button size="small" type="primary" @click="batchSetWudulistBtn2(true)">{{ $t('volumeset') }} {{user.timeType.customDegreeName}}</el-button>