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

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

@@ -20,6 +20,7 @@ export default {
     borrowstatus: "图书借阅状态",
     stepstatus: "步骤",
     borrower: "借阅人",
+    borrowway: "借阅方式",
   },
 	views: {
 		statewizardview: {

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

@@ -19,6 +19,7 @@ export default {
     borrowstatus: "图书借阅状态",
     stepstatus: "步骤",
     borrower: "借阅人",
+    borrowway: "借阅方式",
   },
 	views: {
 		statewizardview: {

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

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

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

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

app_Web/src/widgets/ibizbook/inter-func-form-2-form/inter-func-form-2-form-base.vue

@@ -90,24 +90,7 @@
 </i-col>
 <i-col v-show="detailsModel.formitem2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }" :xl="{ span: 8, offset: 0 }">
     <app-form-item name='formitem2' :itemRules="this.rules().formitem2" class='' :caption="$t('entities.ibizbook.interfuncform_2_form.details.formitem2')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem2.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState" 
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.formitem2.disabled"
-  name='formitem2'
-  valueitem='borrower' 
-  :value="data.formitem2"
-  editortype="pickup-no-ac" 
-  :pickupView="{ viewname: 'ibizcustomer-mpickup-view', title: $t('entities.ibizcustomer.views.mpickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibizcustomers', parameterName: 'ibizcustomer' }, { pathName: 'mpickupview', parameterName: 'mpickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange">
-</app-picker>
-
+    <app-address-selection :value="data.formitem2"  :disabled="detailsModel.formitem2.disabled" style=""></app-address-selection>
 </app-form-item>
 
 </i-col>

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

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

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

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

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

@@ -185,6 +185,13 @@ public class IBIZBOOK extends EntityMP implements Serializable {
     @JSONField(name = "borrower")
     @JsonProperty("borrower")
     private String borrower;
+    /**
+     * 借阅方式
+     */
+    @TableField(value = "borrowway")
+    @JSONField(name = "borrowway")
+    @JsonProperty("borrowway")
+    private String borrowway;
 
 
 
@@ -320,6 +327,14 @@ public class IBIZBOOK extends EntityMP implements Serializable {
         this.modify("borrower", borrower);
     }
 
+    /**
+     * 设置 [借阅方式]
+     */
+    public void setBorrowway(String borrowway) {
+        this.borrowway = borrowway;
+        this.modify("borrowway", borrowway);
+    }
+
 
     /**
      * 复制当前对象数据到目标对象(粘贴重置)

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

@@ -48,6 +48,13 @@ public class IBIZBOOKSearchContext extends QueryWrapperContext<IBIZBOOK> {
             this.getSearchCond().eq("sailstate", n_sailstate_eq);
         }
     }
+	private String n_borrowway_eq;//[借阅方式]
+	public void setN_borrowway_eq(String n_borrowway_eq) {
+        this.n_borrowway_eq = n_borrowway_eq;
+        if(!ObjectUtils.isEmpty(this.n_borrowway_eq)){
+            this.getSearchCond().eq("borrowway", n_borrowway_eq);
+        }
+    }
 
     /**
 	 * 启用快速搜索

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

@@ -69,6 +69,8 @@
                 </column>
                 <column name="BORROWER" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="BORROWWAY" 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.`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.`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.`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.`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.`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.`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

@@ -431,6 +431,20 @@
     "key_field":0,
     "show_order":1000,
     "major_field":0
+    },
+    {
+    "fieldname":"BORROWWAY" ,
+    "codename":"Borrowway",
+    "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

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