Commit 7986f736 authored by 谢希宇's avatar 谢希宇

Aidea product update by Strive Date 2020-11-03

parent 0d3da822
...@@ -157,7 +157,9 @@ ...@@ -157,7 +157,9 @@
#{productNumber,jdbcType=VARCHAR}, #{productNumber,jdbcType=VARCHAR},
#{productImgDetail,jdbcType=VARCHAR}, #{productImgDetail,jdbcType=VARCHAR},
#{isRs,jdbcType=VARCHAR}, #{isRs,jdbcType=VARCHAR},
#{reading,jdbcType=VARCHAR} #{reading,jdbcType=VARCHAR},
#{size, jdbcType=BIGINT},
#{isreading, jdbcType=BIGINT}
) )
</insert> </insert>
......
...@@ -26,7 +26,7 @@ public class Product implements Serializable { ...@@ -26,7 +26,7 @@ public class Product implements Serializable {
/** /**
* 产品分类编码 * 产品分类编码
*/ */
@ExportConfig(value = "产品分类编码(多个分类用英文逗号隔开,必填字段)",width = 250 ,showLevel = 2) @ExportConfig(value = "产品分类编码(多个分类用英文逗号隔开,必填字段)", width = 250, showLevel = 2)
private String classifyNumber; private String classifyNumber;
/** /**
* 产品分类名称 * 产品分类名称
...@@ -50,27 +50,27 @@ public class Product implements Serializable { ...@@ -50,27 +50,27 @@ public class Product implements Serializable {
@ExportConfig(value = "通用名", width = 100) @ExportConfig(value = "通用名", width = 100)
private String commonName; private String commonName;
/** /**
*剂型 * 剂型
*/ */
@ExportConfig(value = "剂型", width = 100) @ExportConfig(value = "剂型", width = 100)
private String dosagaFrom; private String dosagaFrom;
/** /**
*规格 * 规格
*/ */
@ExportConfig(value = "规格", width = 100) @ExportConfig(value = "规格", width = 100)
private String format; private String format;
/** /**
*批准文号 * 批准文号
*/ */
@ExportConfig(value = "批准文号",width = 100) @ExportConfig(value = "批准文号", width = 100)
private String approveNumber; private String approveNumber;
/** /**
*生产企业 * 生产企业
*/ */
@ExportConfig(value = "生产企业", width = 100) @ExportConfig(value = "生产企业", width = 100)
private String manufacturer; private String manufacturer;
/** /**
*推荐计量 * 推荐计量
*/ */
@ExportConfig(value = "推荐计量", width = 100) @ExportConfig(value = "推荐计量", width = 100)
private String recommendMeasure; private String recommendMeasure;
...@@ -78,10 +78,10 @@ public class Product implements Serializable { ...@@ -78,10 +78,10 @@ public class Product implements Serializable {
/** /**
* 药品简介 * 药品简介
*/ */
@ExportConfig(value = "药品简介",width = 150) @ExportConfig(value = "药品简介", width = 150)
private String description; private String description;
/** /**
*温馨提示 * 温馨提示
*/ */
@ExportConfig(value = "温馨提示", width = 100) @ExportConfig(value = "温馨提示", width = 100)
private String tips; private String tips;
...@@ -91,22 +91,22 @@ public class Product implements Serializable { ...@@ -91,22 +91,22 @@ public class Product implements Serializable {
@ExportConfig(value = "服用类型(天/周/月)", width = 200) @ExportConfig(value = "服用类型(天/周/月)", width = 200)
private String takeType; private String takeType;
/** /**
*服用频率 * 服用频率
*/ */
@ExportConfig(value = "服用频率", width = 100) @ExportConfig(value = "服用频率", width = 100)
private String takeFrequency; private String takeFrequency;
/** /**
*服用次数 * 服用次数
*/ */
@ExportConfig(value = "服用数量", width = 100) @ExportConfig(value = "服用数量", width = 100)
private String takeAmount; private String takeAmount;
/** /**
*库存 * 库存
*/ */
@ExportConfig(value = "库存(必填字段)", width = 100) @ExportConfig(value = "库存(必填字段)", width = 100)
private Long stock; private Long stock;
/** /**
*价格 * 价格
*/ */
@ExportConfig(value = "价格", width = 100) @ExportConfig(value = "价格", width = 100)
private Double price; private Double price;
...@@ -114,7 +114,7 @@ public class Product implements Serializable { ...@@ -114,7 +114,7 @@ public class Product implements Serializable {
/** /**
* 是否为处方药 * 是否为处方药
*/ */
@ExportConfig(value = "是否为处方药(是/否)",width = 200) @ExportConfig(value = "是否为处方药(是/否)", width = 200)
private String isRs; private String isRs;
/** /**
...@@ -122,7 +122,7 @@ public class Product implements Serializable { ...@@ -122,7 +122,7 @@ public class Product implements Serializable {
*/ */
private String productImgDetail; private String productImgDetail;
/** /**
*产品图片 * 产品图片
*/ */
private String productImg; private String productImg;
/** /**
...@@ -132,7 +132,7 @@ public class Product implements Serializable { ...@@ -132,7 +132,7 @@ public class Product implements Serializable {
/** /**
* 销量 * 销量
*/ */
@ExportConfig(value = "销量",width = 200) @ExportConfig(value = "销量", width = 200)
private String reading; private String reading;
/* 所属的账号 */ /* 所属的账号 */
private Long accountsId; private Long accountsId;
...@@ -144,7 +144,9 @@ public class Product implements Serializable { ...@@ -144,7 +144,9 @@ public class Product implements Serializable {
private Date createTime; private Date createTime;
/* 更新时间 */ /* 更新时间 */
private Date updateTime; private Date updateTime;
private Long isreading; private Long isreading;
private Long size; private Long size;
/* 创建人 */ /* 创建人 */
private Long createBy; private Long createBy;
......
...@@ -32,7 +32,7 @@ public class MobileProductController { ...@@ -32,7 +32,7 @@ public class MobileProductController {
* @Param * @Param
* @return * @return
**/ **/
@RequestMapping(value = "/productId",method = {RequestMethod.GET,RequestMethod.POST},produces = MediaType.APPLICATION_JSON_UTF8_VALUE) @RequestMapping(value = "/productId",method = {RequestMethod.GET, RequestMethod.POST},produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public JSONObject productMenu(Long id,String appId){ public JSONObject productMenu(Long id,String appId){
return productService.productId(id,appId); return productService.productId(id,appId);
} }
......
...@@ -29,7 +29,7 @@ QY_SEND_DOCTOR_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u54A8\u8BE2\u5355\uFF0C\u8BF7\ ...@@ -29,7 +29,7 @@ QY_SEND_DOCTOR_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u54A8\u8BE2\u5355\uFF0C\u8BF7\
#\u56FE\u7247\u4E0A\u4F20\u5730\u5740 #\u56FE\u7247\u4E0A\u4F20\u5730\u5740
#userfiles.imgdir=/mydata/fileResource #userfiles.imgdir=/mydata/fileResource
userfiles.imgdir=E://fileResource userfiles.imgdir=/mydata/fileResource
#\u56FE\u7247\u8BBF\u95EE\u5730\u5740 #\u56FE\u7247\u8BBF\u95EE\u5730\u5740
IMAGEURL=/aidea/mobile/qybase/showPic?picFileName={PICFILENAME} IMAGEURL=/aidea/mobile/qybase/showPic?picFileName={PICFILENAME}
...@@ -41,7 +41,7 @@ LOG_URL=http://www.michang-tech.com.cn:6989/log/addlog ...@@ -41,7 +41,7 @@ LOG_URL=http://www.michang-tech.com.cn:6989/log/addlog
#\u6821\u9A8C\u5151\u6362\u5BC6\u7801KEY #\u6821\u9A8C\u5151\u6362\u5BC6\u7801KEY
MEMBER_PASSWORD_KEY=DONGCHANGINT9527; MEMBER_PASSWORD_KEY=DONGCHANGINT9527;
list.refreshtoken=true list.refreshtoken=true
jwt.domain=127.0.0.1 jwt.domain=pd.shxrtech.com
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
jwt.duration=86400000 jwt.duration=86400000
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03AAtrue #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03AAtrue
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment