Aidea product update by Strive Date 2020-10-23

aidea-modules/consult-module/target/classes/com/cftech/consultsheet/dao/ConsultSheetMapper.xml

@@ -7,7 +7,6 @@
         <result column="consult_id" property="consultId"/>
         <result column="user_name" property="userName"/>
         <result column="number_id" property="numberId"/>
-        <result column="benebit_id" property="benebitId"/>
         <result column="sex" property="sex"/>
         <result column="iphone" property="iPhone"/>
         <result column="past_records" property="pastRecords"/>
@@ -62,11 +61,10 @@
     <sql id="sqlColumns">
                                    	a.id,
 	                                a.consult_id,
-	                                a.user_name,
-	                                a.number_id,
-	                                a.benebit_id,
+	                                CONVERT(AES_DECRYPT(a.user_name,'aideakey') USING UTF8),
+	                                 CONVERT(AES_DECRYPT(a.number_id,'aideakey') USING UTF8),
 	                                a.sex,
-	                                a.iphone,
+	                                 CONVERT(AES_DECRYPT(a.iphone,'aideakey') USING UTF8),
 	                                a.past_records,
 	                                a.prescription,
 	                                a.doctor_id,
@@ -101,14 +99,13 @@
         )
         values
         (
-        #{id, jdbcType=BIGINT},
-
+        #{id, jdbcType=BIGINT}
         #{consultId, jdbcType=VARCHAR},
-        #{userName, jdbcType=VARCHAR},
-        #{numberId, jdbcType=VARCHAR},
+        AES_ENCRYPT(#{userName, jdbcType=VARBINARY},'aideakey'),
+        AES_ENCRYPT(#{numberId, jdbcType=VARBINARY},'aideakey'),
         now(),
         #{sex, jdbcType=BIGINT},
-        #{iPhone, jdbcType=VARCHAR},
+        AES_ENCRYPT(#{iPhone, jdbcType=VARBINARY},'aideakey'),
         #{pastRecords, jdbcType=VARCHAR},
         #{Prescription, jdbcType=VARCHAR},
         #{doctorId, jdbcType=BIGINT},
@@ -158,9 +155,8 @@
         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
-        LEFT JOIN `user` u ON u.userid = b.id
         <include refid="sqlWhere"/>
-        <if test="id!=null"> ${id} =  b.id </if>
+        <if test="id!=null">and (a.doctor_id = ${id} or a.customer_id =${id} ) </if>
         <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
         <if test="limit>0">limit #{offset},#{limit}</if>
     </select>
@@ -176,19 +172,18 @@
                 consult_id = #{consultId, jdbcType=VARCHAR},
             </if>
             <if test="userName != null">
-                user_name = #{userName, jdbcType=VARCHAR},
+
+                user_name =  AES_ENCRYPT( #{userName, jdbcType=VARBINARY},'aideakey'),
             </if>
             <if test="numberId != null">
-                number_id = #{numberId, jdbcType=VARCHAR},
-            </if>
-            <if test="benebitId != null">
-                benebit_id = #{benebitId, jdbcType=TIMESTAMP},
+                number_id = AES_ENCRYPT(#{numberId, jdbcType=VARBINARY},'aideakey'),
             </if>
+
             <if test="sex != null">
                 sex = #{sex, jdbcType=BIGINT},
             </if>
             <if test="iPhone != null">
-                iphone = #{iPhone, jdbcType=VARCHAR},
+                iphone =  AES_ENCRYPT(#{iPhone, jdbcType=VARBINARY},'aideakey'),
             </if>
             <if test="pastRecords != null">
                 past_records = #{pastRecords, jdbcType=VARCHAR},
@@ -254,6 +249,28 @@
     <update id="delete" parameterType="java.lang.Long">
         update t_aidea_consult_sheet set del_flag=1 where id=#{id,jdbcType=BIGINT}
     </update>
+    <update id="updateDate" >
+        update t_aidea_consult_sheet
+        <set>
+        <if test="status !=null">
+            status = #{status},
+        </if>
+        <if test="description !=null">
+            description = #{description}
+        </if>
+        </set>
+        where consult_id = #{consultId}
+    </update>
+    <update id="updateStatus">
+        update t_aidea_consult_sheet
+        <set>
+            <if test="status !=null">
+                status = #{status}
+            </if>
+
+        </set>
+        where consult_id = #{consultId}
+    </update>
 
 
 </mapper>

aidea-modules/waybill-module/src/main/java/com/cftech/waybill/dao/WaybillMapper.java

@@ -11,4 +11,10 @@ import com.cftech.core.generic.GenericDao;
  */
 public interface WaybillMapper extends GenericDao<Waybill> {
 
+    /**
+     * 查询物流数据(联查)
+     * @param id
+     * @return
+     */
+    Waybill fetchByWayBillId(String id);
 }
\ No newline at end of file

aidea-modules/waybill-module/src/main/java/com/cftech/waybill/service/impl/WaybillServiceImpl.java

@@ -30,6 +30,6 @@ public class WaybillServiceImpl extends GenericServiceImpl<Waybill> implements W
 
     @Override
     public Waybill fetchByWayBillId(String id) {
-        return getGenericMapper().fetchByWayBillId(id);
+        return waybillMapper.fetchByWayBillId(id);
     }
 }
\ No newline at end of file

cftech-common/src/main/java/com/cftech/core/generic/GenericService.java

@@ -79,4 +79,11 @@ public interface GenericService<T> {
      */
     int count(Conds conds);
 
+    /**
+     * 根据删除对象
+     *
+     * @param id
+     * @return
+     */
+    boolean delete(Serializable id);
 }