Mosher 发布系统代码 [后台服务，演示应用]

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US.ts

@@ -21,6 +21,7 @@ export default {
     stepstatus: "步骤",
     borrower: "借阅人",
     borrowway: "借阅方式",
+    returnlib: "归还图馆",
   },
 	views: {
 		statewizardview: {
@@ -1237,6 +1238,14 @@ export default {
 		},
 	},
 	usr2editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem5: {
+			caption: "Save And Close",
+			tip: "Save And Close Window",
+		},
 	},
 	dashboardviewdashboard_sysportlet2_list_quicktoolbar_toolbar: {
 		deuiaction1: {

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN.ts

@@ -20,6 +20,7 @@ export default {
     stepstatus: "步骤",
     borrower: "借阅人",
     borrowway: "借阅方式",
+    returnlib: "归还图馆",
   },
 	views: {
 		statewizardview: {
@@ -1236,6 +1237,14 @@ export default {
 		},
 	},
 	usr2editviewtoolbar_toolbar: {
+		tbitem3: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem5: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
 	},
 	dashboardviewdashboard_sysportlet2_list_quicktoolbar_toolbar: {
 		deuiaction1: {

app_Web/src/pages/sample/ibizbookusr2-edit-view/ibizbookusr2-edit-view.less

@@ -23,4 +23,5 @@
         
         // this is less
 
+.deepskyblueToolBar {color:white !important;background-color:#108cee !important;}
 

app_Web/src/widgets/ibizbook/book-type-select-treeview/book-type-select-treeview-model.ts

@@ -75,6 +75,9 @@ export default class BookTypeSelectModel {
       {
         name: 'borrowway',
       },
+      {
+        name: 'returnlib',
+      },
     ]
   }
 

app_Web/src/widgets/ibizbook/guide-wizardpanel/guide-wizardpanel-model.ts

@@ -94,6 +94,10 @@ export default class GuideModel {
         name: 'borrowway',
         prop: 'borrowway',
       },
+      {
+        name: 'returnlib',
+        prop: 'returnlib',
+      },
     ]
   }
 

app_Web/src/widgets/ibizbook/main-multieditviewpanel/main-multieditviewpanel-model.ts

@@ -75,6 +75,9 @@ export default class MainModel {
       {
         name: 'borrowway',
       },
+      {
+        name: 'returnlib',
+      },
     ]
   }
 

app_Web/src/widgets/ibizbook/state-guide-wizardpanel/state-guide-wizardpanel-model.ts

@@ -94,6 +94,10 @@ export default class StateGuideModel {
         name: 'borrowway',
         prop: 'borrowway',
       },
+      {
+        name: 'returnlib',
+        prop: 'returnlib',
+      },
     ]
   }
 

demo-core/src/main/java/cn/ibizlab/core/sample/domain/IBIZBOOK.java

@@ -192,6 +192,13 @@ public class IBIZBOOK extends EntityMP implements Serializable {
     @JSONField(name = "borrowway")
     @JsonProperty("borrowway")
     private String borrowway;
+    /**
+     * 归还图馆
+     */
+    @TableField(value = "returnlib")
+    @JSONField(name = "returnlib")
+    @JsonProperty("returnlib")
+    private String returnlib;
 
 
 
@@ -335,6 +342,14 @@ public class IBIZBOOK extends EntityMP implements Serializable {
         this.modify("borrowway", borrowway);
     }
 
+    /**
+     * 设置 [归还图馆]
+     */
+    public void setReturnlib(String returnlib) {
+        this.returnlib = returnlib;
+        this.modify("returnlib", returnlib);
+    }
+
 
     /**
      * 复制当前对象数据到目标对象(粘贴重置)

demo-core/src/main/java/cn/ibizlab/core/sample/filter/IBIZBOOKSearchContext.java

@@ -55,6 +55,13 @@ public class IBIZBOOKSearchContext extends QueryWrapperContext<IBIZBOOK> {
             this.getSearchCond().eq("borrowway", n_borrowway_eq);
         }
     }
+	private String n_returnlib_eq;//[归还图馆]
+	public void setN_returnlib_eq(String n_returnlib_eq) {
+        this.n_returnlib_eq = n_returnlib_eq;
+        if(!ObjectUtils.isEmpty(this.n_returnlib_eq)){
+            this.getSearchCond().eq("returnlib", n_returnlib_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

demo-core/src/main/resources/liquibase/h2_table.xml

@@ -71,6 +71,8 @@
                 </column>
                 <column name="BORROWWAY" remarks="" type="VARCHAR(60)">
                 </column>
+                <column name="RETURNLIB" remarks="" type="VARCHAR(60)">
+                </column>
         </createTable>
     </changeSet>
 

demo-core/src/main/resources/mapper/sample/ibizbook/IBIZBOOKMapper.xml

@@ -5,7 +5,7 @@
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->
 	<select id="selectById"  resultMap="IBIZBOOKResultMap" databaseId="mysql">
-        <![CDATA[select t1.* from (SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`BORROWER`, t1.`BORROWSTATUS`, t1.`BORROWWAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`ICON`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNTIME`, t1.`SAILSTATE`, t1.`STEPSTATUS`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  ) t1 where ibizbookid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`BORROWER`, t1.`BORROWSTATUS`, t1.`BORROWWAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`ICON`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNLIB`, t1.`RETURNTIME`, t1.`SAILSTATE`, t1.`STEPSTATUS`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  ) t1 where ibizbookid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -27,12 +27,12 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-		<![CDATA[ SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`BORROWER`, t1.`BORROWSTATUS`, t1.`BORROWWAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`ICON`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNTIME`, t1.`SAILSTATE`, t1.`STEPSTATUS`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  
+		<![CDATA[ SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`BORROWER`, t1.`BORROWSTATUS`, t1.`BORROWWAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`ICON`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNLIB`, t1.`RETURNTIME`, t1.`SAILSTATE`, t1.`STEPSTATUS`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="mysql">
-		<![CDATA[ SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`BORROWER`, t1.`BORROWSTATUS`, t1.`BORROWWAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`ICON`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNTIME`, t1.`SAILSTATE`, t1.`STEPSTATUS`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  
+		<![CDATA[ SELECT t1.`AUTHOR`, t1.`BOOKNUMBER`, t1.`BORROWER`, t1.`BORROWSTATUS`, t1.`BORROWWAY`, t1.`CREATEDATE`, t1.`CREATEMAN`, t1.`IBIZBOOKID`, t1.`IBIZBOOKNAME`, t1.`ICON`, t1.`LENDOUTTIME`, t1.`PRESS`, t1.`PRICE`, t1.`RETURNLIB`, t1.`RETURNTIME`, t1.`SAILSTATE`, t1.`STEPSTATUS`, t1.`SUBTEXT`, t1.`TYPE`, t1.`UPDATEDATE`, t1.`UPDATEMAN` FROM `T_IBIZBOOK` t1  
 			]]>
     </sql>
 </mapper>

demo-core/src/main/resources/sysmodel/DemoSys.json

@@ -445,6 +445,20 @@
     "key_field":0,
     "show_order":1000,
     "major_field":0
+    },
+    {
+    "fieldname":"RETURNLIB" ,
+    "codename":"Returnlib",
+    "field_logic_name":"归还图馆",
+    "entity_name":"IBIZBOOK",
+    "field_type":"SSCODELIST",
+    "nullable":1,
+    "physical_field":1,
+    "data_type":"VARCHAR",
+    "data_length":60,
+    "key_field":0,
+    "show_order":1000,
+    "major_field":0
     }
     ],
     "subEntitys":[

demo-provider/demo-provider-demoapi/src/main/java/cn/ibizlab/demoapi/dto/IBIZBOOKDTO.java

@@ -209,6 +209,15 @@ public class IBIZBOOKDTO extends DTOBase implements Serializable {
     @Size(min = 0, max = 60, message = "内容长度必须小于等于[60]")
     private String borrowway;
 
+    /**
+     * 属性 [RETURNLIB]
+     *
+     */
+    @JSONField(name = "returnlib")
+    @JsonProperty("returnlib")
+    @Size(min = 0, max = 60, message = "内容长度必须小于等于[60]")
+    private String returnlib;
+
 
     /**
      * 设置 [IBIZBOOKNAME]
@@ -330,6 +339,14 @@ public class IBIZBOOKDTO extends DTOBase implements Serializable {
         this.modify("borrowway",borrowway);
     }
 
+    /**
+     * 设置 [RETURNLIB]
+     */
+    public void setReturnlib(String  returnlib){
+        this.returnlib = returnlib ;
+        this.modify("returnlib",returnlib);
+    }
+
 
 }
 

demo-util/src/main/java/cn/ibizlab/util/dict/StaticDict.java

@@ -6,6 +6,49 @@ public class StaticDict {
 
 
 
+    /**
+     * 代码表[借阅方式]
+     */
+    @Getter
+    public enum CodeList25 {
+        ITEM_200("200","押金"),
+        ITEM_100("100","身份证");
+
+        private String value;
+        private String text;
+        private String valueSeparator="";
+        private String textSeparator="";
+        private String emptyText="";
+
+        CodeList25(String value , String text) {
+            this.value=value;
+            this.text = text;
+        }
+    }
+
+
+    /**
+     * 代码表[图馆代码表]
+     */
+    @Getter
+    public enum CodeList {
+        ITEM_100("100","第一图书馆"),
+        ITEM_300("300","第三图书馆"),
+        ITEM_200("200","第二图书馆");
+
+        private String value;
+        private String text;
+        private String valueSeparator="";
+        private String textSeparator="";
+        private String emptyText="";
+
+        CodeList(String value , String text) {
+            this.value=value;
+            this.text = text;
+        }
+    }
+
+
     /**
      * 代码表[扩展表格单元格垂直对齐方式]
      */