Skip to content

A
Aidea
Commit 366b16dd authored by 谢希宇's avatar 谢希宇
Browse files
Options

Aidea product update by Strive Date 2020-10-10

parent bdbd1b23
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 628 deletions
aidea-modules/consult-module/target/classes/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ 366b16dd
......@@ -23,6 +23,13 @@
<result column="description" property="description"/>
<result column="create_by" property="createBy"/>
<result column="update_by" property="updateBy"/>
<result column="allergy" property="allergy"/>
<result column="symptom" property="symptom"/>
<result column="diagnosis" property="diagnosis"/>
<result column="open_id" property="openId"></result>
<result column="drugs_id" property="drugsId"></result>
<result column="member_id" property="memberId"></result>
<result column="order_id" property="orderId"></result>
</resultMap>
<sql id="sqlWhere">
......@@ -53,29 +60,39 @@
</sql>
<sql id="sqlColumns">
id,
consult_id,
user_name,
number_id,
benebit_id,
sex,
iphone,
past_records,
prescription,
doctor_id,
customer_id,
illness,
accounts_id,
del_flag,
status,
create_time,
update_time,
description,
create_by,
update_by
a.id,
a.consult_id,
a.user_name,
a.number_id,
a.benebit_id,
a.sex,
a.iphone,
a.past_records,
a.prescription,
a.doctor_id,
a.customer_id,
a.illness,
a.accounts_id,
a.del_flag,
a.STATUS,
a.create_time,
a.update_time,
a.description,
a.create_by,
a.update_by,
a.allergy,
a.symptom,
a.diagnosis,
a.open_id,
a.drugs_id,
a.member_id,
a.order_id,
b.`name` pharmaName,
c.`name` customerName
</sql>
<insert id="save" parameterType="com.cftech.consultsheet.model.ConsultSheet" useGeneratedKeys="true"
keyProperty="id">
insert into t_aidea_consult_sheet
......@@ -104,19 +121,32 @@
now(),
#{description, jdbcType=VARCHAR},
#{createBy, jdbcType=BIGINT},
#{updateBy, jdbcType=BIGINT}
#{updateBy, jdbcType=BIGINT},
#{allergy, jdbcType=VARCHAR},
#{updateBy, jdbcType=VARCHAR},
#{diagnosis,jdbcType=BIGINT}
#{doctorName, jdbcType=VARCHAR},
#{customerName,jdbcType=BIGINT},
#{openId,jdbcType=VARCHAR},
#{drugsId,jdbcType=BIGINT},
#{memberId,jdbcType=BIGINT},
#{orderId,jdbcType=BIGINT}
)
</insert>
<select id="fetchById" parameterType="java.lang.Long" resultMap="resultMap">
SELECT
<include refid="sqlColumns"/>
FROM t_aidea_consult_sheet t
WHERE t.id=#{id}
FROM t_aidea_consult_sheet a
LEFT JOIN t_qyuser b ON b.id = a.doctor_id
LEFT JOIN t_qyuser c ON c.id = a.customer_id
WHERE a.id=#{id}
</select>
<select id="count" parameterType="java.util.Map" resultType="java.lang.Integer">
SELECT COUNT(1) FROM t_aidea_consult_sheet
SELECT COUNT(1) FROM t_aidea_consult_sheet a
LEFT JOIN t_qyuser b ON b.id = a.doctor_id
LEFT JOIN t_qyuser c ON c.id = a.customer_id
<include refid="sqlWhere"/>
</select>
......@@ -124,7 +154,9 @@
<select id="fetchSearchByPage" parameterType="java.util.Map" resultMap="resultMap">
SELECT
<include refid="sqlColumns"/>
FROM t_aidea_consult_sheet
FROM t_aidea_consult_sheet a
LEFT JOIN t_qyuser b ON b.id = a.doctor_id
LEFT JOIN t_qyuser c ON c.id = a.customer_id
<include refid="sqlWhere"/>
<if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
<if test="limit>0">limit #{offset},#{limit}</if>
......@@ -153,7 +185,7 @@
sex = #{sex, jdbcType=BIGINT},
</if>
<if test="iPhone != null">
i_phone = #{iPhone, jdbcType=VARCHAR},
iphone = #{iPhone, jdbcType=VARCHAR},
</if>
<if test="pastRecords != null">
past_records = #{pastRecords, jdbcType=VARCHAR},
......@@ -191,6 +223,27 @@
<if test="updateBy != null">
update_by = #{updateBy, jdbcType=BIGINT},
</if>
<if test="allergy != null">
allergy = #{allergy, jdbcType=VARCHAR},
</if>
<if test="symptom != null">
symptom = #{symptom, jdbcType=VARCHAR},
</if>
<if test="diagnosis != null">
diagnosis = #{diagnosis, jdbcType=BIGINT},
</if>
<if test="openId != null">
open_id = #{openId, jdbcType=VARCHAR},
</if>
<if test="openId != null">
drugs_id = #{drugsId, jdbcType=BIGINT},
</if>
<if test="openId != null">
member_id = #{memberId, jdbcType=BIGINT},
</if>
<if test="openId != null">
order_id = #{orderId, jdbcType=BIGINT},
</if>
</set>
where id=#{id,jdbcType=BIGINT}
</update>
......@@ -198,4 +251,6 @@
<update id="delete" parameterType="java.lang.Long">
update t_aidea_consult_sheet set del_flag=1 where id=#{id,jdbcType=BIGINT}
</update>
</mapper>
\ No newline at end of file
</mapper>
cftech-common-web/src/main/resources/common-test.properties
View file @ 366b16dd
......@@ -24,8 +24,6 @@ AIDEA_QY_ACCOUNTS=349
#\u56FE\u7247\u8BBF\u95EE\u5730\u5740
IMAGEURL=/aidea/mobile/qybase/showPic?picFileName={PICFILENAME}
IMAGEURL=/schaeffler/mobile/qybase/showPic?picFileName={PICFILENAME}
ROOT_ORG_NAME=\u4E1C\u660C\u96C6\u56E2
ROOT_PAPERCATEGORY_NAME=\u95EE\u5377\u7C7B\u578B
ROOT_QUESTIONSCATEGORY_NAME=\u95EE\u9898\u7C7B\u522B
ROOT_MATERIALCATEGORY_NAME=\u7D20\u6750\u7C7B\u522B
......@@ -46,53 +44,6 @@ quartz.isCluster=false
UPDATEDETAILS=6zMPHC8i7NIPHBd0iShjR_muuUAemJfxgLTd2fT6ivg
SIGNTEMPLATE=xFh_GMxX-u1vkTRqTN7OKbLO_zzXjjkhDTWs3IozRt0
email.host = smtp.exmail.qq.com
email.username = postmaster@wx-schaeffler.cn
email.password = Ali190325
email.from = postmaster@wx-schaeffler.cn
email.nickname=
licensePath = license.xml
#docXmlTemplatePath = E:/\u6587\u6863/\u4FE1\u777F/\u820D\u5F17\u52D2/2020/\u54C1\u724C\u7533\u8BF7/\u5F00\u53D1\u6587\u6863/
docXmlTemplatePath = /Users/lisw/work/work-document/sfl-template/
#docXmlTemplatePath=/Users/lisw/work/work-document/sfl-template/
#\u0579\uFFFD\uFFFD\u0524\u053C\uFFFD\u0279\uFFFD\u0123\uFFFD\uFFFD\uFFFD\uFFFD\u03E2
showroomTemplateId =5DWV1fHynNTJuHXa_mOmNzev-ggb_nxoQAHNfyST6js
#showroomTemplateId =F7DnP-jHkeo1B1TBpkeM_qLhWX2kRf5AOb_myQEQWs4
# \u65B0\u589E\u6A21\u677F\u6D88\u606F
showroomTemplateIdNew =5DWV1fHynNTJuHXa_mOmNzev-ggb_nxoQAHNfyST6js
#\uFFFD\uFFFD\uFFFD\uFFFD\u01B7\uFFFD\uFFFD\uFFFD\uFFFD\u0279\uFFFD\u0123\uFFFD\uFFFD\uFFFD\uFFFD\u03E2
applyReserveTemplateId =uV5eoMqa5YjKVPdkhVzMryaZvd2B6638Q7-EaNqh6io
#\u0579\uFFFD\uFFFD\u0524\u053C\u0221\uFFFD\uFFFD\u0368\u05AA
cancelApplyReserveTemplateId =WXpzgxrsJNC3H0iBizmC0VraQzbtoFsfUfbBKe2OZI4
#\uFFFD\uFFFD\uFFFD\uFFFD\u01B7\uFFFD\uFFFD\uFFFD\uFFFD\u02A7\uFFFD\uFFFD\u0368\u05AA
applicationErrorTemplateId =KDk2V0yl-Zbw3Vx4lgPo9IWTQm6dhwqmBvmZBSWliBo
#\uFFFD\uFFFD\uFFFD\uFFFD\u01B7\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07BD\uFFFD\uFFFD
WORKFLOW.MAXPRICE=5000
#\uFFFD\u0271\uFFFD\uFFFD\uFFFD\uFFFD\u0123\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01B7\uFFFD\uFFFD\uFFFD\uFFFD\u02B9\uFFFD\u00E3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02F5\u0133\u0271\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00F5\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05AE\u04BB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01F7\uFFFD\uFD7D\uFFFD\uFFFD\uFFFD\u07B6\uFFFD\uFFFD\uFFFD\uFFFD\uBD7D\uFFFD\u0433\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
COSTCENTERS=0189-1806,0189-1807,0199-2042,0199-2066,0199-3872,0199-3876
STATISTICSCOSTCENTERS=0189-1806,0189-1807,0199-3872,0199-3876,0189-1800,0189-1801
#\uFFFD\uFFFD\uFFFD\uFFFD\u01B7pdf\uFFFD\u9D75,\uFFFD\uFFFD\uFFFD\uFFFD\u0531\uFFFD\uFFFD\uFFFD\uFFFD
MANAGEREMAIL=starsoy@163.com
#\u4FC3\u9500\u54C1\u7533\u8BF7\u5DE5\u4F5C\u6D41\u9700\u6C42\u63D0\u4EA4\u6210\u529F\u901A\u77E5
commonSubmitSuccessTemplateId=QHtD8WYcnIduw8bGQJZjffeaAYl8_YixXOLaQ6hhb4A
#\u4FC3\u9500\u54C1\u7533\u8BF7\u5DE5\u4F5C\u6D41\u8BA2\u5355\u53D7\u7406\u901A\u77E5
orderAcceptanceSuccessTemplateId=ucM6LnFgLux3jnoOThkQpNgUZMbmdpC3Cq89rQnpXYA
#\u4FC3\u9500\u54C1\u8BA2\u5355\u53D1\u8D27\u901A\u77E5
orderDeliverGoodsTemplateId=TH3I5prFYPC54M14zFJfgN4gvjx8SpJayctIHmzThwg
#\u670D\u52A1\u5B8C\u6210\u901A\u77E5
serverEndTemplateId=7L1KIroXNxejxotFTzll-dVLdo1xbmqoiAo7UmDKWcc
#\u54C1\u724C\u7533\u8BF7\u6D88\u606F\u6A21\u677F
brandApplyCommTemplateId=82ByH2tkWI1-jlYiWr_-CIihWsgjrvLdFvuO771FwBo
brandApplyCompletedTemplateId=OHNQnY6duGKNsM2o3sDQrWg5UY4dSGCj5aROOMQys2I
brandApplyCanceledTemplateId=1JfwQZRqcqLyZGi9WK7LyJUZyp7SnBinDHagjtdg7hI
......
qy-modules/qy-orgunit-module/src/main/java/com/cftech/base/org/web/OrgUnitController.java
View file @ 366b16dd
......@@ -61,8 +61,7 @@ public class OrgUnitController {
@RequiresPermissions(value = PermissionSign.ORGUNIT_VIEW)
@RequestMapping(value = "/list",method = {RequestMethod.GET,RequestMethod.POST})
public String list(HttpServletRequest request, Model model) {
Long accountId = UserUtils.getmpaccounts(request);
model.addAttribute("accountId", accountId);
model.addAttribute("accountId", qyAccounts);
return "managerorgunit/orgunitlist";
}
......@@ -70,7 +69,7 @@ public class OrgUnitController {
@RequiresPermissions(value = PermissionSign.ORGUNIT_VIEW)
@RequestMapping(value = "/form",method = {RequestMethod.GET,RequestMethod.POST})
public String form(HttpServletRequest request, String id, Model model) {
Long accountsId = Long.parseLong(qyAccounts);
Sort sort = new Sort("number", OrderType.ASC);
Conds conds = new Conds();
conds.equal("del_flag", 0);
......@@ -95,9 +94,8 @@ public class OrgUnitController {
model.addAttribute("accountId", orgUnit.getAccountsId());
conds.equal("accounts_id", orgUnit.getAccountsId());
} else {
Long accountId = UserUtils.getmpaccounts(request);
model.addAttribute("accountId", accountId);
conds.equal("accounts_id", accountId);
model.addAttribute("accountId", accountsId);
conds.equal("accounts_id", accountsId);
}
List<Orgtype> orgtypes = orgtypeService.fetchSearchByPage(conds, sort, 0, 0);
......@@ -110,7 +108,7 @@ public class OrgUnitController {
@RequestMapping(value = "/formData",method = {RequestMethod.POST})
@ResponseBody
public JSONObject formData(OrgUnit orgUnit, Model model, HttpServletRequest request) {
Long accountsId = UserUtils.getmpaccounts(request);
Long accountsId = Long.parseLong(qyAccounts);
JSONObject rtnJson = new JSONObject();
try {
if (orgUnit != null && orgUnit.getId() != null) {
......@@ -253,7 +251,7 @@ public class OrgUnitController {
@RequestMapping(value = "/exportExcel",method = {RequestMethod.GET,RequestMethod.POST})
@RequiresPermissions(value = PermissionSign.ORGUNIT_VIEW)
public void exportExcel(HttpServletRequest request, HttpServletResponse response) {
Long accountId = UserUtils.getmpaccounts(request);
Long accountId = Long.parseLong(qyAccounts);
Sort sort = new Sort("parent_id", OrderType.ASC);
Conds conds = new Conds();
conds.equal("del_flag", 0);
......@@ -277,7 +275,7 @@ public class OrgUnitController {
@RequestMapping(value = "/importExcel",method = {RequestMethod.GET,RequestMethod.POST})
@RequiresPermissions(value = PermissionSign.ORGUNIT_EDIT)
public String importExcel(HttpServletRequest request, MultipartFile file, Model model) {
Long accountId = UserUtils.getmpaccounts(request);
Long accountId = Long.parseLong(qyAccounts);
if (file == null) {
return list(request, model);
}
......@@ -350,7 +348,7 @@ public class OrgUnitController {
@RequestMapping(value = "treeData",method = {RequestMethod.GET,RequestMethod.POST})
@ResponseBody
public JSONObject getTreeData(HttpServletRequest request) {
Long accountId = UserUtils.getmpaccounts(request);
Long accountId = Long.parseLong(qyAccounts);
JSONObject rtnJson = new JSONObject();
JSONArray array = new JSONArray();
Sort sort = new Sort("parent_id", OrderType.ASC);
......@@ -387,7 +385,7 @@ public class OrgUnitController {
@RequestMapping(value = "treeDataNoAuth",method = {RequestMethod.GET,RequestMethod.POST})
@ResponseBody
public JSONObject treeDataNoAuth(HttpServletRequest request) {
Long accountId = UserUtils.getmpaccounts(request);
Long accountId = Long.parseLong(qyAccounts);
JSONObject rtnJson = new JSONObject();
JSONArray array = new JSONArray();
Sort sort = new Sort("parent_id", OrderType.ASC);
......@@ -426,10 +424,10 @@ public class OrgUnitController {
@RequestMapping(value = "/listDataNoAuth",method = {RequestMethod.GET,RequestMethod.POST})
@ResponseBody
public JSONObject listDataNoAuth(int iDisplayStart, int iDisplayLength, OrgUnit orgUnit, HttpServletRequest request) {
Long accountsId = UserUtils.getmpaccounts(request);
Long accountId = Long.parseLong(qyAccounts);
Conds conds = new Conds();
conds.equal("t.del_flag", Constants.DEL_FLAG_0);
conds.equal("t.accounts_id", accountsId);
conds.equal("t.accounts_id", accountId);
if(!StringUtils.isEmpty(orgUnit.getNumber())){
conds.equal("t.number", orgUnit.getNumber());
}
......@@ -452,7 +450,7 @@ public class OrgUnitController {
Conds myCond = new Conds();
myCond.equal("del_flag", Constants.DEL_FLAG_0);
myCond.equal("accounts_id", accountsId);
myCond.equal("accounts_id", accountId);
if (!StringUtils.isEmpty(orgUnit.getOrgName())) {
myCond.like("org_name", orgUnit.getOrgName());
}
......@@ -477,7 +475,7 @@ public class OrgUnitController {
@RequiresPermissions(value = PermissionSign.ORGUNIT_EDIT)
@ResponseBody
public JSONObject sync(HttpServletRequest request, Model model) {
Long accountId = UserUtils.getmpaccounts(request);
Long accountId = Long.parseLong(qyAccounts);
// 同步微信端的部门，下拉到本地为主
JSONObject retObj = qyOrgUtil.sync(accountId);
log.info("同步结果: {}", retObj.toJSONString());
......
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